mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

Revert echonest5/ header ifdefs

Browse Source
This commit is contained in:
Uwe L. Korn
2014-06-20 18:06:46 +01:00
parent 5a9c3d39c4
commit f394b80419
5 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libtomahawk/EchonestCatalogSynchronizer.cpp
View File

@@ -32,13 +32,8 @@
#include "TomahawkSettings.h" #include "TomahawkSettings.h"
#include "Track.h" #include "Track.h"
#if QT_VERSION < QT_VERSION_CHECK(5,0,0) #include <echonest/CatalogUpdateEntry.h>
#include <echonest/CatalogUpdateEntry.h> #include <echonest/Config.h>
#include <echonest/Config.h>
#else
#include <echonest5/CatalogUpdateEntry.h>
#include <echonest5/Config.h>
#endif
using namespace Tomahawk; using namespace Tomahawk;

6
src/libtomahawk/EchonestCatalogSynchronizer.h
View File

@@ -23,11 +23,7 @@
#include "Query.h" #include "Query.h"
#include "database/DatabaseCommand_TrackAttributes.h" #include "database/DatabaseCommand_TrackAttributes.h"
#if QT_VERSION < QT_VERSION_CHECK(5,0,0) #include <echonest/Catalog.h>
#include <echonest/Catalog.h>
#else
#include <echonest5/Catalog.h>
#endif
#include <QObject> #include <QObject>
#include <QQueue> #include <QQueue>

2
src/libtomahawk/Playlist.cpp
View File

@@ -588,6 +588,8 @@ Playlist::setPlaylistRevisionFinished()
if ( d->queuedSetPlaylistRevisionCmds.length() > 0 ) if ( d->queuedSetPlaylistRevisionCmds.length() > 0 )
{ {
DatabaseCommand_SetPlaylistRevision* cmd = d->queuedSetPlaylistRevisionCmds.dequeue(); DatabaseCommand_SetPlaylistRevision* cmd = d->queuedSetPlaylistRevisionCmds.dequeue();
// Update oldrev to currentRevision so that optimistic locking works correctly.
cmd->setOldrev( currentrevision() );
Database::instance()->enqueue( Tomahawk::dbcmd_ptr( cmd ) ); Database::instance()->enqueue( Tomahawk::dbcmd_ptr( cmd ) );
} }
else else

6
src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
View File

@@ -24,11 +24,7 @@
#include <QTimer> #include <QTimer>
#include <QPointer> #include <QPointer>
#if QT_VERSION < QT_VERSION_CHECK(5,0,0) #include <echonest/Playlist.h>
#include <echonest/Playlist.h>
#else
#include <echonest5/Playlist.h>
#endif
namespace Tomahawk namespace Tomahawk
{ {

6
src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
View File

@@ -28,11 +28,7 @@
#include "DllMacro.h" #include "DllMacro.h"
#if QT_VERSION < QT_VERSION_CHECK(5,0,0) #include <echonest/Playlist.h>
#include <echonest/Playlist.h>
#else
#include <echonest5/Playlist.h>
#endif
namespace Tomahawk namespace Tomahawk
{ {