enhancements to configure external apps like email and phones through a

generalized interface

4 files changed, 25 insertions, 20 deletions

diff --git a/microkde/kdeui/kcmodule.cpp b/microkde/kdeui/kcmodule.cpp
index 915cd0f..f646db3 100644
--- a/microkde/kdeui/kcmodule.cpp
+++ b/microkde/kdeui/kcmodule.cpp
@@ -34,7 +34,8 @@ public:
         bool _useRootOnlyMsg;
         bool _hasOwnInstance;
+    KPrefs* _prefs;
 };
 
-KCModule::KCModule(QWidget *parent, const char *name, const QStringList &)
+KCModule::KCModule(KPrefs* prefs, QWidget *parent, const char *name, const QStringList &)
         : QWidget(parent, name), _btn(Help|Default|Apply)
 {
@@ -42,5 +43,6 @@ KCModule::KCModule(QWidget *parent, const char *name, const QStringList &)
     d = new KCModulePrivate;
     d->_useRootOnlyMsg = true;
-/*US    
+    d->_prefs = prefs;
+/*US
     d->_instance = new KInstance(name);
         if (name && strlen(name)) {
@@ -49,5 +51,5 @@ KCModule::KCModule(QWidget *parent, const char *name, const QStringList &)
         } else
                 d->_instance = new KInstance("kcmunnamed");
-*/    
+*/
     d->_hasOwnInstance = true;
 //US    KGlobal::setActiveInstance(this->instance());
@@ -72,5 +74,5 @@ KCModule::~KCModule()
     if (d->_hasOwnInstance)
        delete d->_instance;
-*/       
+*/
         delete d;
 }
@@ -95,4 +97,10 @@ bool KCModule::useRootOnlyMsg() const
         return d->_useRootOnlyMsg;
 }
+
+KPrefs* KCModule::getPreferences()
+{
+  return d->_prefs;
+}
+
 /*US
 KInstance *KCModule::instance() const
diff --git a/microkde/kdeui/kcmodule.h b/microkde/kdeui/kcmodule.h
index bc020bc..874958c 100644
--- a/microkde/kdeui/kcmodule.h
+++ b/microkde/kdeui/kcmodule.h
@@ -84,5 +84,5 @@ public:
    * implementation.
    */
-  KCModule(QWidget *parent=0, const char *name=0, const QStringList &args=QStringList() );
+  KCModule(KPrefs* prefs, QWidget *parent=0, const char *name=0, const QStringList &args=QStringList() );
 
 //US  KCModule(KInstance *instance, QWidget *parent=0, const QStringList &args=QStringList() );
@@ -107,5 +107,5 @@ public:
    * so you probably want to call this method in the constructor.
    */
-  virtual void load(KPrefs* prefs) {};
+  virtual void load() {};
 
   /**
@@ -120,5 +120,5 @@ public:
    * save is called when the user clicks "Apply" or "Ok".
    */
-  virtual void save(KPrefs* prefs) {};
+  virtual void save() {};
 
   /**
@@ -128,5 +128,5 @@ public:
    * button. It should set the display to useful values.
    */
-  virtual void defaults(KPrefs* prefs) {};
+  virtual void defaults() {};
 
   /**
@@ -138,5 +138,5 @@ public:
    * NOTE: The default behaviour is to call defaults().
    */
-  virtual void sysdefaults(KPrefs* prefs) { defaults(prefs); };
+  virtual void sysdefaults() { defaults(); };
 
   /**
@@ -194,4 +194,5 @@ public:
   bool useRootOnlyMsg() const;
 
+  KPrefs* getPreferences();
 
 //US  KInstance *instance() const;
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp
index c2378fb..6c82e4f 100644
--- a/microkde/kutils/kcmultidialog.cpp
+++ b/microkde/kutils/kcmultidialog.cpp
@@ -35,11 +35,10 @@
 
 #include "kcmultidialog.h"
-#include "kprefs.h"
 //US #include "kcmultidialog.moc"
 //US #include "kcmoduleloader.h"
 
-KCMultiDialog::KCMultiDialog(KPrefs* prefs, const QString& baseGroup, QWidget *parent, const char *name, bool modal)
+KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal)
   : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok,
-                parent, name, modal, true), mPrefs(prefs), d(0L)
+                parent, name, modal, true), d(0L)
 {
     enableButton(Apply, false);
@@ -76,5 +75,5 @@ void KCMultiDialog::slotDefault()
        if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex)
        {
-          (*it)->defaults(mPrefs);
+          (*it)->defaults();
           clientChanged(true);
           return;
@@ -90,5 +89,5 @@ qDebug("KCMultiDialog::slotApply clicked");
     QPtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
-      (*it)->save(mPrefs);
+      (*it)->save();
     clientChanged(false);
 
@@ -104,5 +103,5 @@ qDebug("KCMultiDialog::slotOk clicked");
     QPtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
-      (*it)->save(mPrefs);
+      (*it)->save();
     accept();
 
@@ -163,5 +162,5 @@ void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename,
     connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
 //US
-          module->load(mPrefs);
+          module->load();
 
 
diff --git a/microkde/kutils/kcmultidialog.h b/microkde/kutils/kcmultidialog.h
index a42555f..1aa66b2 100644
--- a/microkde/kutils/kcmultidialog.h
+++ b/microkde/kutils/kcmultidialog.h
@@ -30,6 +30,4 @@
 #include <kcmodule.h>
 
-class KPrefs;
-
 /**
  * A class that offers a @ref KDialogBase containing arbitrary KControl Modules
@@ -55,5 +53,5 @@ public:
      * @param modal If you pass true here, the dialog will be modal
      **/
-    KCMultiDialog(KPrefs* prefs, const QString& baseGroup = QString::fromLatin1("settings"),
+    KCMultiDialog(const QString& baseGroup = QString::fromLatin1("settings"),
                   QWidget *parent=0, const char *name=0,
                   bool modal=false);
@@ -140,5 +138,4 @@ private:
 //US
     KJanusWidget* mMainWidget;
-    KPrefs* mPrefs;
 
     // For future use