Rename KInstance and KAboutData to avoid conflicts with KDE4

10 files changed, 33 insertions, 33 deletions

diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index 8e605d79c..b8d445900 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -347,7 +347,7 @@ void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
 }
 //-------------------------------------------------------------------------
 KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
-  : KMainWindow(parent, name, (WFlags)WType_TopLevel), KInstance("kjs_debugger")
+  : KMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger")
 {
   m_breakpoints = 0;
   m_breakpointCount = 0;
diff --git a/khtml/ecma/kjs_debugwin.h b/khtml/ecma/kjs_debugwin.h
index 8faf71d52..dc2368ac2 100644
--- a/khtml/ecma/kjs_debugwin.h
+++ b/khtml/ecma/kjs_debugwin.h
@@ -157,7 +157,7 @@ namespace KJS {
    *
    * There is only one debug window per program. This can be obtained by calling #instance
    */
-  class KJSDebugWin : public KMainWindow, public Debugger, public KInstance
+  class KJSDebugWin : public KMainWindow, public Debugger, public TDEInstance
   {
     Q_OBJECT
     friend class SourceDisplay;
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 {
diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp
index 7eedc6311..c2eee7d17 100644
--- a/khtml/khtml_factory.cpp
+++ b/khtml/khtml_factory.cpp
@@ -58,8 +58,8 @@ extern "C" KDE_EXPORT void *init_libkhtml()
 
 KHTMLFactory *KHTMLFactory::s_self = 0;
 unsigned long int KHTMLFactory::s_refcnt = 0;
-KInstance *KHTMLFactory::s_instance = 0;
-KAboutData *KHTMLFactory::s_about = 0;
+TDEInstance *KHTMLFactory::s_instance = 0;
+TDEAboutData *KHTMLFactory::s_about = 0;
 KHTMLSettings *KHTMLFactory::s_settings = 0;
 TQPtrList<KHTMLPart> *KHTMLFactory::s_parts = 0;
 TQString *KHTMLSettings::avFamilies = 0;
@@ -119,7 +119,7 @@ void KHTMLFactory::ref()
         // we can't use a staticdeleter here, because that would mean
         // that the factory gets deleted from within a qPostRoutine, called
         // from the TQApplication destructor. That however is too late, because
-        // we want to destruct a KInstance object, which involves destructing
+        // we want to destruct a TDEInstance object, which involves destructing
         // a KConfig object, which might call KGlobal::dirs() (in sync()) which
         // probably is not going to work ;-)
         // well, perhaps I'm wrong here, but as I'm unsure I try to stay on the
@@ -168,15 +168,15 @@ void KHTMLFactory::deregisterPart( KHTMLPart *part )
     }
 }
 
-KInstance *KHTMLFactory::instance()
+TDEInstance *KHTMLFactory::instance()
 {
   assert( s_self );
 
   if ( !s_instance )
   {
-    s_about = new KAboutData( "khtml", I18N_NOOP( "KHTML" ), "4.0",
+    s_about = new TDEAboutData( "khtml", I18N_NOOP( "KHTML" ), "4.0",
                               I18N_NOOP( "Embeddable HTML component" ),
-                              KAboutData::License_LGPL );
+                              TDEAboutData::License_LGPL );
     s_about->addAuthor( "Lars Knoll", 0, "knoll@kde.org" );
     s_about->addAuthor( "Antti Koivisto", 0, "koivisto@kde.org" );
     s_about->addAuthor( "Waldo Bastian", 0, "bastian@kde.org" );
@@ -187,7 +187,7 @@ KInstance *KHTMLFactory::instance()
     s_about->addAuthor( "Simon Hausmann", 0, "hausmann@kde.org" );
     s_about->addAuthor( "Tobias Anton", 0, "anton@stud.fbi.fh-darmstadt.de" );
 
-    s_instance = new KInstance( s_about );
+    s_instance = new TDEInstance( s_about );
   }
 
   return s_instance;
diff --git a/khtml/khtml_factory.h b/khtml/khtml_factory.h
index e9d5c62a8..4d0154128 100644
--- a/khtml/khtml_factory.h
+++ b/khtml/khtml_factory.h
@@ -25,8 +25,8 @@
 #include <tqptrlist.h>
 #include <kurl.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 class HistoryProvider;
 class KHTMLSettings;
 class KHTMLPart;
@@ -52,7 +52,7 @@ public:
 
   static TQPtrList<KHTMLPart> *partList() { return s_parts; }
 
-  static KInstance *instance();
+  static TDEInstance *instance();
 
   static KHTMLSettings *defaultHTMLSettings();
 
@@ -67,8 +67,8 @@ protected:
 private:
   static unsigned long s_refcnt;
   static KHTMLFactory *s_self;
-  static KInstance *s_instance;
-  static KAboutData *s_about;
+  static TDEInstance *s_instance;
+  static TDEAboutData *s_about;
   static KHTMLSettings *s_settings;
   static TQPtrList<KHTMLPart> *s_parts;
 };
diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index a8ee4d7ef..7782f1786 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -36,11 +36,11 @@
 
 K_EXPORT_COMPONENT_FACTORY( khtmlimagefactory /*NOT the part name, see Makefile.am*/, KHTMLImageFactory )
 
-KInstance *KHTMLImageFactory::s_instance = 0;
+TDEInstance *KHTMLImageFactory::s_instance = 0;
 
 KHTMLImageFactory::KHTMLImageFactory()
 {
-    s_instance = new KInstance( "khtmlimage" );
+    s_instance = new TDEInstance( "khtmlimage" );
 }
 
 KHTMLImageFactory::~KHTMLImageFactory()
diff --git a/khtml/khtmlimage.h b/khtml/khtmlimage.h
index dda918177..6db0cbf5f 100644
--- a/khtml/khtmlimage.h
+++ b/khtml/khtmlimage.h
@@ -27,7 +27,7 @@
 #include "misc/loader_client.h"
 
 class KHTMLPart;
-class KInstance;
+class TDEInstance;
 
 namespace khtml
 {
@@ -48,10 +48,10 @@ public:
                                             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;
 };
 
 /**
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index 55f37f397..65be07e83 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -571,12 +571,12 @@ void KMultiPart::slotProgressInfo()
     emit m_extension->infoMessage( str );
 }
 
-KAboutData* KMultiPart::createAboutData()
+TDEAboutData* KMultiPart::createAboutData()
 {
-    KAboutData* aboutData = new KAboutData( "kmultipart", I18N_NOOP("KMultiPart"),
+    TDEAboutData* aboutData = new TDEAboutData( "kmultipart", I18N_NOOP("KMultiPart"),
                                              "0.1",
                                             I18N_NOOP( "Embeddable component for multipart/mixed" ),
-                                             KAboutData::License_GPL,
+                                             TDEAboutData::License_GPL,
                                              "(c) 2001, David Faure <david@mandrakesoft.com>");
     return aboutData;
 }
diff --git a/khtml/kmultipart/kmultipart.h b/khtml/kmultipart/kmultipart.h
index f3bf95219..7ba5ba2fe 100644
--- a/khtml/kmultipart/kmultipart.h
+++ b/khtml/kmultipart/kmultipart.h
@@ -29,7 +29,7 @@
 #include <tqdatetime.h>
 
 class KHTMLPart;
-class KInstance;
+class TDEInstance;
 class KTempFile;
 class KLineParser;
 
@@ -49,7 +49,7 @@ public:
 
     virtual bool closeURL();
 
-    static KAboutData* createAboutData();
+    static TDEAboutData* createAboutData();
 
 protected:
     virtual void guiActivateEvent( KParts::GUIActivateEvent *e );