Don't track shared pointers

src/CMakeLists.txt

@@ -13,8 +13,6 @@ SET( QT_USE_QTNETWORK TRUE )
 SET( QT_USE_QTXML TRUE )
 SET( QT_USE_QTWEBKIT TRUE )
 
-add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
-
 INCLUDE( ${QT_USE_FILE} )
 INCLUDE( AddAppIconMacro )
 
@@ -96,8 +94,9 @@ SET( tomahawkUI ${tomahawkUI}
 INCLUDE_DIRECTORIES(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
+    /usr/include/c++/v1/
 
-    audio
+audio
     database
     playlist
     network

src/libtomahawk/CMakeLists.txt

@@ -15,7 +15,6 @@ include( ${QT_USE_FILE} )
 add_definitions( ${QT_DEFINITIONS} )
 add_definitions( -DQT_SHARED )
 add_definitions( -DDLLEXPORT_PRO )
-add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
 
 
 set( libGuiSources
@@ -333,6 +332,8 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.
     ${LIBLASTFM_INCLUDE_DIRS}/..
     ${CLUCENE_INCLUDE_DIRS}
     ${PHONON_INCLUDES}
+    /usr/include/c++/v1/
+
 
     playlist
 

src/libtomahawk/database/IdThreadWorker.h

@@ -0,0 +1,39 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012 Leo Franchi <lfranchi@kde.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef IDTHREADWORKER_H
+#define IDTHREADWORKER_H
+
+#include <QThread>
+
+//#include <v1/future>
+//#include <c++/v1/chrono>
+
+class IdThreadWorker : public QThread
+{
+    Q_OBJECT
+public:
+    explicit IdThreadWorker( QObject *parent = 0 );
+
+    void run();
+
+private:
+
+    
+};
+
+#endif // IDTHREADWORKER_H

src/libtomahawk/utils/Closure.cpp

@@ -46,7 +46,7 @@ Closure::Closure(QObject* sender,
 
 Closure::Closure(QObject* sender,
                  const char* signal,
-                 std::tr1::function<void()> callback)
+                 std::function<void()> callback)
     : callback_(callback) {
   Connect(sender, signal);
 }

src/libtomahawk/utils/Closure.h

@@ -21,7 +21,7 @@
 
 #include "DllMacro.h"
 
-#include <tr1/functional>
+#include <functional>
 
 #include <QMetaMethod>
 #include <QObject>
@@ -64,7 +64,7 @@ class DLLEXPORT Closure : public QObject, boost::noncopyable {
           const ClosureArgumentWrapper* val3 = 0);
 
   Closure(QObject* sender, const char* signal,
-          std::tr1::function<void()> callback);
+          std::function<void()> callback);
 
   void setAutoDelete( bool autoDelete ) { autoDelete_ = autoDelete; }
 
@@ -87,7 +87,7 @@ class DLLEXPORT Closure : public QObject, boost::noncopyable {
   void Connect(QObject* sender, const char* signal);
 
   QMetaMethod slot_;
-  std::tr1::function<void()> callback_;
+  std::function<void()> callback_;
   bool autoDelete_;
 
   boost::scoped_ptr<const ClosureArgumentWrapper> val0_;