From f394b80419e2a1cb9f41d1c2da7e74ba92f83dcb Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Fri, 20 Jun 2014 18:06:46 +0100
Subject: [PATCH] Revert echonest5/ header ifdefs

---
 src/libtomahawk/EchonestCatalogSynchronizer.cpp          | 9 ++-------
 src/libtomahawk/EchonestCatalogSynchronizer.h            | 6 +-----
 src/libtomahawk/Playlist.cpp                             | 2 ++
 .../playlist/dynamic/echonest/EchonestControl.h          | 6 +-----
 .../playlist/dynamic/echonest/EchonestGenerator.h        | 6 +-----
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.cpp b/src/libtomahawk/EchonestCatalogSynchronizer.cpp
index 0bac992c3..070be6779 100644
--- a/src/libtomahawk/EchonestCatalogSynchronizer.cpp
+++ b/src/libtomahawk/EchonestCatalogSynchronizer.cpp
@@ -32,13 +32,8 @@
 #include "TomahawkSettings.h"
 #include "Track.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    #include <echonest/CatalogUpdateEntry.h>
-    #include <echonest/Config.h>
-#else
-    #include <echonest5/CatalogUpdateEntry.h>
-    #include <echonest5/Config.h>
-#endif
+#include <echonest/CatalogUpdateEntry.h>
+#include <echonest/Config.h>
 
 using namespace Tomahawk;
 
diff --git a/src/libtomahawk/EchonestCatalogSynchronizer.h b/src/libtomahawk/EchonestCatalogSynchronizer.h
index 4f03f4a26..5747aafea 100644
--- a/src/libtomahawk/EchonestCatalogSynchronizer.h
+++ b/src/libtomahawk/EchonestCatalogSynchronizer.h
@@ -23,11 +23,7 @@
 #include "Query.h"
 #include "database/DatabaseCommand_TrackAttributes.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    #include <echonest/Catalog.h>
-#else
-    #include <echonest5/Catalog.h>
-#endif
+#include <echonest/Catalog.h>
 
 #include <QObject>
 #include <QQueue>
diff --git a/src/libtomahawk/Playlist.cpp b/src/libtomahawk/Playlist.cpp
index 37333bcc8..3d7bd42b9 100644
--- a/src/libtomahawk/Playlist.cpp
+++ b/src/libtomahawk/Playlist.cpp
@@ -588,6 +588,8 @@ Playlist::setPlaylistRevisionFinished()
     if ( d->queuedSetPlaylistRevisionCmds.length() > 0 )
     {
         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 ) );
     }
     else
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
index 07431b739..b12108e54 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h
@@ -24,11 +24,7 @@
 #include <QTimer>
 #include <QPointer>
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    #include <echonest/Playlist.h>
-#else
-    #include <echonest5/Playlist.h>
-#endif
+#include <echonest/Playlist.h>
 
 namespace Tomahawk
 {
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
index e870851dc..5ed250c51 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
@@ -28,11 +28,7 @@
 
 #include "DllMacro.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    #include <echonest/Playlist.h>
-#else
-    #include <echonest5/Playlist.h>
-#endif
+#include <echonest/Playlist.h>
 
 namespace Tomahawk
 {