mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-19 15:29:42 +01:00
Code Issues Releases Wiki Activity

Revert previously mostly-bad commit, oops.

Browse Source
This commit is contained in:
Leo Franchi 2012-06-15 18:46:41 +02:00
parent 9d5d6b7360
commit 6870cc6f88
5 changed files with 6 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -94,9 +94,8 @@ SET( tomahawkUI ${tomahawkUI}
INCLUDE_DIRECTORIES(
.
${CMAKE_CURRENT_BINARY_DIR}
/usr/include/c++/v1/
audio
audio
database
playlist
network

3
src/libtomahawk/CMakeLists.txt
View File

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

39
src/libtomahawk/database/IdThreadWorker.h
View File

@ -1,39 +0,0 @@
/* === 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

2
src/libtomahawk/utils/Closure.cpp
View File

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

6
src/libtomahawk/utils/Closure.h
View File

@ -21,7 +21,7 @@
#include "DllMacro.h"
#include <functional>
#include <tr1/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::function<void()> callback);
std::tr1::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::function<void()> callback_;
std::tr1::function<void()> callback_;
bool autoDelete_;
boost::scoped_ptr<const ClosureArgumentWrapper> val0_;