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, 7 insertions, 7 deletions

diff --git a/src/plugins/General/kdenotify/kdenotify.cpp b/src/plugins/General/kdenotify/kdenotify.cpp
index d1d196362..9f5e648e5 100644
--- a/src/plugins/General/kdenotify/kdenotify.cpp
+++ b/src/plugins/General/kdenotify/kdenotify.cpp
@@ -36,7 +36,7 @@
 
 #include "kdenotify.h"
 
-KdeNotify::KdeNotify(QObject *parent) : General(parent),m_useFreedesktopSpec(false)
+KdeNotify::KdeNotify(QObject *parent) : QObject(parent),m_useFreedesktopSpec(false)
 {
     m_notifier = new QDBusInterface("org.kde.VisualNotifications",
                                       "/VisualNotifications", "org.kde.VisualNotifications",
@@ -44,7 +44,7 @@ KdeNotify::KdeNotify(QObject *parent) : General(parent),m_useFreedesktopSpec(fal
     if(m_notifier->lastError().type() != QDBusError::NoError)
     {
         delete(m_notifier);
-	m_notifier = new QDBusInterface("org.freedesktop.Notifications",
+    m_notifier = new QDBusInterface("org.freedesktop.Notifications",
                                   "/org/freedesktop/Notifications","org.freedesktop.Notifications",
                                   QDBusConnection::sessionBus(), this);
         if(m_notifier->lastError().type() != QDBusError::NoError)
diff --git a/src/plugins/General/kdenotify/kdenotify.h b/src/plugins/General/kdenotify/kdenotify.h
index d6c4d7300..06b559938 100644
--- a/src/plugins/General/kdenotify/kdenotify.h
+++ b/src/plugins/General/kdenotify/kdenotify.h
@@ -32,9 +32,9 @@
 
 class QDBusInterface;
 
-class KdeNotify : public General
+class KdeNotify : public QObject
 {
-    Q_OBJECT;
+    Q_OBJECT
 public:
     KdeNotify(QObject *parent = 0);
     ~KdeNotify();
diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.cpp b/src/plugins/General/kdenotify/kdenotifyfactory.cpp
index 59fca89b7..abd2ca214 100644
--- a/src/plugins/General/kdenotify/kdenotifyfactory.cpp
+++ b/src/plugins/General/kdenotify/kdenotifyfactory.cpp
@@ -35,7 +35,7 @@ const GeneralProperties KdeNotifyFactory::properties() const
     return properties;
 }
 
-General *KdeNotifyFactory::create(QObject *parent)
+QObject *KdeNotifyFactory::create(QObject *parent)
 {
     return new KdeNotify(parent);
 }
diff --git a/src/plugins/General/kdenotify/kdenotifyfactory.h b/src/plugins/General/kdenotify/kdenotifyfactory.h
index b9d5634eb..f4c9ea238 100644
--- a/src/plugins/General/kdenotify/kdenotifyfactory.h
+++ b/src/plugins/General/kdenotify/kdenotifyfactory.h
@@ -30,11 +30,11 @@
 
 class KdeNotifyFactory : public QObject, public GeneralFactory
 {
-    Q_OBJECT;
+    Q_OBJECT
     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);