summaryrefslogtreecommitdiffstats
path: root/kcontrol/locale/toplevel.h
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/locale/toplevel.h
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/locale/toplevel.h')
-rw-r--r--kcontrol/locale/toplevel.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/locale/toplevel.h b/kcontrol/locale/toplevel.h
index 64cc89c2a..a999d64d0 100644
--- a/kcontrol/locale/toplevel.h
+++ b/kcontrol/locale/toplevel.h
@@ -31,7 +31,7 @@
class TQTabWidget;
class TQGroupBox;
-class KConfig;
+class TDEConfig;
class KLocale;
class KLocaleConfig;
class KLocaleConfigMoney;
@@ -40,7 +40,7 @@ class KLocaleConfigTime;
class KLocaleConfigOther;
class KLocaleSample;
-class KLocaleApplication : public KCModule
+class KLocaleApplication : public TDECModule
{
Q_OBJECT
@@ -78,8 +78,8 @@ private:
TQGroupBox *m_gbox;
KLocaleSample *m_sample;
- KConfig * m_globalConfig;
- KConfig * m_nullConfig;
+ TDEConfig * m_globalConfig;
+ TDEConfig * m_nullConfig;
};
typedef KGenericFactory<KLocaleApplication, TQWidget > KLocaleFactory;