summaryrefslogtreecommitdiffstats
path: root/kcontrol/icons/icons.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/icons/icons.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/icons/icons.h')
-rw-r--r--kcontrol/icons/icons.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index cc94b6e8b..3c824af33 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -35,7 +35,7 @@ class TQTabWidget;
class TQWidget;
class KColorButton;
-class KConfig;
+class TDEConfig;
class KIconEffect;
class KIconLoader;
class KIconTheme;
@@ -53,7 +53,7 @@ struct Effect
/**
* The General Icons tab in kcontrol.
*/
-class KIconConfig: public KCModule
+class KIconConfig: public TDECModule
{
Q_OBJECT
@@ -106,7 +106,7 @@ private:
KIconEffect *mpEffect;
KIconTheme *mpTheme;
KIconLoader *mpLoader;
- KConfig *mpConfig;
+ TDEConfig *mpConfig;
KSimpleConfig *mpSystrayConfig;
KSimpleConfig *mpKickerConfig;