summaryrefslogtreecommitdiffstats
path: root/khtml/java/kjavaappletviewer.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:35:07 -0600
commit703fb0c89c2eee56a1e613e67a446db9d4287929 (patch)
treedd8c5ca66075cd89c2638a2b48cf78386a9870a7 /khtml/java/kjavaappletviewer.h
parent818e7abec3d5d3809b6b77293558678371c16b71 (diff)
downloadtdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz
tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'khtml/java/kjavaappletviewer.h')
-rw-r--r--khtml/java/kjavaappletviewer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/khtml/java/kjavaappletviewer.h b/khtml/java/kjavaappletviewer.h
index b76f20363..cf2c20721 100644
--- a/khtml/java/kjavaappletviewer.h
+++ b/khtml/java/kjavaappletviewer.h
@@ -41,7 +41,7 @@ class KJavaProcess;
class KJavaAppletViewer;
class TDEAboutData;
class TDEInstance;
-class KConfig;
+class TDEConfig;
class CoverWidget;
class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension {
@@ -107,7 +107,7 @@ private slots:
void delayedCreateTimeOut ();
private:
TQGuardedPtr <CoverWidget> m_view;
- KConfig * m_config;
+ TDEConfig * m_config;
KJavaProcess * process;
KJavaAppletViewerBrowserExtension * m_browserextension;
KJavaAppletViewerLiveConnectExtension * m_liveconnect;