diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:14:35 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:14:35 -0600 |
commit | 1d04ca9aed8012bee22e22ee84bce42ec858cc9d (patch) | |
tree | c60ad6db0049c96161dcbe8a3fd90649b15a0129 | |
parent | 3ebc2c64f254128a3e935b669d2da5a8fa42776f (diff) | |
download | twin-style-crystal-1d04ca9aed8012bee22e22ee84bce42ec858cc9d.tar.gz twin-style-crystal-1d04ca9aed8012bee22e22ee84bce42ec858cc9d.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r-- | client/config/crystalconfig.cc | 10 | ||||
-rw-r--r-- | client/config/crystalconfig.h | 10 | ||||
-rw-r--r-- | client/crystalclient.cc | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/client/config/crystalconfig.cc b/client/config/crystalconfig.cc index 17e0d71..da0ddda 100644 --- a/client/config/crystalconfig.cc +++ b/client/config/crystalconfig.cc @@ -45,10 +45,10 @@ #include "crystalconfig.h" -CrystalConfig::CrystalConfig(KConfig*, TQWidget* parent) +CrystalConfig::CrystalConfig(TDEConfig*, TQWidget* parent) : TQObject(parent), config_(0), dialog_(0) { - config_ = new KConfig("twincrystalrc"); + config_ = new TDEConfig("twincrystalrc"); dialog_ = new ConfigDialog(parent); dialog_->show(); @@ -148,7 +148,7 @@ void CrystalConfig::selectionChanged(int) emit changed(); } -void CrystalConfig::load(KConfig*) +void CrystalConfig::load(TDEConfig*) { TQColor color(255,255,255); @@ -251,7 +251,7 @@ void CrystalConfig::load(KConfig*) updateLogo(); } -void CrystalConfig::save(KConfig*) +void CrystalConfig::save(TDEConfig*) { config_->setGroup("General"); @@ -376,7 +376,7 @@ void CrystalConfig::defaults() extern "C" { - TQObject* allocate_config(KConfig* config, TQWidget* parent) { + TQObject* allocate_config(TDEConfig* config, TQWidget* parent) { return (new CrystalConfig(config, parent)); } } diff --git a/client/config/crystalconfig.h b/client/config/crystalconfig.h index dd57c79..65b4099 100644 --- a/client/config/crystalconfig.h +++ b/client/config/crystalconfig.h @@ -29,7 +29,7 @@ #define BOT_LEFT 4 #define BOT_RIGHT 8 -class KConfig; +class TDEConfig; class ConfigDialog; class CrystalConfig : public TQObject @@ -37,15 +37,15 @@ class CrystalConfig : public TQObject Q_OBJECT public: - CrystalConfig(KConfig* config, TQWidget* parent); + CrystalConfig(TDEConfig* config, TQWidget* parent); ~CrystalConfig(); signals: void changed(); public slots: - void load(KConfig*); - void save(KConfig*); + void load(TDEConfig*); + void save(TDEConfig*); void defaults(); void infoDialog(); @@ -59,7 +59,7 @@ protected slots: void logoTextChanged(const TQString&); private: - KConfig *config_; + TDEConfig *config_; ConfigDialog *dialog_; void updateLogo(); diff --git a/client/crystalclient.cc b/client/crystalclient.cc index 4dfdd59..35f2028 100644 --- a/client/crystalclient.cc +++ b/client/crystalclient.cc @@ -186,7 +186,7 @@ void setupOverlay(WND_CONFIG *cfg,int mode,TQString filename) bool CrystalFactory::readConfig() { // create a config object - KConfig config("twincrystalrc"); + TDEConfig config("twincrystalrc"); config.setGroup("General"); TQColor c; |