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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/energy
From:       Matthias Kretz <kretz () kde ! org>
Date:       2006-07-19 18:00:43
Message-ID: 1153332043.724972.4162.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 564271 by mkretz:

correct init symbols


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


--- trunk/KDE/kdebase/workspace/kcontrol/energy/energy.cpp #564270:564271
@@ -41,6 +41,7 @@
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <kurllabel.h>
+#include <kgenericfactory.h>
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ -89,14 +90,12 @@
 
 /**** DLL Interface ****/
 
+typedef KGenericFactory<KEnergy> KEnergyFactory;
+K_EXPORT_COMPONENT_FACTORY(energy, KEnergyFactory("kcmenergy"))
+
 extern "C" {
 
-    KDE_EXPORT KCModule *create_energy(QWidget *parent, char *) {
-        KInstance *energy = new KInstance("kcmenergy");
-	return new KEnergy(energy, parent);
-    }
-
-    KDE_EXPORT void init_energy() {
+    KDE_EXPORT void kcminit_energy() {
 #ifdef HAVE_DPMS
         KConfig *cfg = new KConfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/);
         cfg->setGroup("DisplayEnergy");
@@ -138,8 +137,8 @@
 
 /**** KEnergy ****/
 
-KEnergy::KEnergy(KInstance *inst, QWidget *parent)
-    : KCModule(inst, parent)
+KEnergy::KEnergy(QWidget *parent, const QStringList &args)
+    : KCModule(KEnergyFactory::instance(), parent, args)
 {
     m_bChanged = false;
     m_bEnabled = false;
--- trunk/KDE/kdebase/workspace/kcontrol/energy/energy.h #564270:564271
@@ -16,13 +16,14 @@
 
 #include <QObject>
 #include <kcmodule.h>
+#include <QStringList>
 
 class QCheckBox;
 class KIntNumInput;
 class KConfig;
 class KInstance;
 
-extern "C" void init_energy();
+extern "C" void kcminit_energy();
 
 /**
  * The Desktop/Energy tab in kcontrol.
@@ -32,7 +33,7 @@
     Q_OBJECT
 
 public:
-    KEnergy(KInstance *inst, QWidget *parent);
+    KEnergy(QWidget *parent, const QStringList &args);
     ~KEnergy();
 
     virtual void load();
@@ -52,7 +53,7 @@
     void showSettings();
 
     static void applySettings(bool, int, int, int);
-    friend void init_energy();
+    friend void kcminit_energy();
 
     bool m_bChanged, m_bDPMS, m_bEnabled, m_bMaintainSanity;
     int m_Standby, m_Suspend, m_Off;
[prev in list] [next in list] [prev in thread] [next in thread]