summaryrefslogtreecommitdiffstats
path: root/kcontrol/iccconfig/iccconfig.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/iccconfig/iccconfig.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/iccconfig/iccconfig.h')
-rw-r--r--kcontrol/iccconfig/iccconfig.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/iccconfig/iccconfig.h b/kcontrol/iccconfig/iccconfig.h
index d113e5d84..74fe1b49d 100644
--- a/kcontrol/iccconfig/iccconfig.h
+++ b/kcontrol/iccconfig/iccconfig.h
@@ -31,11 +31,11 @@
#include "iccconfigbase.h"
-class KConfig;
+class TDEConfig;
class KPopupMenu;
class KListViewItem;
-class KICCConfig : public KCModule, public DCOPObject
+class KICCConfig : public TDECModule, public DCOPObject
{
K_DCOP
Q_OBJECT
@@ -59,7 +59,7 @@ public:
private:
- KConfig *config;
+ TDEConfig *config;
bool _ok;
Display *randr_display;
ScreenInfo *randr_screen_info;