summaryrefslogtreecommitdiffstats
path: root/kcontrol/konqhtml/main.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/konqhtml/main.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/konqhtml/main.h')
-rw-r--r--kcontrol/konqhtml/main.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/konqhtml/main.h b/kcontrol/konqhtml/main.h
index eeb9da311..182ac2756 100644
--- a/kcontrol/konqhtml/main.h
+++ b/kcontrol/konqhtml/main.h
@@ -33,13 +33,13 @@ class KJavaScriptOptions;
class TQTabWidget;
-class KJSParts : public KCModule
+class KJSParts : public TDECModule
{
Q_OBJECT
public:
- KJSParts(KConfig *config,TQWidget *parent, const char *name);
+ KJSParts(TDEConfig *config,TQWidget *parent, const char *name);
virtual ~KJSParts();
void load();
@@ -54,7 +54,7 @@ private:
KJavaScriptOptions *javascript;
KJavaOptions *java;
- KConfig *mConfig;
+ TDEConfig *mConfig;
};
#endif