summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/config_file.c8
-rw-r--r--common/config_file.c-orig8
-rw-r--r--config/exportthemedialog.cpp2
-rw-r--r--config/qtcurveconfig.cpp2
-rw-r--r--style/qtcurve.cpp2
5 files changed, 11 insertions, 11 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
diff --git a/config/exportthemedialog.cpp b/config/exportthemedialog.cpp
index 8496654..441348f 100644
--- a/config/exportthemedialog.cpp
+++ b/config/exportthemedialog.cpp
@@ -66,7 +66,7 @@ void CExportThemeDialog::slotOk()
{
TQString fileName(themeUrl->url()+"/"THEME_PREFIX+name+".themerc");
- KConfig cfg(fileName, false, false);
+ TDEConfig cfg(fileName, false, false);
bool rv(!cfg.isReadOnly());
if(rv)
diff --git a/config/qtcurveconfig.cpp b/config/qtcurveconfig.cpp
index 1f8b7b0..6f5c3e2 100644
--- a/config/qtcurveconfig.cpp
+++ b/config/qtcurveconfig.cpp
@@ -1386,7 +1386,7 @@ void QtCurveConfig::exportStyle()
if(!file.isEmpty())
{
- KConfig cfg(file, false, false);
+ TDEConfig cfg(file, false, false);
bool rv(!cfg.isReadOnly());
if(rv)
diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp
index 9dc2148..19e7e34 100644
--- a/style/qtcurve.cpp
+++ b/style/qtcurve.cpp
@@ -1711,7 +1711,7 @@ void QtCurveStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
if(onToolBar(widget))
widget->setName(kdeToolbarWidget);
if(widget && widget->parentWidget() &&
- ceData.widgetObjectTypes.contains("KLineEdit") && widget->parentWidget()->inherits("KIO::DefaultProgress") &&
+ ceData.widgetObjectTypes.contains("KLineEdit") && widget->parentWidget()->inherits("TDEIO::DefaultProgress") &&
::tqqt_cast<TQFrame *>(widget))
((TQFrame *)widget)->setLineWidth(0);
}