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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/energy
From:       Laurent Montel <montel () kde ! org>
Date:       2007-09-08 0:29:59
Message-ID: 1189211399.373642.18354.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 709635 by mlaurent:

Port to kpluginsfactory
Fix mem leak


 M  +8 -4      energy.cpp  
 M  +1 -3      energy.h  


--- trunk/KDE/kdebase/workspace/kcontrol/energy/energy.cpp #709634:709635
@@ -90,9 +90,13 @@
 
 /**** DLL Interface ****/
 
-typedef KGenericFactory<KEnergy> KEnergyFactory;
-K_EXPORT_COMPONENT_FACTORY(kcm_energy, KEnergyFactory("kcmenergy"))
 
+K_PLUGIN_FACTORY(KEnergyFactory,
+        registerPlugin<KEnergy>();
+        )
+K_EXPORT_PLUGIN(KEnergyFactory("kcmenergy"))
+
+
 extern "C" {
 
     KDE_EXPORT void kcminit_energy() {
@@ -127,7 +131,7 @@
 	    suspend = DFLT_SUSPEND;
 	    off = DFLT_OFF;
 	}
-
+        delete _cfg;
         KEnergy::applySettings(enabled, standby, suspend, off);
 #endif
     }
@@ -135,7 +139,7 @@
 
 /**** KEnergy ****/
 
-KEnergy::KEnergy(QWidget *parent, const QStringList &args)
+KEnergy::KEnergy(QWidget *parent, const QVariantList &args)
     : KCModule(KEnergyFactory::componentData(), parent, args)
 {
     m_bChanged = false;
--- trunk/KDE/kdebase/workspace/kcontrol/energy/energy.h #709634:709635
@@ -15,9 +15,7 @@
 #define __Energy_h_Included__
 
 #include <QObject>
-#define KDE3_SUPPORT
 #include <kcmodule.h>
-#undef KDE3_SUPPORT
 
 class QCheckBox;
 class KIntNumInput;
@@ -33,7 +31,7 @@
     Q_OBJECT
 
 public:
-    KEnergy(QWidget *parent, const QStringList &args);
+    KEnergy(QWidget *parent, const QVariantList &args);
     ~KEnergy();
 
     virtual void load();
[prev in list] [next in list] [prev in thread] [next in thread]