27 files changed, 37 insertions, 38 deletions
diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
index d6045c1a4..0fd9dcd4d 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
@@ -83,4 +83,4 @@ QTranslator *IncDecVolumeCommandLineOption::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(IncDecVolumeCommandLineOption)
+Q_EXPORT_PLUGIN2(incdecvolumeoption, IncDecVolumeCommandLineOption)
diff --git a/src/plugins/Effect/bs2b/effectbs2bfactory.cpp b/src/plugins/Effect/bs2b/effectbs2bfactory.cpp
index d9dbb2595..037aa7b2f 100644
--- a/src/plugins/Effect/bs2b/effectbs2bfactory.cpp
+++ b/src/plugins/Effect/bs2b/effectbs2bfactory.cpp
@@ -67,4 +67,4 @@ QTranslator *EffectBs2bFactory::createTranslator(QObject *parent)
     return translator;
 };
 
-Q_EXPORT_PLUGIN(EffectBs2bFactory)
+Q_EXPORT_PLUGIN2(bs2b,EffectBs2bFactory)
diff --git a/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp b/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp
index fc09727b6..6b259fa89 100644
--- a/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp
+++ b/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp
@@ -60,4 +60,4 @@ QTranslator *EffectSRConverterFactory::createTranslator(QObject *parent)
     return translator;
 };
 
-Q_EXPORT_PLUGIN(EffectSRConverterFactory)
+Q_EXPORT_PLUGIN2(srconverter, EffectSRConverterFactory)
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
index d496bb0ed..e2e90721c 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
@@ -143,4 +143,4 @@ QTranslator *QmmpFileDialogFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(QmmpFileDialogFactory)
+Q_EXPORT_PLUGIN2(qmmpfiledialog, QmmpFileDialogFactory)
diff --git a/src/plugins/General/fileops/fileopsfactory.cpp b/src/plugins/General/fileops/fileopsfactory.cpp
index a99e65deb..20e8aca0e 100644
--- a/src/plugins/General/fileops/fileopsfactory.cpp
+++ b/src/plugins/General/fileops/fileopsfactory.cpp
@@ -60,4 +60,4 @@ QTranslator *FileOpsFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(FileOpsFactory)
+Q_EXPORT_PLUGIN2(fileops, FileOpsFactory)
diff --git a/src/plugins/General/hal/halfactory.cpp b/src/plugins/General/hal/halfactory.cpp
index 4c7cfd04b..97456d1a1 100644
--- a/src/plugins/General/hal/halfactory.cpp
+++ b/src/plugins/General/hal/halfactory.cpp
@@ -62,4 +62,4 @@ QTranslator *HalFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(HalFactory)
+Q_EXPORT_PLUGIN2(hal, HalFactory)
diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp
index 2c469f74f..9e706369d 100644
--- a/src/plugins/General/hotkey/hotkeyfactory.cpp
+++ b/src/plugins/General/hotkey/hotkeyfactory.cpp
@@ -61,4 +61,4 @@ QTranslator *HotkeyFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(HotkeyFactory)
+Q_EXPORT_PLUGIN2(hotkey, HotkeyFactory)
diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp
index 1ac6d28e8..f9e8f1d7c 100644
--- a/src/plugins/General/lyrics/lyricsfactory.cpp
+++ b/src/plugins/General/lyrics/lyricsfactory.cpp
@@ -61,4 +61,4 @@ QTranslator *LyricsFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(LyricsFactory)
+Q_EXPORT_PLUGIN2(lyrcis, LyricsFactory)
diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp
index 0d8ae0a28..0b95d9967 100644
--- a/src/plugins/General/mpris/mprisfactory.cpp
+++ b/src/plugins/General/mpris/mprisfactory.cpp
@@ -59,4 +59,4 @@ QTranslator *MPRISFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(MPRISFactory)
+Q_EXPORT_PLUGIN2(mpris, MPRISFactory)
diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp
index a1095fccf..49be44fd6 100644
--- a/src/plugins/General/notifier/notifierfactory.cpp
+++ b/src/plugins/General/notifier/notifierfactory.cpp
@@ -60,4 +60,4 @@ QTranslator *NotifierFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(NotifierFactory)
+Q_EXPORT_PLUGIN2(notifier,NotifierFactory)
diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp
index fc613bb0b..02a729e7c 100644
--- a/src/plugins/General/scrobbler/scrobblerfactory.cpp
+++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp
@@ -60,4 +60,4 @@ QTranslator *ScrobblerFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(ScrobblerFactory)
+Q_EXPORT_PLUGIN2(scrobbler, ScrobblerFactory)
diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp
index 129414cc6..74adae06f 100644
--- a/src/plugins/General/statusicon/statusiconfactory.cpp
+++ b/src/plugins/General/statusicon/statusiconfactory.cpp
@@ -60,4 +60,4 @@ QTranslator *StatusIconFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(StatusIconFactory)
+Q_EXPORT_PLUGIN2(statusicon,StatusIconFactory)
diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro
index 22ae0f653..467a495ed 100644
--- a/src/plugins/Input/Input.pro
+++ b/src/plugins/Input/Input.pro
@@ -4,7 +4,7 @@ SUBDIRS += mad cue
 TEMPLATE = subdirs
 
 unix{
-#SUBDIRS += vorbis sndfile wavpack
+SUBDIRS += vorbis# sndfile wavpack
 contains(CONFIG, MODPLUG_PLUGIN){
 #    SUBDIRS += modplug
     message(***************************)
diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp
index 5b7a9a716..0a33b87ec 100644
--- a/src/plugins/Input/cue/decodercuefactory.cpp
+++ b/src/plugins/Input/cue/decodercuefactory.cpp
@@ -94,4 +94,4 @@ QTranslator *DecoderCUEFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(DecoderCUEFactory)
+Q_EXPORT_PLUGIN2(cue,DecoderCUEFactory)
diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp
index 11009d617..fa89e5f5d 100644
--- a/src/plugins/Input/mad/decodermadfactory.cpp
+++ b/src/plugins/Input/mad/decodermadfactory.cpp
@@ -239,4 +239,4 @@ QTranslator *DecoderMADFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(DecoderMADFactory)
+Q_EXPORT_PLUGIN2(mad, DecoderMADFactory)
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index ae81e46fa..1c3a0c87c 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -131,4 +131,4 @@ QTranslator *DecoderVorbisFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(DecoderVorbisFactory)
+Q_EXPORT_PLUGIN2(vorbis,DecoderVorbisFactory)
diff --git a/src/plugins/Output/alsa/outputalsafactory.cpp b/src/plugins/Output/alsa/outputalsafactory.cpp
index e2c8d03d0..28a3d6cfd 100644
--- a/src/plugins/Output/alsa/outputalsafactory.cpp
+++ b/src/plugins/Output/alsa/outputalsafactory.cpp
@@ -66,4 +66,4 @@ QTranslator *OutputALSAFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(OutputALSAFactory)
+Q_EXPORT_PLUGIN2(alsa,OutputALSAFactory)
diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp
index 997330d5c..cd67f32ee 100644
--- a/src/plugins/Output/jack/outputjackfactory.cpp
+++ b/src/plugins/Output/jack/outputjackfactory.cpp
@@ -63,4 +63,4 @@ QTranslator *OutputJACKFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(OutputJACKFactory)
+Q_EXPORT_PLUGIN2(jack,OutputJACKFactory)
diff --git a/src/plugins/Output/oss/outputossfactory.cpp b/src/plugins/Output/oss/outputossfactory.cpp
index 36dd55f34..01bd5edf1 100644
--- a/src/plugins/Output/oss/outputossfactory.cpp
+++ b/src/plugins/Output/oss/outputossfactory.cpp
@@ -67,4 +67,4 @@ QTranslator *OutputOSSFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(OutputOSSFactory)
+Q_EXPORT_PLUGIN2(oss,OutputOSSFactory)
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
index 371bc18f5..4e508c51e 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
@@ -64,4 +64,4 @@ QTranslator *OutputPulseAudioFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(OutputPulseAudioFactory)
+Q_EXPORT_PLUGIN2(pulseaudio, OutputPulseAudioFactory)
diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
index 121fd6367..ec44e76b2 100644
--- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp
+++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
@@ -65,4 +65,4 @@ QTranslator *OutputWaveOutFactory::createTranslator(QObject *parent)
     return translator;
 }
 
-Q_EXPORT_PLUGIN(OutputWaveOutFactory)
+Q_EXPORT_PLUGIN2(waveout,OutputWaveOutFactory)
diff --git a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp
index 11f9fbd4c..18ddc6b01 100644
--- a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp
+++ b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp
@@ -86,4 +86,4 @@ QString M3UPlaylistFormat::name() const
     return "M3UPlaylistFormat";
 }
 
-Q_EXPORT_PLUGIN(M3UPlaylistFormat)
+Q_EXPORT_PLUGIN2(m3uplaylistformat,M3UPlaylistFormat)
diff --git a/src/plugins/PlaylistFormats/pls/plsplaylistformat.cpp b/src/plugins/PlaylistFormats/pls/plsplaylistformat.cpp
index 10437d7fa..da567db47 100644
--- a/src/plugins/PlaylistFormats/pls/plsplaylistformat.cpp
+++ b/src/plugins/PlaylistFormats/pls/plsplaylistformat.cpp
@@ -100,4 +100,4 @@ QString PLSPlaylistFormat::encode(const QList<AbstractPlaylistItem *> & contents
     return out.join("\n");
 }
 
-Q_EXPORT_PLUGIN(PLSPlaylistFormat)
+Q_EXPORT_PLUGIN2(plsplaylistformat, PLSPlaylistFormat)
diff --git a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
index 602864043..9b5612fab 100644
--- a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
+++ b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
@@ -163,4 +163,4 @@ QString XSPFPlaylistFormat::name() const
     return "XSPFPlaylistFormat";
 }
 
-Q_EXPORT_PLUGIN(XSPFPlaylistFormat)
+Q_EXPORT_PLUGIN2(xspfplaylistformat,XSPFPlaylistFormat)
diff --git a/src/plugins/Transports/http/httpinputfactory.cpp b/src/plugins/Transports/http/httpinputfactory.cpp
index 69bfcbb79..25964eaa1 100644
--- a/src/plugins/Transports/http/httpinputfactory.cpp
+++ b/src/plugins/Transports/http/httpinputfactory.cpp
@@ -34,5 +34,4 @@ InputSource *HTTPInputFactory::create(const QString &url, QObject *parent)
 {
     return new HTTPInputSource(url, parent);
 }
-//Q_EXPORT_PLUGIN2(http, HTTPInputFactory);
-Q_EXPORT_PLUGIN(HTTPInputFactory);
+Q_EXPORT_PLUGIN2(http, HTTPInputFactory);
diff --git a/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp b/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp
index b5344ce15..24181ea13 100644
--- a/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp
+++ b/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp
@@ -32,24 +32,24 @@ const VisualProperties VisualAnalyzerFactory::properties() const
     properties.hasSettings = TRUE;
     properties.hasAbout = TRUE;
     return properties;
-};
+}
 
 Visual *VisualAnalyzerFactory::create(QWidget *parent)
 {
     return new Analyzer(parent);
-};
+}
 
 QDialog *VisualAnalyzerFactory::createConfigDialog(QWidget *parent)
 {
     return new SettingsDialog(parent);
-};
+}
 
 void VisualAnalyzerFactory::showAbout(QWidget *parent)
 {
     QMessageBox::about (parent, tr("About Analyzer Visual Plugin"),
                         tr("Qmmp Analyzer Visual Plugin")+"\n"+
                         tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
-};
+}
 
 QTranslator *VisualAnalyzerFactory::createTranslator(QObject *parent)
 {
@@ -57,6 +57,6 @@ QTranslator *VisualAnalyzerFactory::createTranslator(QObject *parent)
     QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/analyzer_plugin_") + locale);
     return translator;
-};
+}
 
-Q_EXPORT_PLUGIN(VisualAnalyzerFactory)
+Q_EXPORT_PLUGIN2(analyzer,VisualAnalyzerFactory)
diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.cpp b/src/plugins/Visual/projectm/visualprojectmfactory.cpp
index c1fb0fe3c..0dee0b55a 100644
--- a/src/plugins/Visual/projectm/visualprojectmfactory.cpp
+++ b/src/plugins/Visual/projectm/visualprojectmfactory.cpp
@@ -31,18 +31,18 @@ const VisualProperties VisualProjectMFactory::properties() const
     properties.hasSettings = FALSE;
     properties.hasAbout = TRUE;
     return properties;
-};
+}
 
 Visual *VisualProjectMFactory::create(QWidget *parent)
 {
     return new ProjectMPlugin(parent);
-};
+}
 
 QDialog *VisualProjectMFactory::createConfigDialog(QWidget *parent)
 {
     Q_UNUSED(parent);
     return 0;
-};
+}
 
 void VisualProjectMFactory::showAbout(QWidget *parent)
 {
@@ -51,7 +51,7 @@ void VisualProjectMFactory::showAbout(QWidget *parent)
                         tr("This plugins adds projectM visualization")+"\n"+
                         tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>")+"\n"+
                         tr("Based on llibrojectM-qt library"));
-};
+}
 
 QTranslator *VisualProjectMFactory::createTranslator(QObject *parent)
 {
@@ -59,6 +59,6 @@ QTranslator *VisualProjectMFactory::createTranslator(QObject *parent)
     QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/projectm_plugin_") + locale);
     return translator;
-};
+}
 
-Q_EXPORT_PLUGIN(VisualProjectMFactory)
+Q_EXPORT_PLUGIN2(projectm,VisualProjectMFactory)