Rename KInstance and KAboutData to avoid conflicts with KDE4

2 files changed, 9 insertions, 9 deletions

diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index 5948dea22..05c2eb7d0 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -48,10 +48,10 @@
 
 K_EXPORT_COMPONENT_FACTORY (kjavaappletviewer, KJavaAppletViewerFactory)
 
-KInstance *KJavaAppletViewerFactory::s_instance = 0;
+TDEInstance *KJavaAppletViewerFactory::s_instance = 0;
 
 KJavaAppletViewerFactory::KJavaAppletViewerFactory () {
-    s_instance = new KInstance ("kjava");
+    s_instance = new TDEInstance ("kjava");
 }
 
 KJavaAppletViewerFactory::~KJavaAppletViewerFactory () {
@@ -447,8 +447,8 @@ void KJavaAppletViewer::infoMessage (const TQString & msg) {
     m_browserextension->infoMessage(msg);
 }
 
-KAboutData* KJavaAppletViewer::createAboutData () {
-    return new KAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
+TDEAboutData* KJavaAppletViewer::createAboutData () {
+    return new TDEAboutData("KJavaAppletViewer", I18N_NOOP("TDE Java Applet Plugin"), "1.0");
 }
 
 //---------------------------------------------------------------------
diff --git a/khtml/java/kjavaappletviewer.h b/khtml/java/kjavaappletviewer.h
index e12b3c1d9..b76f20363 100644
--- a/khtml/java/kjavaappletviewer.h
+++ b/khtml/java/kjavaappletviewer.h
@@ -39,8 +39,8 @@ class TQTable;
 class TQLabel;
 class KJavaProcess;
 class KJavaAppletViewer;
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 class KConfig;
 class CoverWidget;
 
@@ -86,7 +86,7 @@ public:
               TQObject * parent, const char * name, const TQStringList &args);
     ~KJavaAppletViewer ();
     CoverWidget * view () const { return m_view; }
-    static KAboutData* createAboutData ();
+    static TDEAboutData* createAboutData ();
 
     KJavaAppletViewerBrowserExtension * browserextension() const
         { return m_browserextension; }
@@ -126,9 +126,9 @@ public:
         (TQWidget *wparent, const char *wname,
          TQObject *parent, const char *name,
          const char *className, const TQStringList &args);
-    static KInstance * instance () { return s_instance; }
+    static TDEInstance * instance () { return s_instance; }
 private:
-    static KInstance * s_instance;
+    static TDEInstance * s_instance;
 };
 
 class AppletParameterDialog : public KDialogBase {