| author | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2003-11-06 10:17:45 (UTC) |
| commit | 55ea6367fba8a82fbdca74599422717e4b3c3ec6 (patch) (side-by-side diff) | |
| tree | b40bb13a1b4f05b4eda61cf0c4a02e32719a70c4 /core/settings/launcher/launchersettings.cpp | |
| parent | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (diff) | |
| download | opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.zip opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.gz opie-55ea6367fba8a82fbdca74599422717e4b3c3ec6.tar.bz2 | |
merge core/settings/*
- light-and-power and security were a bit ugly, so I recommend someone
who actually dealt with these files looking into if I got it right
(not to tell about the frustratation about the fact that the ones who
dealt with these files didn't do the merge in the first place :(
Diffstat (limited to 'core/settings/launcher/launchersettings.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/settings/launcher/launchersettings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index 3982194..efc4a86 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp @@ -37,7 +37,8 @@ #include "taskbarsettings.h" #include "inputmethodsettings.h" -LauncherSettings::LauncherSettings ( ) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) +LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) + : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) { setCaption ( tr( "Launcher Settings" )); |