diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/screensaver | |
| parent | 79b21d47bce1ee428affc97534cd8b257232a871 (diff) | |
| download | tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/screensaver')
| -rw-r--r-- | kcontrol/screensaver/advanceddialog.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/screensaver/scrnsave.cpp | 8 | ||||
| -rw-r--r-- | kcontrol/screensaver/scrnsave.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp index 4a48eedfe..507255eea 100644 --- a/kcontrol/screensaver/advanceddialog.cpp +++ b/kcontrol/screensaver/advanceddialog.cpp @@ -43,7 +43,7 @@ KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(TQWidget *parent, const c void KScreenSaverAdvancedDialog::readSettings() { - KConfig *config = new KConfig("kdesktoprc"); + TDEConfig *config = new TDEConfig("kdesktoprc"); config->setGroup("ScreenSaver"); mPriority = config->readNumEntry("Priority", 19); @@ -100,7 +100,7 @@ void KScreenSaverAdvancedDialog::slotOk() { if (mChanged) { - KConfig *config = new KConfig("kdesktoprc"); + TDEConfig *config = new TDEConfig("kdesktoprc"); config->setGroup( "ScreenSaver" ); config->writeEntry("Priority", mPriority); diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index c9f1e8f2b..4efb38e90 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -71,7 +71,7 @@ static TQString findExe(const TQString &exe) { } KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringList&) - : KCModule(KSSFactory::instance(), parent, name) + : TDECModule(KSSFactory::instance(), parent, name) { mSetupProc = 0; mPreviewProc = 0; @@ -96,7 +96,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis " the \"Require password\" feature of the screen saver; if you do not, you can still" " explicitly lock the session using the desktop's \"Lock Session\" action.")); - setButtons( KCModule::Help | KCModule::Default | KCModule::Apply ); + setButtons( TDECModule::Help | TDECModule::Default | TDECModule::Apply ); // Add KDE specific screensaver path TQString relPath="System/ScreenSavers/"; @@ -384,7 +384,7 @@ void KScreenSaver::load( bool useDefaults ) // void KScreenSaver::readSettings( bool useDefaults ) { - KConfig *config = new KConfig( "kdesktoprc"); + TDEConfig *config = new TDEConfig( "kdesktoprc"); config->setReadDefaults( useDefaults ); @@ -437,7 +437,7 @@ void KScreenSaver::save() if ( !mChanged ) return; - KConfig *config = new KConfig( "kdesktoprc"); + TDEConfig *config = new TDEConfig( "kdesktoprc"); config->setGroup( "ScreenSaver" ); config->writeEntry("Enabled", mEnabled); diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h index afaa3450b..72a00c410 100644 --- a/kcontrol/screensaver/scrnsave.h +++ b/kcontrol/screensaver/scrnsave.h @@ -31,7 +31,7 @@ class KIntNumInput; class TDEProcess; //=========================================================================== -class KScreenSaver : public KCModule +class KScreenSaver : public TDECModule { Q_OBJECT public: |