summaryrefslogtreecommitdiffstats
path: root/common/config_file.c-orig
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-orig
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-orig')
-rw-r--r--common/config_file.c-orig8
1 files changed, 4 insertions, 4 deletions
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