qt5: port InfoPlugins

src/infoplugins/generic/charts/ChartsPlugin.cpp

@@ -38,7 +38,6 @@
 #include <QSettings>
 #include <QNetworkConfiguration>
 #include <QNetworkReply>
-#include <QtPlugin>
 
 #define CHART_URL "http://charts.tomahawk-player.org/"
 //#define CHART_URL "http://localhost:8080/"

src/infoplugins/generic/charts/ChartsPlugin.h

@@ -36,6 +36,7 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT ChartsPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/infoplugins/generic/discogs/DiscogsPlugin.cpp

@@ -27,7 +27,6 @@
 
 #include <QNetworkReply>
 #include <QDomDocument>
-#include <QtPlugin>
 
 using namespace Tomahawk::InfoSystem;
 

src/infoplugins/generic/discogs/DiscogsPlugin.h

@@ -34,6 +34,7 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT DiscogsPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/infoplugins/generic/echonest/EchonestPlugin.cpp

@@ -24,7 +24,6 @@
 #include "utils/Logger.h"
 
 #include <QNetworkConfiguration>
-#include <QtPlugin>
 
 namespace Tomahawk
 {

src/infoplugins/generic/echonest/EchonestPlugin.h

@@ -37,6 +37,7 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT EchonestPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/infoplugins/generic/hypem/HypemPlugin.cpp

@@ -24,7 +24,6 @@
 #include <QCryptographicHash>
 #include <QNetworkConfiguration>
 #include <QNetworkReply>
-#include <QtPlugin>
 
 #include "Album.h"
 #include "Typedefs.h"

src/infoplugins/generic/hypem/HypemPlugin.h

@@ -36,6 +36,7 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT HypemPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.cpp

@@ -24,7 +24,6 @@
 
 #include <QNetworkReply>
 #include <QDomDocument>
-#include <QtPlugin>
 
 using namespace Tomahawk::InfoSystem;
 

src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.h

@@ -34,6 +34,7 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT MusicBrainzPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/infoplugins/generic/musixmatch/MusixMatchPlugin.cpp

@@ -24,7 +24,6 @@
 
 #include <QNetworkReply>
 #include <QDomDocument>
-#include <QtPlugin>
 
 using namespace Tomahawk::InfoSystem;
 

src/infoplugins/generic/musixmatch/MusixMatchPlugin.h

@@ -34,6 +34,7 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT MusixMatchPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp

@@ -38,7 +38,6 @@
 #include <QSettings>
 #include <QNetworkConfiguration>
 #include <QNetworkReply>
-#include <QtPlugin>
 
 #define CHART_URL "http://charts.tomahawk-player.org/"
 //#define CHART_URL "http://localhost:8080/"

src/infoplugins/generic/newreleases/NewReleasesPlugin.h

@@ -37,8 +37,10 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT NewReleasesPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
 public:
     NewReleasesPlugin();
     virtual ~NewReleasesPlugin();

src/infoplugins/generic/rovi/RoviPlugin.cpp

@@ -25,7 +25,6 @@
 
 #include <QDateTime>
 #include <QNetworkReply>
-#include <QtPlugin>
 
 using namespace Tomahawk::InfoSystem;
 

src/infoplugins/generic/rovi/RoviPlugin.h

@@ -35,6 +35,7 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT RoviPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/infoplugins/generic/spotify/SpotifyPlugin.cpp

@@ -24,7 +24,6 @@
 #include <QCryptographicHash>
 #include <QNetworkConfiguration>
 #include <QNetworkReply>
-#include <QtPlugin>
 
 #include "Album.h"
 #include "Typedefs.h"

src/infoplugins/generic/spotify/SpotifyPlugin.h

@@ -37,6 +37,7 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT SpotifyPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/infoplugins/linux/fdonotify/FdoNotifyPlugin.h

@@ -31,6 +31,7 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT FdoNotifyPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/infoplugins/linux/mpris/MprisPlugin.h

@@ -36,6 +36,7 @@ namespace InfoSystem
 
 class INFOPLUGINDLLEXPORT MprisPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/infoplugins/mac/adium/AdiumPlugin.h

@@ -36,6 +36,7 @@ namespace InfoSystem {
 
 class INFOPLUGINDLLEXPORT AdiumPlugin : public InfoPlugin
 {
+    Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.InfoPlugin" )
     Q_OBJECT
     Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
 

src/libtomahawk/TomahawkPlugin.h

@@ -0,0 +1,11 @@
+#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
+    #if defined(Q_EXPORT_PLUGIN)
+        #undef Q_EXPORT_PLUGIN
+        #undef Q_EXPORT_PLUGIN2
+    #endif
+
+    #define Q_EXPORT_PLUGIN(a)
+    #define Q_EXPORT_PLUGIN2(a, b)
+#else
+    # define Q_PLUGIN_METADATA(a)
+#endif

src/libtomahawk/infosystem/InfoSystem.h

@@ -23,6 +23,7 @@
 #include "DllMacro.h"
 #include "utils/TomahawkUtils.h"
 #include "Typedefs.h"
+#include "TomahawkPlugin.h"
 
 #include <QtCore/QCryptographicHash>
 #include <QtCore/QObject>