Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 34b82cf515
commit ac1e5178c2

@ -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

@ -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

@ -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)

@ -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)

@ -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);
}

Loading…
Cancel
Save