Diffstat (limited to 'microkde/kutils/kcmultidialog.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
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 | |||
@@ -31,19 +31,18 @@ | |||
31 | #include <kmessagebox.h> | 31 | #include <kmessagebox.h> |
32 | //US #include <klibloader.h> | 32 | //US #include <klibloader.h> |
33 | #include <krun.h> | 33 | #include <krun.h> |
34 | #include <kprocess.h> | 34 | #include <kprocess.h> |
35 | 35 | ||
36 | #include "kcmultidialog.h" | 36 | #include "kcmultidialog.h" |
37 | #include "kprefs.h" | ||
38 | //US #include "kcmultidialog.moc" | 37 | //US #include "kcmultidialog.moc" |
39 | //US #include "kcmoduleloader.h" | 38 | //US #include "kcmoduleloader.h" |
40 | 39 | ||
41 | KCMultiDialog::KCMultiDialog(KPrefs* prefs, const QString& baseGroup, QWidget *parent, const char *name, bool modal) | 40 | KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal) |
42 | : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, | 41 | : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, |
43 | parent, name, modal, true), mPrefs(prefs), d(0L) | 42 | parent, name, modal, true), d(0L) |
44 | { | 43 | { |
45 | enableButton(Apply, false); | 44 | enableButton(Apply, false); |
46 | //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); | 45 | //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); |
47 | 46 | ||
48 | connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); | 47 | connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); |
49 | 48 | ||
@@ -72,13 +71,13 @@ void KCMultiDialog::slotDefault() | |||
72 | 71 | ||
73 | QPtrListIterator<KCModule> it(modules); | 72 | QPtrListIterator<KCModule> it(modules); |
74 | for (; it.current(); ++it) | 73 | for (; it.current(); ++it) |
75 | { | 74 | { |
76 | if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex) | 75 | if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex) |
77 | { | 76 | { |
78 | (*it)->defaults(mPrefs); | 77 | (*it)->defaults(); |
79 | clientChanged(true); | 78 | clientChanged(true); |
80 | return; | 79 | return; |
81 | } | 80 | } |
82 | } | 81 | } |
83 | 82 | ||
84 | } | 83 | } |
@@ -86,13 +85,13 @@ void KCMultiDialog::slotDefault() | |||
86 | void KCMultiDialog::slotApply() | 85 | void KCMultiDialog::slotApply() |
87 | { | 86 | { |
88 | qDebug("KCMultiDialog::slotApply clicked"); | 87 | qDebug("KCMultiDialog::slotApply clicked"); |
89 | 88 | ||
90 | QPtrListIterator<KCModule> it(modules); | 89 | QPtrListIterator<KCModule> it(modules); |
91 | for (; it.current(); ++it) | 90 | for (; it.current(); ++it) |
92 | (*it)->save(mPrefs); | 91 | (*it)->save(); |
93 | clientChanged(false); | 92 | clientChanged(false); |
94 | 93 | ||
95 | emit applyClicked(); | 94 | emit applyClicked(); |
96 | 95 | ||
97 | } | 96 | } |
98 | 97 | ||
@@ -100,13 +99,13 @@ qDebug("KCMultiDialog::slotApply clicked"); | |||
100 | void KCMultiDialog::slotOk() | 99 | void KCMultiDialog::slotOk() |
101 | { | 100 | { |
102 | qDebug("KCMultiDialog::slotOk clicked"); | 101 | qDebug("KCMultiDialog::slotOk clicked"); |
103 | 102 | ||
104 | QPtrListIterator<KCModule> it(modules); | 103 | QPtrListIterator<KCModule> it(modules); |
105 | for (; it.current(); ++it) | 104 | for (; it.current(); ++it) |
106 | (*it)->save(mPrefs); | 105 | (*it)->save(); |
107 | accept(); | 106 | accept(); |
108 | 107 | ||
109 | emit okClicked(); | 108 | emit okClicked(); |
110 | } | 109 | } |
111 | 110 | ||
112 | void KCMultiDialog::slotHelp() | 111 | void KCMultiDialog::slotHelp() |
@@ -159,13 +158,13 @@ QVBox * KCMultiDialog::getNewVBoxPage( const QString & modulename ) | |||
159 | void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, const QString& iconname) | 158 | void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, const QString& iconname) |
160 | { | 159 | { |
161 | 160 | ||
162 | modules.append(module); | 161 | modules.append(module); |
163 | connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); | 162 | connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); |
164 | //US | 163 | //US |
165 | module->load(mPrefs); | 164 | module->load(); |
166 | 165 | ||
167 | 166 | ||
168 | } | 167 | } |
169 | 168 | ||
170 | void KCMultiDialog::slotAboutToShow(QWidget *page) | 169 | void KCMultiDialog::slotAboutToShow(QWidget *page) |
171 | { | 170 | { |