summaryrefslogtreecommitdiffstats
path: root/kcontrol/konsole
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/konsole
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konsole')
-rw-r--r--kcontrol/konsole/kcmkonsole.cpp6
-rw-r--r--kcontrol/konsole/kcmkonsole.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp
index 8eb8747ce..3d4e00bdd 100644
--- a/kcontrol/konsole/kcmkonsole.cpp
+++ b/kcontrol/konsole/kcmkonsole.cpp
@@ -37,7 +37,7 @@ typedef KGenericFactory<KCMKonsole, TQWidget> ModuleFactory;
K_EXPORT_COMPONENT_FACTORY( kcm_konsole, ModuleFactory("kcmkonsole") )
KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&)
-:KCModule(ModuleFactory::instance(), parent, name)
+:TDECModule(ModuleFactory::instance(), parent, name)
{
setQuickHelp( i18n("<h1>Konsole</h1> With this module you can configure Konsole, the KDE terminal"
@@ -87,7 +87,7 @@ void KCMKonsole::load()
void KCMKonsole::load(bool useDefaults)
{
- KConfig config("konsolerc", true);
+ TDEConfig config("konsolerc", true);
config.setDesktopGroup();
config.setReadDefaults(useDefaults);
@@ -126,7 +126,7 @@ void KCMKonsole::save()
dialog->SessionEditor1->querySave();
}
- KConfig config("konsolerc");
+ TDEConfig config("konsolerc");
config.setDesktopGroup();
config.writeEntry("TerminalSizeHint", dialog->terminalSizeHintCB->isChecked());
diff --git a/kcontrol/konsole/kcmkonsole.h b/kcontrol/konsole/kcmkonsole.h
index 255a63e66..71b0fb7a7 100644
--- a/kcontrol/konsole/kcmkonsole.h
+++ b/kcontrol/konsole/kcmkonsole.h
@@ -26,7 +26,7 @@ class TQFont;
class TQStringList;
class KCMKonsole
- : public KCModule
+ : public TDECModule
{
Q_OBJECT