[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/sysadmin/shaman/libshaman
From:       Dario Freddi <drf () kde ! org>
Date:       2009-11-30 21:59:26
Message-ID: 1259618366.018783.30348.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1056804 by dafre:

Make the backend depending on QObject

Signed-off-by: Dario Freddi <drf@kde.org>

 M  +0 -3      AbstractPlugin.cpp  
 M  +2 -1      BackendPlugin.cpp  
 M  +2 -1      BackendPlugin.h  
 M  +1 -1      PluginLoader.cpp  


--- trunk/playground/sysadmin/shaman/libshaman/AbstractPlugin.cpp #1056803:1056804
@@ -44,15 +44,12 @@
 
 void AbstractPluginPrivate::setPluginName(const QString &name)
 {
-    kDebug() << "Setting name to " << name;
     pluginName = name;
-    kDebug() << "Set to " << pluginName << this;
 }
 
 QString AbstractPlugin::name() const
 {
     Q_D(const AbstractPlugin);
-    kDebug() << "Name is " << d->pluginName << d;
     return d->pluginName;
 }
 
--- trunk/playground/sysadmin/shaman/libshaman/BackendPlugin.cpp #1056803:1056804
@@ -78,7 +78,7 @@
 }
 
 Shaman::BackendPlugin::BackendPlugin(QObject *parent)
-  : AbstractPlugin(parent),
+  : QObject(parent),
     d(new BackendPluginPrivate())
 {
     d->q_ptr = this;
@@ -96,6 +96,7 @@
 
 Shaman::BackendPlugin::~BackendPlugin()
 {
+    delete d;
 }
 
 void Shaman::BackendPlugin::customEvent(QEvent *event)
--- trunk/playground/sysadmin/shaman/libshaman/BackendPlugin.h #1056803:1056804
@@ -105,7 +105,7 @@
  * plugin you see the GUI blocked, open a bug report against Shaman before trying to implement
  * threading. In the end, use threading only if you need concurrent calls in your plugin.
  */
-class SHAMAN_EXPORT BackendPlugin : public AbstractPlugin
+class SHAMAN_EXPORT BackendPlugin : public QObject
 {
     Q_OBJECT
     Q_ENUMS(State)
@@ -410,6 +410,7 @@
 
     protected Q_SLOTS:
         // Reimplements
+        virtual void init() = 0;
         /**
          * Cancels the Database-Update if one is processing, else does nothing.
          */
--- trunk/playground/sysadmin/shaman/libshaman/PluginLoader.cpp #1056803:1056804
@@ -229,7 +229,7 @@
     foreach(QObject *o, l) {
         backend = qobject_cast<BackendPlugin *>(o);
         if (backend) {
-            kDebug() << "Backend-Plugin " + backend->name() + " successfully Initialized";
+            kDebug() << "Backend successfully Initialized";
             break;
         }
     }
[prev in list] [next in list] [prev in thread] [next in thread]