summaryrefslogtreecommitdiffstats
path: root/common/config_file.c
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:14:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:14:12 -0600
commitac1e5178c2f5ebac0fb2194480bbb23a51103e32 (patch)
tree67b43c6a5092311c75e40f1c2ae9a54a3bf1ae65 /common/config_file.c
parent34b82cf515be84fd0eaa0fe5130128ea0da365cb (diff)
downloadtde-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/config_file.c')
-rw-r--r--common/config_file.c8
1 files changed, 4 insertions, 4 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