summaryrefslogtreecommitdiffabout
path: root/microkde
Unidiff
Diffstat (limited to 'microkde') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kdeui/kcmodule.h9
-rw-r--r--microkde/kutils/kcmultidialog.cpp13
-rw-r--r--microkde/kutils/kcmultidialog.h20
-rw-r--r--microkde/microkdeE.pro2
4 files changed, 26 insertions, 18 deletions
diff --git a/microkde/kdeui/kcmodule.h b/microkde/kdeui/kcmodule.h
index 90a87c9..bc020bc 100644
--- a/microkde/kdeui/kcmodule.h
+++ b/microkde/kdeui/kcmodule.h
@@ -28,2 +28,3 @@
28class KCModulePrivate; 28class KCModulePrivate;
29class KPrefs;
29//US class KInstance; 30//US class KInstance;
@@ -107,3 +108,3 @@ public:
107 */ 108 */
108 virtual void load() {}; 109 virtual void load(KPrefs* prefs) {};
109 110
@@ -120,3 +121,3 @@ public:
120 */ 121 */
121 virtual void save() {}; 122 virtual void save(KPrefs* prefs) {};
122 123
@@ -128,3 +129,3 @@ public:
128 */ 129 */
129 virtual void defaults() {}; 130 virtual void defaults(KPrefs* prefs) {};
130 131
@@ -138,3 +139,3 @@ public:
138 */ 139 */
139 virtual void sysdefaults() { defaults(); }; 140 virtual void sysdefaults(KPrefs* prefs) { defaults(prefs); };
140 141
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp
index 13be2ce..c2378fb 100644
--- a/microkde/kutils/kcmultidialog.cpp
+++ b/microkde/kutils/kcmultidialog.cpp
@@ -36,2 +36,3 @@
36#include "kcmultidialog.h" 36#include "kcmultidialog.h"
37#include "kprefs.h"
37//US #include "kcmultidialog.moc" 38//US #include "kcmultidialog.moc"
@@ -39,5 +40,5 @@
39 40
40KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal) 41KCMultiDialog::KCMultiDialog(KPrefs* prefs, const QString& baseGroup, QWidget *parent, const char *name, bool modal)
41 : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, 42 : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok,
42 parent, name, modal, true), d(0L) 43 parent, name, modal, true), mPrefs(prefs), d(0L)
43{ 44{
@@ -76,3 +77,3 @@ void KCMultiDialog::slotDefault()
76 { 77 {
77 (*it)->defaults(); 78 (*it)->defaults(mPrefs);
78 clientChanged(true); 79 clientChanged(true);
@@ -90,3 +91,3 @@ qDebug("KCMultiDialog::slotApply clicked");
90 for (; it.current(); ++it) 91 for (; it.current(); ++it)
91 (*it)->save(); 92 (*it)->save(mPrefs);
92 clientChanged(false); 93 clientChanged(false);
@@ -104,3 +105,3 @@ qDebug("KCMultiDialog::slotOk clicked");
104 for (; it.current(); ++it) 105 for (; it.current(); ++it)
105 (*it)->save(); 106 (*it)->save(mPrefs);
106 accept(); 107 accept();
@@ -162,2 +163,4 @@ void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename,
162 connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); 163 connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
164//US
165 module->load(mPrefs);
163 166
diff --git a/microkde/kutils/kcmultidialog.h b/microkde/kutils/kcmultidialog.h
index 63d5d42..a42555f 100644
--- a/microkde/kutils/kcmultidialog.h
+++ b/microkde/kutils/kcmultidialog.h
@@ -31,2 +31,3 @@
31 31
32class KPrefs;
32 33
@@ -55,3 +56,3 @@ public:
55 **/ 56 **/
56 KCMultiDialog(const QString& baseGroup = QString::fromLatin1("settings"), 57 KCMultiDialog(KPrefs* prefs, const QString& baseGroup = QString::fromLatin1("settings"),
57 QWidget *parent=0, const char *name=0, 58 QWidget *parent=0, const char *name=0,
@@ -79,5 +80,5 @@ public:
79 QVBox* getNewVBoxPage(const QString & modulename) ; 80 QVBox* getNewVBoxPage(const QString & modulename) ;
80 81
81 82
82 83
83protected slots: 84protected slots:
@@ -130,13 +131,14 @@ private:
130 }; 131 };
131*/ 132*/
132 QPtrList<KCModule> modules; 133 QPtrList<KCModule> modules;
133/* 134/*
134 QPtrDict<LoadInfo> moduleDict; 135 QPtrDict<LoadInfo> moduleDict;
135 QString _docPath; 136 QString _docPath;
136*/ 137*/
137 QString _baseGroup; 138 QString _baseGroup;
138 139
139//US 140//US
140 KJanusWidget* mMainWidget; 141 KJanusWidget* mMainWidget;
141 142 KPrefs* mPrefs;
143
142 // For future use 144 // For future use
diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro
index b664c9a..06b288b 100644
--- a/microkde/microkdeE.pro
+++ b/microkde/microkdeE.pro
@@ -97,2 +97,3 @@ osmartpointer.h \
97 kdecore/kcatalogue.h \ 97 kdecore/kcatalogue.h \
98 kdecore/kprefs.h \
98 kdecore/ksharedptr.h \ 99 kdecore/ksharedptr.h \
@@ -140,2 +141,3 @@ oprocess.cpp \
140 kdecore/kmdcodec.cpp \ 141 kdecore/kmdcodec.cpp \
142 kdecore/kprefs.cpp \
141 kdecore/kshell.cpp \ 143 kdecore/kshell.cpp \