Diffstat (limited to 'pwmanager/pwmanager/kcmconfigs') (more/less context) (ignore whitespace changes)
-rw-r--r-- | pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp | 4 | ||||
-rw-r--r-- | pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp | 27 |
2 files changed, 18 insertions, 13 deletions
diff --git a/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp b/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp index b7944c3..1804e88 100644 --- a/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp +++ b/pwmanager/pwmanager/kcmconfigs/kcmpwmconfig.cpp | |||
@@ -22,6 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qlayout.h> | 24 | #include <qlayout.h> |
25 | //Added by qt3to4: | ||
26 | #include <Q3VBoxLayout> | ||
25 | 27 | ||
26 | #include <kdebug.h> | 28 | #include <kdebug.h> |
27 | 29 | ||
@@ -42,7 +44,7 @@ extern "C" | |||
42 | KCMPwmConfig::KCMPwmConfig(QWidget *parent, const char *name ) | 44 | KCMPwmConfig::KCMPwmConfig(QWidget *parent, const char *name ) |
43 | : KCModule( PWMPrefs::instance(), parent, name ) | 45 | : KCModule( PWMPrefs::instance(), parent, name ) |
44 | { | 46 | { |
45 | QVBoxLayout *layout = new QVBoxLayout( this ); | 47 | Q3VBoxLayout *layout = new Q3VBoxLayout( this ); |
46 | mConfigWidget = new PWMConfigWidget( (PWMPrefs*)getPreferences(), this, "mConfigWidget" ); | 48 | mConfigWidget = new PWMConfigWidget( (PWMPrefs*)getPreferences(), this, "mConfigWidget" ); |
47 | layout->addWidget( mConfigWidget ); | 49 | layout->addWidget( mConfigWidget ); |
48 | layout->setSpacing( 0 ); | 50 | layout->setSpacing( 0 ); |
diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp index 2c5189c..04771b3 100644 --- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp +++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp | |||
@@ -22,8 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qcheckbox.h> | 24 | #include <qcheckbox.h> |
25 | #include <qframe.h> | 25 | #include <q3frame.h> |
26 | #include <qgroupbox.h> | 26 | #include <q3groupbox.h> |
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include <qpushbutton.h> | 28 | #include <qpushbutton.h> |
29 | #include <qtabwidget.h> | 29 | #include <qtabwidget.h> |
@@ -32,7 +32,10 @@ | |||
32 | #include <qspinbox.h> | 32 | #include <qspinbox.h> |
33 | #include <qlabel.h> | 33 | #include <qlabel.h> |
34 | #include <qfile.h> | 34 | #include <qfile.h> |
35 | #include <qvbox.h> | 35 | #include <q3vbox.h> |
36 | //Added by qt3to4: | ||
37 | #include <Q3GridLayout> | ||
38 | #include <Q3VBoxLayout> | ||
36 | 39 | ||
37 | #include <kconfig.h> | 40 | #include <kconfig.h> |
38 | #include <kdebug.h> | 41 | #include <kdebug.h> |
@@ -52,7 +55,7 @@ | |||
52 | PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *name ) | 55 | PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *name ) |
53 | : KPrefsWidget(prefs, parent, name ) | 56 | : KPrefsWidget(prefs, parent, name ) |
54 | { | 57 | { |
55 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, | 58 | Q3VBoxLayout *topLayout = new Q3VBoxLayout( this, 0, |
56 | KDialog::spacingHint() ); | 59 | KDialog::spacingHint() ); |
57 | 60 | ||
58 | QTabWidget *tabWidget = new QTabWidget( this ); | 61 | QTabWidget *tabWidget = new QTabWidget( this ); |
@@ -61,7 +64,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
61 | // windowsStyle page | 64 | // windowsStyle page |
62 | ////////////////////////////////////////////////////// | 65 | ////////////////////////////////////////////////////// |
63 | QWidget *windowStylePage = new QWidget( this ); | 66 | QWidget *windowStylePage = new QWidget( this ); |
64 | QGridLayout *windowStyleLayout = new QGridLayout( windowStylePage, 3, 3); | 67 | Q3GridLayout *windowStyleLayout = new Q3GridLayout( windowStylePage, 3, 3); |
65 | 68 | ||
66 | int i = 0; | 69 | int i = 0; |
67 | KPrefsWidRadios * windowStyle = addWidRadios(i18n("Window-style:") ,&(prefs->mMainViewStyle), windowStylePage); | 70 | KPrefsWidRadios * windowStyle = addWidRadios(i18n("Window-style:") ,&(prefs->mMainViewStyle), windowStylePage); |
@@ -98,7 +101,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
98 | // File page | 101 | // File page |
99 | ////////////////////////////////////////////////////// | 102 | ////////////////////////////////////////////////////// |
100 | QWidget *filePage = new QWidget( this ); | 103 | QWidget *filePage = new QWidget( this ); |
101 | QGridLayout *fileLayout = new QGridLayout( filePage, 3, 2); | 104 | Q3GridLayout *fileLayout = new Q3GridLayout( filePage, 3, 2); |
102 | 105 | ||
103 | i = 0; | 106 | i = 0; |
104 | QLabel* kcfg_compression_label = new QLabel(i18n("Compression:"), filePage); | 107 | QLabel* kcfg_compression_label = new QLabel(i18n("Compression:"), filePage); |
@@ -154,7 +157,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
154 | // Timeout page | 157 | // Timeout page |
155 | ////////////////////////////////////////////////////// | 158 | ////////////////////////////////////////////////////// |
156 | QWidget *timeoutPage = new QWidget( this ); | 159 | QWidget *timeoutPage = new QWidget( this ); |
157 | QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2); | 160 | Q3GridLayout *timeoutLayout = new Q3GridLayout( timeoutPage, 3, 2); |
158 | 161 | ||
159 | i = 0; | 162 | i = 0; |
160 | pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" ); | 163 | pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" ); |
@@ -183,7 +186,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
183 | // Autostart page | 186 | // Autostart page |
184 | ////////////////////////////////////////////////////// | 187 | ////////////////////////////////////////////////////// |
185 | QWidget *autostartPage = new QWidget( this ); | 188 | QWidget *autostartPage = new QWidget( this ); |
186 | QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2); | 189 | Q3GridLayout *autostartLayout = new Q3GridLayout( autostartPage, 3, 2); |
187 | 190 | ||
188 | i = 0; | 191 | i = 0; |
189 | 192 | ||
@@ -203,7 +206,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
203 | // external app page | 206 | // external app page |
204 | ////////////////////////////////////////////////////// | 207 | ////////////////////////////////////////////////////// |
205 | QWidget *externalappPage = new QWidget( this ); | 208 | QWidget *externalappPage = new QWidget( this ); |
206 | QGridLayout *externalappLayout = new QGridLayout( externalappPage, 3, 2); | 209 | Q3GridLayout *externalappLayout = new Q3GridLayout( externalappPage, 3, 2); |
207 | 210 | ||
208 | i = 0; | 211 | i = 0; |
209 | 212 | ||
@@ -223,7 +226,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
223 | // miscelaneous page | 226 | // miscelaneous page |
224 | ////////////////////////////////////////////////////// | 227 | ////////////////////////////////////////////////////// |
225 | QWidget *miscPage = new QWidget( this ); | 228 | QWidget *miscPage = new QWidget( this ); |
226 | QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2); | 229 | Q3GridLayout *miscLayout = new Q3GridLayout( miscPage, 3, 2); |
227 | 230 | ||
228 | i = 0; | 231 | i = 0; |
229 | 232 | ||
@@ -359,7 +362,7 @@ void PWMConfigWidget::setFilePermissions(int perm) | |||
359 | 362 | ||
360 | 363 | ||
361 | 364 | ||
362 | #ifndef PWM_EMBEDDED | 365 | #ifndef PWM_EMBEDDED_ |
363 | #include "pwmconfigwidget.moc" | 366 | #include "moc_pwmconfigwidget.cpp" |
364 | #endif //PWM_EMBEDDED | 367 | #endif //PWM_EMBEDDED |
365 | 368 | ||