diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:14:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:14:12 -0600 |
| commit | ac1e5178c2f5ebac0fb2194480bbb23a51103e32 (patch) | |
| tree | 67b43c6a5092311c75e40f1c2ae9a54a3bf1ae65 /common | |
| parent | 34b82cf515be84fd0eaa0fe5130128ea0da365cb (diff) | |
| download | tde-style-qtcurve-ac1e5178c2f5ebac0fb2194480bbb23a51103e32.tar.gz tde-style-qtcurve-ac1e5178c2f5ebac0fb2194480bbb23a51103e32.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'common')
| -rw-r--r-- | common/config_file.c | 8 | ||||
| -rw-r--r-- | common/config_file.c-orig | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/common/config_file.c b/common/config_file.c index bef1305..dac1486 100644 --- a/common/config_file.c +++ b/common/config_file.c @@ -3044,7 +3044,7 @@ static const char * toStr(EGlow lv) else \ CFG.writeEntry(#ENTRY, TQStringList(opts.ENTRY.toList()).join(",")); \ -bool static writeConfig(KConfig *cfg, const Options &opts, const Options &def, bool exportingStyle=false) +bool static writeConfig(TDEConfig *cfg, const Options &opts, const Options &def, bool exportingStyle=false) { if(!cfg) { @@ -3053,9 +3053,9 @@ bool static writeConfig(KConfig *cfg, const Options &opts, const Options &def, b if(cfgDir) { #if 0x039999 >= 0x040000 - KConfig defCfg(TQFile::decodeName(cfgDir)+CONFIG_FILE, KConfig::SimpleConfig); + TDEConfig defCfg(TQFile::decodeName(cfgDir)+CONFIG_FILE, TDEConfig::SimpleConfig); #else - KConfig defCfg(TQFile::decodeName(cfgDir)+CONFIG_FILE, false, false); + TDEConfig defCfg(TQFile::decodeName(cfgDir)+CONFIG_FILE, false, false); #endif if(writeConfig(&defCfg, opts, def, exportingStyle)) @@ -3075,7 +3075,7 @@ bool static writeConfig(KConfig *cfg, const Options &opts, const Options &def, b else { #if 0x039999 >= 0x040000 - KConfigGroup config(cfg, SETTINGS_GROUP); + TDEConfigGroup config(cfg, SETTINGS_GROUP); #else cfg->setGroup(SETTINGS_GROUP); #endif diff --git a/common/config_file.c-orig b/common/config_file.c-orig index 26cfce8..7b6a37d 100644 --- a/common/config_file.c-orig +++ b/common/config_file.c-orig @@ -1139,7 +1139,7 @@ static const char *toStr(ESliderStyle s) else \ CFG.writeEntry(#ENTRY, opts.ENTRY); -bool static writeConfig(KConfig *cfg, const Options &opts, const Options &def, bool exportingStyle=false) +bool static writeConfig(TDEConfig *cfg, const Options &opts, const Options &def, bool exportingStyle=false) { if(!cfg) { @@ -1152,9 +1152,9 @@ bool static writeConfig(KConfig *cfg, const Options &opts, const Options &def, b sprintf(filename, "%s/"TQTC_FILE, xdg); #if [[[TQT_VERSION IS DEPRECATED]]] >= 0x040000 - KConfig defCfg(filename, KConfig::SimpleConfig); + TDEConfig defCfg(filename, TDEConfig::SimpleConfig); #else - KConfig defCfg(filename, false, false); + TDEConfig defCfg(filename, false, false); #endif return writeConfig(&defCfg, opts, def, exportingStyle); @@ -1163,7 +1163,7 @@ bool static writeConfig(KConfig *cfg, const Options &opts, const Options &def, b else { #if [[[TQT_VERSION IS DEPRECATED]]] >= 0x040000 - KConfigGroup config(cfg, TQTC_GROUP); + TDEConfigGroup config(cfg, TQTC_GROUP); #else cfg->setGroup(TQTC_GROUP); #endif |