Attachment #519848 for bug #647904

Lines 84-91 Link Here

(-)a/CMakeLists.txt (-2 / +2 lines)
84	endif (WIN32)	84	endif (WIN32)
85		85
86	find_library(LASTFM5_LIBRARIES lastfm5)	86	find_library(LASTFM5_LIBRARIES lastfm5)
87	find_path(LASTFM5_INCLUDE_DIRS lastfm5/ws.h)	87	find_path(LASTFM5_INCLUDE_DIRS lastfm/ws.h)
88	find_path(LASTFM51_INCLUDE_DIRS lastfm5/Track.h)	88	find_path(LASTFM51_INCLUDE_DIRS lastfm/Track.h)
89		89
90	find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable)	90	find_path(SPARSEHASH_INCLUDE_DIRS google/sparsetable)
91		91

Lines 45-53 Link Here

(-)a/src/core/song.cpp (-2 / +2 lines)
45	#ifdef HAVE_LIBLASTFM	45	#ifdef HAVE_LIBLASTFM
46	#include "internet/lastfm/fixlastfm.h"	46	#include "internet/lastfm/fixlastfm.h"
47	#ifdef HAVE_LIBLASTFM1	47	#ifdef HAVE_LIBLASTFM1
48	#include <lastfm5/Track.h>	48	#include <lastfm/Track.h>
49	#else	49	#else
50	#include <lastfm5/Track>	50	#include <lastfm/Track>
51	#endif	51	#endif
52	#endif	52	#endif
53		53




#include "fixlastfm.h"

#ifdef HAVE_LIBLASTFM1
#include <lastfm/Audioscrobbler.h>
#include <lastfm/misc.h>
#include <lastfm/ScrobbleCache.h>
#include <lastfm/ScrobblePoint.h>
#include <lastfm/User.h>
#include <lastfm/ws.h>
#include <lastfm/XmlQuery.h>
#else
#include <lastfm/Audioscrobbler>
#include <lastfm/misc.h>
#include <lastfm/ScrobbleCache>
#include <lastfm/ScrobblePoint>
#include <lastfm/User>
#include <lastfm/ws.h>
#include <lastfm/XmlQuery>
#endif

namespace lastfm {

Lines 40-48 Link Here

(-)a/src/internet/lastfm/lastfmservice.cpp (-2 / +2 lines)
40	#include <QUrlQuery>	40	#include <QUrlQuery>
41		41
42	#ifdef HAVE_LIBLASTFM1	42	#ifdef HAVE_LIBLASTFM1
43	#include <lastfm5/RadioStation.h>	43	#include <lastfm/RadioStation.h>
44	#else	44	#else
45	#include <lastfm5/RadioStation>	45	#include <lastfm/RadioStation>
46	#endif	46	#endif
47		47
48	#include "lastfmcompat.h"	48	#include "lastfmcompat.h"

Lines 22-28 Link Here

(-)a/src/internet/lastfm/lastfmsettingspage.cpp (-1 / +1 lines)
22	#include "lastfmsettingspage.h"	22	#include "lastfmsettingspage.h"
23	#include "ui_lastfmsettingspage.h"	23	#include "ui_lastfmsettingspage.h"
24		24
25	#include <lastfm5/ws.h>	25	#include <lastfm/ws.h>
26		26
27	#include <QDesktopServices>	27	#include <QDesktopServices>
28	#include <QMessageBox>	28	#include <QMessageBox>

Return to bug 647904

Lines 24-44 Link Here

(-)a/src/internet/lastfm/lastfmcompat.h (-14 / +14 lines)
24	#include "fixlastfm.h"	24	#include "fixlastfm.h"
25		25
26	#ifdef HAVE_LIBLASTFM1	26	#ifdef HAVE_LIBLASTFM1
27	#include <lastfm5/Audioscrobbler.h>	27	#include <lastfm/Audioscrobbler.h>
28	#include <lastfm5/misc.h>	28	#include <lastfm/misc.h>
29	#include <lastfm5/ScrobbleCache.h>	29	#include <lastfm/ScrobbleCache.h>
30	#include <lastfm5/ScrobblePoint.h>	30	#include <lastfm/ScrobblePoint.h>
31	#include <lastfm5/User.h>	31	#include <lastfm/User.h>
32	#include <lastfm5/ws.h>	32	#include <lastfm/ws.h>
33	#include <lastfm5/XmlQuery.h>	33	#include <lastfm/XmlQuery.h>
34	#else	34	#else
35	#include <lastfm5/Audioscrobbler>	35	#include <lastfm/Audioscrobbler>
36	#include <lastfm5/misc.h>	36	#include <lastfm/misc.h>
37	#include <lastfm5/ScrobbleCache>	37	#include <lastfm/ScrobbleCache>
38	#include <lastfm5/ScrobblePoint>	38	#include <lastfm/ScrobblePoint>
39	#include <lastfm5/User>	39	#include <lastfm/User>
40	#include <lastfm5/ws.h>	40	#include <lastfm/ws.h>
41	#include <lastfm5/XmlQuery>	41	#include <lastfm/XmlQuery>
42	#endif	42	#endif
43		43
44	namespace lastfm {	44	namespace lastfm {