fixed general plugin api

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2351 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 9 insertions, 10 deletions

diff --git a/src/plugins/General/notifier/notifier.cpp b/src/plugins/General/notifier/notifier.cpp
index 9b1cf5de6..be414c9a6 100644
--- a/src/plugins/General/notifier/notifier.cpp
+++ b/src/plugins/General/notifier/notifier.cpp
@@ -27,8 +27,7 @@
 #include "popupwidget.h"
 #include "notifier.h"
 
-Notifier::Notifier(QObject *parent)
-        : General(parent)
+Notifier::Notifier(QObject *parent) : QObject(parent)
 {
     m_popupWidget = 0;
     m_l = -1;
diff --git a/src/plugins/General/notifier/notifier.h b/src/plugins/General/notifier/notifier.h
index d9cbb7faf..2f3d433ed 100644
--- a/src/plugins/General/notifier/notifier.h
+++ b/src/plugins/General/notifier/notifier.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2011 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -29,10 +29,10 @@ class PopupWidget;
 class SoundCore;
 
 /**
-	@author Ilya Kotov <forkotov02@hotmail.ru>
+    @author Ilya Kotov <forkotov02@hotmail.ru>
 */
 
-class Notifier : public General
+class Notifier : public QObject
 {
 Q_OBJECT
 public:
diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp
index e3ba30fea..63fff569f 100644
--- a/src/plugins/General/notifier/notifierfactory.cpp
+++ b/src/plugins/General/notifier/notifierfactory.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2011 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -35,7 +35,7 @@ const GeneralProperties NotifierFactory::properties() const
     return properties;
 }
 
-General *NotifierFactory::create(QObject *parent)
+QObject *NotifierFactory::create(QObject *parent)
 {
     return new Notifier(parent);
 }
diff --git a/src/plugins/General/notifier/notifierfactory.h b/src/plugins/General/notifier/notifierfactory.h
index 68c22bbde..80f798c0a 100644
--- a/src/plugins/General/notifier/notifierfactory.h
+++ b/src/plugins/General/notifier/notifierfactory.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2011 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,10 +33,10 @@
 class NotifierFactory : public QObject, public GeneralFactory
 {
 Q_OBJECT
-Q_INTERFACES(GeneralFactory);
+Q_INTERFACES(GeneralFactory)
 public:
     const GeneralProperties properties() const;
-    General *create(QObject *parent);
+    QObject *create(QObject *parent);
     QDialog *createConfigDialog(QWidget *parent);
     void showAbout(QWidget *parent);
     QTranslator *createTranslator(QObject *parent);