From d928fc5d1d6e2220150414410c030c7bc9fe6642 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Fri, 6 Feb 2015 22:49:43 +0100
Subject: [PATCH] Use new lastfm5/ include dir for Qt5

---
 CMakeModules/FindLibLastFm.cmake                     | 2 +-
 src/libtomahawk/accounts/lastfm/LastFmConfig.cpp     | 7 +++++++
 src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp | 5 +++++
 src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h   | 6 ++++++
 src/libtomahawk/utils/TomahawkUtils.cpp              | 4 ++++
 src/tomahawk/Scrobbler.h                             | 7 ++++++-
 src/tomahawk/TomahawkApp.h                           | 4 ++++
 7 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/CMakeModules/FindLibLastFm.cmake b/CMakeModules/FindLibLastFm.cmake
index 545e39f9b..a3488350e 100644
--- a/CMakeModules/FindLibLastFm.cmake
+++ b/CMakeModules/FindLibLastFm.cmake
@@ -14,7 +14,7 @@ endif()
 # Include dir
 find_path(LIBLASTFM_INCLUDE_DIR
   # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
-  NAMES lastfm/Track.h
+  NAMES lastfm${LASTFM_LIB_SUFFIX}/Track.h
   PATHS ${KDE4_INCLUDE_DIR}
 )
 
diff --git a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
index 098e460c6..85b747be8 100644
--- a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
+++ b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
@@ -29,10 +29,17 @@
 #include "utils/Closure.h"
 #include "utils/NetworkAccessManager.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#include <lastfm5/ws.h>
+#include <lastfm5/User.h>
+#include <lastfm5/XmlQuery.h>
+#include <lastfm5/Track.h>
+#else
 #include <lastfm/ws.h>
 #include <lastfm/User.h>
 #include <lastfm/XmlQuery.h>
 #include <lastfm/Track.h>
+#endif
 
 using namespace Tomahawk::Accounts;
 
diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
index 4a7cdb09d..3ca1d6af4 100644
--- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
+++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
@@ -34,8 +34,13 @@
 #include "TomahawkSettings.h"
 #include "utils/NetworkAccessManager.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#include <lastfm5/ws.h>
+#include <lastfm5/XmlQuery.h>
+#else
 #include <lastfm/ws.h>
 #include <lastfm/XmlQuery.h>
+#endif
 
 using namespace Tomahawk::Accounts;
 using namespace Tomahawk::InfoSystem;
diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
index 6e202b216..0eb3b0749 100644
--- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
+++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
@@ -24,9 +24,15 @@
 #include "infosystem/InfoSystemWorker.h"
 #include "DllMacro.h"
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#include <lastfm5/Track.h>
+#include <lastfm5/Audioscrobbler.h>
+#include <lastfm5/ScrobblePoint.h>
+#else
 #include <lastfm/Track.h>
 #include <lastfm/Audioscrobbler.h>
 #include <lastfm/ScrobblePoint.h>
+#endif
 
 #include <QObject>
 
diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
index c7590dacc..a1d5e3876 100644
--- a/src/libtomahawk/utils/TomahawkUtils.cpp
+++ b/src/libtomahawk/utils/TomahawkUtils.cpp
@@ -32,7 +32,11 @@
 #include "Track.h"
 
 #ifdef LIBLASTFM_FOUND
+    #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+    #include <lastfm5/ws.h>
+    #else
     #include <lastfm/ws.h>
+    #endif
 #endif
 
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
diff --git a/src/tomahawk/Scrobbler.h b/src/tomahawk/Scrobbler.h
index fab0ca691..01c26959c 100644
--- a/src/tomahawk/Scrobbler.h
+++ b/src/tomahawk/Scrobbler.h
@@ -20,10 +20,15 @@
 #ifndef TOMAHAWK_SCROBBLER_H
 #define TOMAHAWK_SCROBBLER_H
 
-#include "lastfm/ScrobblePoint.h"
 #include "Result.h"
 #include "infosystem/InfoSystem.h"
 
+
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+#include <lastfm5/ScrobblePoint.h>
+#else
+#include <lastfm/ScrobblePoint.h>
+#endif
 #include <QObject>
 
 /**
diff --git a/src/tomahawk/TomahawkApp.h b/src/tomahawk/TomahawkApp.h
index c161d07e5..953140bd4 100644
--- a/src/tomahawk/TomahawkApp.h
+++ b/src/tomahawk/TomahawkApp.h
@@ -64,7 +64,11 @@ namespace Tomahawk
 }
 
 #ifdef LIBLASTFM_FOUND
+    #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+    #include <lastfm5/NetworkAccessManager.h>
+    #else
     #include <lastfm/NetworkAccessManager.h>
+    #endif
     #include "Scrobbler.h"
 #endif