Rename KInstance and KAboutData to avoid conflicts with KDE4

48 files changed, 144 insertions, 144 deletions

diff --git a/extra/kde300/konsole_part.h b/extra/kde300/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde300/konsole_part.h
+++ b/extra/kde300/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde300/ktoolbarbutton.h b/extra/kde300/ktoolbarbutton.h
index 67f5ddd..49a457f 100644
--- a/extra/kde300/ktoolbarbutton.h
+++ b/extra/kde300/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde301/konsole_part.h b/extra/kde301/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde301/konsole_part.h
+++ b/extra/kde301/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde301/ktoolbarbutton.h b/extra/kde301/ktoolbarbutton.h
index d8a659b..7147029 100644
--- a/extra/kde301/ktoolbarbutton.h
+++ b/extra/kde301/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde303/konsole_part.h b/extra/kde303/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde303/konsole_part.h
+++ b/extra/kde303/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde303/ktoolbarbutton.h b/extra/kde303/ktoolbarbutton.h
index f9cb79e..6763dea 100644
--- a/extra/kde303/ktoolbarbutton.h
+++ b/extra/kde303/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde310/konsole_part.h b/extra/kde310/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde310/konsole_part.h
+++ b/extra/kde310/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde310/ktoolbarbutton.h b/extra/kde310/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde310/ktoolbarbutton.h
+++ b/extra/kde310/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde311/konsole_part.h b/extra/kde311/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde311/konsole_part.h
+++ b/extra/kde311/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde311/ktoolbarbutton.h b/extra/kde311/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde311/ktoolbarbutton.h
+++ b/extra/kde311/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde312/konsole_part.h b/extra/kde312/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde312/konsole_part.h
+++ b/extra/kde312/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde312/ktoolbarbutton.h b/extra/kde312/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde312/ktoolbarbutton.h
+++ b/extra/kde312/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde313/konsole_part.h b/extra/kde313/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde313/konsole_part.h
+++ b/extra/kde313/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde313/ktoolbarbutton.h b/extra/kde313/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde313/ktoolbarbutton.h
+++ b/extra/kde313/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde314/konsole_part.h b/extra/kde314/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde314/konsole_part.h
+++ b/extra/kde314/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde314/ktoolbarbutton.h b/extra/kde314/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde314/ktoolbarbutton.h
+++ b/extra/kde314/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde315/konsole_part.h b/extra/kde315/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde315/konsole_part.h
+++ b/extra/kde315/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde315/ktoolbarbutton.h b/extra/kde315/ktoolbarbutton.h
index 96a690e..50d08ae 100644
--- a/extra/kde315/ktoolbarbutton.h
+++ b/extra/kde315/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde320/konsole_part.h b/extra/kde320/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde320/konsole_part.h
+++ b/extra/kde320/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde320/ktoolbarbutton.h b/extra/kde320/ktoolbarbutton.h
index 82fa426..4e7c478 100644
--- a/extra/kde320/ktoolbarbutton.h
+++ b/extra/kde320/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde321/konsole_part.h b/extra/kde321/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde321/konsole_part.h
+++ b/extra/kde321/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde321/ktoolbarbutton.h b/extra/kde321/ktoolbarbutton.h
index 82fa426..4e7c478 100644
--- a/extra/kde321/ktoolbarbutton.h
+++ b/extra/kde321/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde322/konsole_part.h b/extra/kde322/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde322/konsole_part.h
+++ b/extra/kde322/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde322/ktoolbarbutton.h b/extra/kde322/ktoolbarbutton.h
index 82fa426..4e7c478 100644
--- a/extra/kde322/ktoolbarbutton.h
+++ b/extra/kde322/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde323/konsole_part.h b/extra/kde323/konsole_part.h
index 6aba706..fcbd612 100644
--- a/extra/kde323/konsole_part.h
+++ b/extra/kde323/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde323/ktoolbarbutton.h b/extra/kde323/ktoolbarbutton.h
index 82fa426..4e7c478 100644
--- a/extra/kde323/ktoolbarbutton.h
+++ b/extra/kde323/ktoolbarbutton.h
@@ -32,7 +32,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde330/konsole_part.h b/extra/kde330/konsole_part.h
index e264732..94847b1 100644
--- a/extra/kde330/konsole_part.h
+++ b/extra/kde330/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde330/ktoolbarbutton.h b/extra/kde330/ktoolbarbutton.h
index 3243485..e59050a 100644
--- a/extra/kde330/ktoolbarbutton.h
+++ b/extra/kde330/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde331/konsole_part.h b/extra/kde331/konsole_part.h
index e264732..94847b1 100644
--- a/extra/kde331/konsole_part.h
+++ b/extra/kde331/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde331/ktoolbarbutton.h b/extra/kde331/ktoolbarbutton.h
index 3243485..e59050a 100644
--- a/extra/kde331/ktoolbarbutton.h
+++ b/extra/kde331/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde332/konsole_part.h b/extra/kde332/konsole_part.h
index e264732..94847b1 100644
--- a/extra/kde332/konsole_part.h
+++ b/extra/kde332/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde332/ktoolbarbutton.h b/extra/kde332/ktoolbarbutton.h
index 3243485..e59050a 100644
--- a/extra/kde332/ktoolbarbutton.h
+++ b/extra/kde332/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde340/konsole_part.h b/extra/kde340/konsole_part.h
index 51c49f5..ed18ad6 100644
--- a/extra/kde340/konsole_part.h
+++ b/extra/kde340/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde340/ktoolbarbutton.h b/extra/kde340/ktoolbarbutton.h
index dcea85e..2febc9b 100644
--- a/extra/kde340/ktoolbarbutton.h
+++ b/extra/kde340/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde341/konsole_part.h b/extra/kde341/konsole_part.h
index 51c49f5..ed18ad6 100644
--- a/extra/kde341/konsole_part.h
+++ b/extra/kde341/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde341/ktoolbarbutton.h b/extra/kde341/ktoolbarbutton.h
index dcea85e..2febc9b 100644
--- a/extra/kde341/ktoolbarbutton.h
+++ b/extra/kde341/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde342/konsole_part.h b/extra/kde342/konsole_part.h
index 51c49f5..ed18ad6 100644
--- a/extra/kde342/konsole_part.h
+++ b/extra/kde342/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde342/ktoolbarbutton.h b/extra/kde342/ktoolbarbutton.h
index 77cbdc0..98f8476 100644
--- a/extra/kde342/ktoolbarbutton.h
+++ b/extra/kde342/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde343/konsole_part.h b/extra/kde343/konsole_part.h
index 51c49f5..ed18ad6 100644
--- a/extra/kde343/konsole_part.h
+++ b/extra/kde343/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -56,11 +56,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde343/ktoolbarbutton.h b/extra/kde343/ktoolbarbutton.h
index 77cbdc0..98f8476 100644
--- a/extra/kde343/ktoolbarbutton.h
+++ b/extra/kde343/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde350/konsole_part.h b/extra/kde350/konsole_part.h
index d526c1a..5e4262f 100644
--- a/extra/kde350/konsole_part.h
+++ b/extra/kde350/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -57,11 +57,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde350/ktoolbarbutton.h b/extra/kde350/ktoolbarbutton.h
index 8ec393a..bc5a606 100644
--- a/extra/kde350/ktoolbarbutton.h
+++ b/extra/kde350/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde351/konsole_part.h b/extra/kde351/konsole_part.h
index d526c1a..5e4262f 100644
--- a/extra/kde351/konsole_part.h
+++ b/extra/kde351/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -57,11 +57,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde351/ktoolbarbutton.h b/extra/kde351/ktoolbarbutton.h
index 8ec393a..bc5a606 100644
--- a/extra/kde351/ktoolbarbutton.h
+++ b/extra/kde351/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde352/konsole_part.h b/extra/kde352/konsole_part.h
index d526c1a..5e4262f 100644
--- a/extra/kde352/konsole_part.h
+++ b/extra/kde352/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -57,11 +57,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde352/ktoolbarbutton.h b/extra/kde352/ktoolbarbutton.h
index 8ec393a..bc5a606 100644
--- a/extra/kde352/ktoolbarbutton.h
+++ b/extra/kde352/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not
diff --git a/extra/kde353/konsole_part.h b/extra/kde353/konsole_part.h
index d526c1a..5e4262f 100644
--- a/extra/kde353/konsole_part.h
+++ b/extra/kde353/konsole_part.h
@@ -32,7 +32,7 @@
 //#include "schema.h"
 //#include "session.h"
 
-class KInstance;
+class TDEInstance;
 class konsoleBrowserExtension;
 class TQPushButton;
 class TQSpinBox;
@@ -57,11 +57,11 @@ public:
                                      const char* classname = "KParts::Part",
                                      const TQStringList &args = TQStringList());
 
-    static KInstance *instance();
+    static TDEInstance *instance();
 
  private:
-    static KInstance *s_instance;
-    static KAboutData *s_aboutData;
+    static TDEInstance *s_instance;
+    static TDEAboutData *s_aboutData;
 };
 
 //////////////////////////////////////////////////////////////////////
diff --git a/extra/kde353/ktoolbarbutton.h b/extra/kde353/ktoolbarbutton.h
index 8ec393a..bc5a606 100644
--- a/extra/kde353/ktoolbarbutton.h
+++ b/extra/kde353/ktoolbarbutton.h
@@ -31,7 +31,7 @@
 
 class KToolBar;
 class KToolBarButtonPrivate;
-class KInstance;
+class TDEInstance;
 class TQEvent;
 class TQPopupMenu;
 class TQPainter;
@@ -60,7 +60,7 @@ public:
    */
   KToolBarButton(const TQString& icon, int id, TQWidget *parent,
                  const char *name=0L, const TQString &txt=TQString::null,
-                 KInstance *_instance = KGlobal::instance());
+                 TDEInstance *_instance = KGlobal::instance());
 
   /**
    * Construct a button with an existing pixmap.  It is not