mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

Revert echonest5/ header ifdefs

Browse Source
This commit is contained in:
Uwe L. Korn
2014-06-23 15:11:41 +01:00
parent 9989052385
commit 4aa2f26fa4
6 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeModules/FindEchonest.cmake
View File

@@ -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}

7
src/infoplugins/generic/echonest/EchonestPlugin.cpp
View File

@@ -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>

6
src/infoplugins/generic/echonest/EchonestPlugin.h
View File

@@ -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>

6
src/libtomahawk/GlobalActionManager.cpp
View File

@@ -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;

6
src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp
View File

@@ -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>

6
src/tomahawk/sourcetree/items/CategoryItems.cpp
View File

@@ -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;