diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:30:47 -0600 |
| commit | cc74f360bb40da3d79f58048f8e8611804980aa6 (patch) | |
| tree | c4385d2c16b904757b1c8bb998a4aec6993373f7 /twin/clients/modernsystem | |
| 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 'twin/clients/modernsystem')
| -rw-r--r-- | twin/clients/modernsystem/config/config.cpp | 10 | ||||
| -rw-r--r-- | twin/clients/modernsystem/config/config.h | 8 | ||||
| -rw-r--r-- | twin/clients/modernsystem/modernsys.cpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index 84bc23506..4c87829be 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/twin/clients/modernsystem/config/config.cpp @@ -12,7 +12,7 @@ extern "C" { - KDE_EXPORT TQObject* allocate_config(KConfig* conf, TQWidget* parent) + KDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent) { return(new ModernSysConfig(conf, parent)); } @@ -25,9 +25,9 @@ extern "C" // 'parent' is the parent of the TQObject, which is a VBox inside the // Configure tab in twindecoration -ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent) +ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(parent) { - clientrc = new KConfig("twinmodernsysrc"); + clientrc = new TDEConfig("twinmodernsysrc"); TDEGlobal::locale()->insertCatalogue("twin_clients"); mainw = new TQWidget(parent); vbox = new TQVBoxLayout(mainw); @@ -95,7 +95,7 @@ void ModernSysConfig::slotSelectionChanged() } -void ModernSysConfig::load(KConfig* /*conf*/) +void ModernSysConfig::load(TDEConfig* /*conf*/) { clientrc->setGroup("General"); bool i = clientrc->readBoolEntry("ShowHandle", true ); @@ -109,7 +109,7 @@ void ModernSysConfig::load(KConfig* /*conf*/) } -void ModernSysConfig::save(KConfig* /*conf*/) +void ModernSysConfig::save(TDEConfig* /*conf*/) { clientrc->setGroup("General"); clientrc->writeEntry("ShowHandle", cbShowHandle->isChecked()); diff --git a/twin/clients/modernsystem/config/config.h b/twin/clients/modernsystem/config/config.h index 3a04573cf..20ce5539e 100644 --- a/twin/clients/modernsystem/config/config.h +++ b/twin/clients/modernsystem/config/config.h @@ -13,7 +13,7 @@ class ModernSysConfig : public TQObject Q_OBJECT public: - ModernSysConfig(KConfig* conf, TQWidget* parent); + ModernSysConfig(TDEConfig* conf, TQWidget* parent); ~ModernSysConfig(); // These public signals/slots work similar to KCM modules @@ -21,15 +21,15 @@ class ModernSysConfig : public TQObject void changed(); public slots: - void load(KConfig* conf); - void save(KConfig* conf); + void load(TDEConfig* conf); + void save(TDEConfig* conf); void defaults(); protected slots: void slotSelectionChanged(); // Internal use private: - KConfig *clientrc; + TDEConfig *clientrc; TQWidget *mainw; TQVBoxLayout *vbox; TQWidget *handleBox; diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp index 3d71afd7e..8fbd1e38c 100644 --- a/twin/clients/modernsystem/modernsys.cpp +++ b/twin/clients/modernsystem/modernsys.cpp @@ -217,7 +217,7 @@ void ModernSysFactory::read_config() bool showh; int hsize, hwidth, bwidth, theight; - KConfig c("twinmodernsysrc"); + TDEConfig c("twinmodernsysrc"); c.setGroup("General"); showh = c.readBoolEntry("ShowHandle", true); |