From 4aa2f26fa49e28eef0c0afec420fd9524c879716 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Mon, 23 Jun 2014 15:11:41 +0100
Subject: [PATCH] Revert echonest5/ header ifdefs

---
 CMakeModules/FindEchonest.cmake                            | 2 +-
 src/infoplugins/generic/echonest/EchonestPlugin.cpp        | 7 +------
 src/infoplugins/generic/echonest/EchonestPlugin.h          | 6 +-----
 src/libtomahawk/GlobalActionManager.cpp                    | 6 +-----
 .../playlist/dynamic/echonest/EchonestSteerer.cpp          | 6 +-----
 src/tomahawk/sourcetree/items/CategoryItems.cpp            | 6 +-----
 6 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/CMakeModules/FindEchonest.cmake b/CMakeModules/FindEchonest.cmake
index 145937239..2a3625ef5 100644
--- a/CMakeModules/FindEchonest.cmake
+++ b/CMakeModules/FindEchonest.cmake
@@ -13,7 +13,7 @@ endif()
 
 PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX})
 
-FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest${LIBECHONEST_SUFFIX}/Track.h
+FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
     HINTS
         ${PC_ECHONEST_INCLUDEDIR}
         ${PC_ECHONEST_INCLUDE_DIRS}
diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.cpp b/src/infoplugins/generic/echonest/EchonestPlugin.cpp
index addaee5ac..c0135a0b5 100644
--- a/src/infoplugins/generic/echonest/EchonestPlugin.cpp
+++ b/src/infoplugins/generic/echonest/EchonestPlugin.cpp
@@ -23,12 +23,7 @@
 #include "utils/Logger.h"
 #include "utils/NetworkAccessManager.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    #include <echonest/ArtistTypes.h>
-#else
-    #include <echonest5/ArtistTypes.h>
-#endif
-
+#include <echonest/ArtistTypes.h>
 
 #include <QNetworkConfiguration>
 
diff --git a/src/infoplugins/generic/echonest/EchonestPlugin.h b/src/infoplugins/generic/echonest/EchonestPlugin.h
index 7310edd66..7388b3884 100644
--- a/src/infoplugins/generic/echonest/EchonestPlugin.h
+++ b/src/infoplugins/generic/echonest/EchonestPlugin.h
@@ -25,11 +25,7 @@
 #include "infosystem/InfoSystem.h"
 #include "infosystem/InfoSystemWorker.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    #include <echonest/Artist.h>
-#else
-    #include <echonest5/Artist.h>
-#endif
+#include <echonest/Artist.h>
 
 #include <QObject>
 
diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp
index 2af9284ce..5ce32cf6e 100644
--- a/src/libtomahawk/GlobalActionManager.cpp
+++ b/src/libtomahawk/GlobalActionManager.cpp
@@ -52,11 +52,7 @@
 #include <QApplication>
 #include <QClipboard>
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    #include <echonest/Playlist.h>
-#else
-    #include <echonest5/Playlist.h>
-#endif
+#include <echonest/Playlist.h>
 
 
 GlobalActionManager* GlobalActionManager::s_instance = 0;
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
index 8f94d25fe..d7e2040de 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
@@ -24,11 +24,7 @@
 #include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    #include <echonest/Playlist.h>
-#else
-    #include <echonest5/Playlist.h>
-#endif
+#include <echonest/Playlist.h>
 
 #include <QPaintEvent>
 #include <QHBoxLayout>
diff --git a/src/tomahawk/sourcetree/items/CategoryItems.cpp b/src/tomahawk/sourcetree/items/CategoryItems.cpp
index 5983a2b44..e273f17c1 100644
--- a/src/tomahawk/sourcetree/items/CategoryItems.cpp
+++ b/src/tomahawk/sourcetree/items/CategoryItems.cpp
@@ -34,11 +34,7 @@
 #include "utils/ImageRegistry.h"
 #include "utils/Logger.h"
 
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-    #include <echonest/Playlist.h>
-#else
-    #include <echonest5/Playlist.h>
-#endif
+#include <echonest/Playlist.h>
 
 using namespace Tomahawk;