Rename KInstance and KAboutData to avoid conflicts with KDE4

141 files changed, 427 insertions, 427 deletions

diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi
index 43d78f28..87a6905e 100644
--- a/chalk/doc/chalk.xmi
+++ b/chalk/doc/chalk.xmi
@@ -1447,7 +1447,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="1116" value="" type="QObject *" name="parent" />
      <UML:Parameter visibility="private" xmi.id="1117" value="" type="const char *" name="name" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1118" type="KAboutData *" name="aboutData" ownerScope="classifier" />
+    <UML:Operation visibility="public" xmi.id="1118" type="TDEAboutData *" name="aboutData" ownerScope="classifier" />
     <UML:Operation visibility="public" xmi.id="1119" type="virtual KParts :: Part *" name="createPartObject" >
      <UML:Parameter visibility="private" xmi.id="1120" value="" type="QWidget *" name="parentWidget" />
      <UML:Parameter visibility="private" xmi.id="1121" value="" type="const char *" name="widgetName" />
@@ -1456,12 +1456,12 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="1124" value="" type="const char *" name="classname" />
      <UML:Parameter visibility="private" xmi.id="1125" value="" type="const QStringList &amp;" name="args" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1126" type="KInstance *" name="global" ownerScope="classifier" />
+    <UML:Operation visibility="public" xmi.id="1126" type="TDEInstance *" name="global" ownerScope="classifier" />
     <UML:Operation visibility="public" xmi.id="1127" type="KisPluginServer *" name="pServer" ownerScope="classifier" />
     <UML:Operation visibility="public" xmi.id="1128" type="KisResourceServer *" name="rServer" ownerScope="classifier" />
     <UML:Operation visibility="public" xmi.id="1129" type="" name="~KisFactory" />
-    <UML:Attribute visibility="private" xmi.id="1111" value="" type="KAboutData *" name="s_aboutData" />
-    <UML:Attribute visibility="private" xmi.id="1112" value="" type="KInstance *" name="s_global" />
+    <UML:Attribute visibility="private" xmi.id="1111" value="" type="TDEAboutData *" name="s_aboutData" />
+    <UML:Attribute visibility="private" xmi.id="1112" value="" type="TDEInstance *" name="s_global" />
     <UML:Attribute visibility="private" xmi.id="1113" value="" type="KisPluginServer *" name="s_pserver" />
     <UML:Attribute visibility="private" xmi.id="1114" value="" type="KisResourceServer *" name="s_rserver" />
    </UML:Class>
@@ -38410,12 +38410,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KAboutData * s_aboutData;" >
+              <ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAboutData * s_aboutData;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KInstance * s_global;" >
+              <ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" TDEInstance * s_global;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -38531,7 +38531,7 @@ in the constructor, you have to call loadAsync.
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KAboutData * s_aboutData;" >
+       <ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" TDEAboutData * s_aboutData;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
@@ -38551,7 +38551,7 @@ in the constructor, you have to call loadAsync.
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KInstance * s_global;" >
+       <ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" TDEInstance * s_global;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
diff --git a/chalk/plugins/viewplugins/screenshot/main.cpp b/chalk/plugins/viewplugins/screenshot/main.cpp
index 21c4112b..66f66812 100644
--- a/chalk/plugins/viewplugins/screenshot/main.cpp
+++ b/chalk/plugins/viewplugins/screenshot/main.cpp
@@ -11,8 +11,8 @@ static const char description[] =
 
 int main(int argc, char **argv)
 {
-  KAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"),
-    KSNAPVERSION, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"),
+    KSNAPVERSION, description, TDEAboutData::License_GPL,
     "(c) 1997-2003, Richard J. Moore,\n(c) 2000, Matthias Ettrich,\n(c) 2002-2003 Aaron J. Seigo");
   aboutData.addAuthor("Richard J. Moore",0, "[email protected]");
   aboutData.addAuthor("Matthias Ettrich",0, "[email protected]");
diff --git a/chalk/ui/kis_aboutdata.h b/chalk/ui/kis_aboutdata.h
index d06fd134..dc083850 100644
--- a/chalk/ui/kis_aboutdata.h
+++ b/chalk/ui/kis_aboutdata.h
@@ -25,13 +25,13 @@
 #include <kofficeversion.h>
 #include <config.h>
 
-KAboutData * newChalkAboutData()
+TDEAboutData * newChalkAboutData()
 {
-    KAboutData * aboutData = new KAboutData( "chalk",
+    TDEAboutData * aboutData = new TDEAboutData( "chalk",
             I18N_NOOP("Chalk"),
             KOFFICE_VERSION_STRING,
             I18N_NOOP("KOffice image manipulation application"),
-            KAboutData::License_GPL,
+            TDEAboutData::License_GPL,
             I18N_NOOP("(c) 1999-2006 The Chalk team.\n"),
             "",
             "http://www.koffice.org/chalk",
diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc
index 7da1c5fe..04bca5f9 100644
--- a/chalk/ui/kis_factory.cc
+++ b/chalk/ui/kis_factory.cc
@@ -45,8 +45,8 @@
 
 #include "kis_factory.h"
 
-KAboutData* KisFactory::s_aboutData = 0;
-KInstance* KisFactory::s_instance = 0;
+TDEAboutData* KisFactory::s_aboutData = 0;
+TDEInstance* KisFactory::s_instance = 0;
 
 
 
@@ -95,18 +95,18 @@ KParts::Part* KisFactory::createPartObject( TQWidget *parentWidget,
 }
 
 
-KAboutData* KisFactory::aboutData()
+TDEAboutData* KisFactory::aboutData()
 {
     return s_aboutData;
 }
 
-KInstance* KisFactory::instance()
+TDEInstance* KisFactory::instance()
 {
     TQString homedir = getenv("HOME");
     
     if ( !s_instance )
     {
-        s_instance = new KInstance(s_aboutData);
+        s_instance = new TDEInstance(s_aboutData);
         TQ_CHECK_PTR(s_instance);
 
         s_instance->dirs()->addResourceType("chalk_template", KStandardDirs::kde_default("data") + "chalk/templates");
diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h
index 5426b4fa..cddf4c08 100644
--- a/chalk/ui/kis_factory.h
+++ b/chalk/ui/kis_factory.h
@@ -29,8 +29,8 @@
 
 #include <koffice_export.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class KRITACORE_EXPORT KisFactory : public KoFactory
 {
@@ -48,12 +48,12 @@ public:
                            const char *classname = "KoDocument",
                            const TQStringList &args = TQStringList() );
 
-    static KAboutData        *aboutData();
-    static KInstance         *instance();
+    static TDEAboutData        *aboutData();
+    static TDEInstance         *instance();
 
 private:
-    static KInstance                    *s_instance;
-    static KAboutData                   *s_aboutData;
+    static TDEInstance                    *s_instance;
+    static TDEAboutData                   *s_aboutData;
 };
 
 #endif
diff --git a/example/example_aboutdata.h b/example/example_aboutdata.h
index a4ed180d..89536876 100644
--- a/example/example_aboutdata.h
+++ b/example/example_aboutdata.h
@@ -26,14 +26,14 @@
 static const char* description=I18N_NOOP("Example KOffice Program");
 static const char* version="0.1";
 
-KAboutData * newExampleAboutData()
+TDEAboutData * newExampleAboutData()
 {
     // Change this, of course
-    // The first argument of the KAboutData constructor is the instance name.
+    // The first argument of the TDEAboutData constructor is the instance name.
     // It is very important, it's what's used for many things, like the subdir in share/apps, etc.
     // It must also match the name of the application's .desktop file.
-    KAboutData * aboutData=new KAboutData( "example", I18N_NOOP("Example"),
-                                           version, description, KAboutData::License_GPL,
+    TDEAboutData * aboutData=new TDEAboutData( "example", I18N_NOOP("Example"),
+                                           version, description, TDEAboutData::License_GPL,
                                            "(c) 1998-2000, Torben Weis");
     aboutData->addAuthor("Torben Weis",0, "[email protected]");
     return aboutData;
diff --git a/example/example_factory.cc b/example/example_factory.cc
index 261d75cd..307b7e93 100644
--- a/example/example_factory.cc
+++ b/example/example_factory.cc
@@ -27,8 +27,8 @@
 
 K_EXPORT_COMPONENT_FACTORY( libexamplepart, ExampleFactory )
 
-KInstance* ExampleFactory::s_global = 0L;
-KAboutData* ExampleFactory::s_aboutData = 0L;
+TDEInstance* ExampleFactory::s_global = 0L;
+TDEAboutData* ExampleFactory::s_aboutData = 0L;
 
 ExampleFactory::ExampleFactory( TQObject* parent, const char* name )
     : KoFactory( parent, name )
@@ -59,18 +59,18 @@ KParts::Part* ExampleFactory::createPartObject( TQWidget *parentWidget, const ch
     return part;
 }
 
-KAboutData* ExampleFactory::aboutData()
+TDEAboutData* ExampleFactory::aboutData()
 {
     if ( !s_aboutData )
         s_aboutData = newExampleAboutData();
     return s_aboutData;
 }
 
-KInstance* ExampleFactory::global()
+TDEInstance* ExampleFactory::global()
 {
     if ( !s_global )
     {
-        s_global = new KInstance( aboutData() );
+        s_global = new TDEInstance( aboutData() );
         // Add any application-specific resource directories here
 
         // Tell the iconloader about share/apps/koffice/icons
diff --git a/example/example_factory.h b/example/example_factory.h
index 6b618216..791f4043 100644
--- a/example/example_factory.h
+++ b/example/example_factory.h
@@ -22,8 +22,8 @@
 
 #include <KoFactory.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class ExampleFactory : public KoFactory
 {
@@ -35,14 +35,14 @@ public:
 
     virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
-    static KInstance* global();
+    static TDEInstance* global();
 
-    // _Creates_ a KAboutData but doesn't keep ownership
-    static KAboutData* aboutData();
+    // _Creates_ a TDEAboutData but doesn't keep ownership
+    static TDEAboutData* aboutData();
 
 private:
-    static KInstance* s_global;
-    static KAboutData* s_aboutData;
+    static TDEInstance* s_global;
+    static TDEAboutData* s_aboutData;
 };
 
 #endif
diff --git a/filters/karbon/xfig/xfigimport_factory.cc b/filters/karbon/xfig/xfigimport_factory.cc
index d734b176..1e231199 100644
--- a/filters/karbon/xfig/xfigimport_factory.cc
+++ b/filters/karbon/xfig/xfigimport_factory.cc
@@ -30,14 +30,14 @@ DESCRIPTION
 
 K_EXPORT_COMPONENT_FACTORY( libxfigimport, XFIGImportFactory )
 
-KInstance *XFIGImportFactory::s_global = 0;
+TDEInstance *XFIGImportFactory::s_global = 0;
 
 XFIGImportFactory::XFIGImportFactory(
     TQObject *parent,
     const char *name) :
         KLibFactory(parent, name)
 {
-    s_global = new KInstance("xfigimport");
+    s_global = new TDEInstance("xfigimport");
 }
 
 XFIGImportFactory::~XFIGImportFactory()
@@ -61,7 +61,7 @@ TQObject *XFIGImportFactory::createObject(
     return f;
 }
 
-KInstance *XFIGImportFactory::global()
+TDEInstance *XFIGImportFactory::global()
 {
     return s_global;
 }
diff --git a/filters/karbon/xfig/xfigimport_factory.h b/filters/karbon/xfig/xfigimport_factory.h
index b8d4d666..9760a92f 100644
--- a/filters/karbon/xfig/xfigimport_factory.h
+++ b/filters/karbon/xfig/xfigimport_factory.h
@@ -26,7 +26,7 @@ DESCRIPTION
 
 #include <klibloader.h>
 
-class KInstance;
+class TDEInstance;
 
 class XFIGImportFactory :
     public KLibFactory
@@ -39,9 +39,9 @@ public:
 
     virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
 
-    static KInstance* global();
+    static TDEInstance* global();
 
 private:
-    static KInstance* s_global;
+    static TDEInstance* s_global;
 };
 #endif
diff --git a/filters/kspread/kexi/kspread_kexiimport.h b/filters/kspread/kexi/kspread_kexiimport.h
index 04b260a0..8ce88641 100644
--- a/filters/kspread/kexi/kspread_kexiimport.h
+++ b/filters/kspread/kexi/kspread_kexiimport.h
@@ -31,7 +31,7 @@
 
 #include <KoFilter.h>
 
-class KAboutData;
+class TDEAboutData;
 
 namespace KexiDB
 {
diff --git a/karbon/karbon_aboutdata.h b/karbon/karbon_aboutdata.h
index 8d8e5217..c293baaf 100644
--- a/karbon/karbon_aboutdata.h
+++ b/karbon/karbon_aboutdata.h
@@ -10,14 +10,14 @@ static const char* version=VERSION;
 
 // This is all implemented here so that the executable and the part can share it
 // without sharing an object file.
-KAboutData * newKarbonAboutData()
+TDEAboutData * newKarbonAboutData()
 {
-	KAboutData * aboutData = new KAboutData(
+	TDEAboutData * aboutData = new TDEAboutData(
 		"karbon",
 		I18N_NOOP( "Karbon14" ),
 		version,
 		description,
-		KAboutData::License_GPL,
+		TDEAboutData::License_GPL,
 		I18N_NOOP( "(c) 2001-2006, The Karbon Developers" ),
 		I18N_NOOP( "You are invited to participate in any way." ),
 		"http://www.koffice.org/karbon/");
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index 90c8c29a..6206926a 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -38,8 +38,8 @@
 
 KarbonResourceServer* KarbonFactory::s_rserver = 0;
 
-KInstance* KarbonFactory::s_instance = 0L;
-KAboutData* KarbonFactory::s_aboutData = 0L;
+TDEInstance* KarbonFactory::s_instance = 0L;
+TDEAboutData* KarbonFactory::s_aboutData = 0L;
 
 KarbonFactory::KarbonFactory( TQObject* parent, const char* name )
 		: KoFactory( parent, name )
@@ -95,7 +95,7 @@ KarbonFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
 	return part;
 }
 
-KAboutData*
+TDEAboutData*
 KarbonFactory::aboutData()
 {
 	if( !s_aboutData )
@@ -103,12 +103,12 @@ KarbonFactory::aboutData()
 	return s_aboutData;
 }
 
-KInstance*
+TDEInstance*
 KarbonFactory::instance()
 {
 	if( !s_instance )
 	{
-		s_instance = new KInstance( aboutData() );
+		s_instance = new TDEInstance( aboutData() );
 		// Add any application-specific resource directories here
 
 		s_instance->dirs()->addResourceType( "kis_brushes",
diff --git a/karbon/karbon_factory.h b/karbon/karbon_factory.h
index fb7c09c6..a30bd608 100644
--- a/karbon/karbon_factory.h
+++ b/karbon/karbon_factory.h
@@ -22,8 +22,8 @@
 
 #include <KoFactory.h>
 #include <koffice_export.h>
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 
 class KarbonResourceServer;
 
@@ -41,14 +41,14 @@ public:
 											const char* widgetName = 0L, TQObject* parent = 0L, const char* name = 0L,
 											const char* classname = "KoDocument", const TQStringList& args = TQStringList() );
 
-	static KInstance* instance();
-	static KAboutData* aboutData();
+	static TDEInstance* instance();
+	static TDEAboutData* aboutData();
 
 	static KarbonResourceServer *rServer();
 
 private:
-	static KInstance*	s_instance;
-	static KAboutData*	s_aboutData;
+	static TDEInstance*	s_instance;
+	static TDEAboutData*	s_aboutData;
 	static KarbonResourceServer* s_rserver;
 };
 
diff --git a/karbon/widgets/vtoolbox.cc b/karbon/widgets/vtoolbox.cc
index 6146ae93..d3f12b7e 100644
--- a/karbon/widgets/vtoolbox.cc
+++ b/karbon/widgets/vtoolbox.cc
@@ -21,7 +21,7 @@
 #include "vtoolbox.h"
 #include "vtool.h"
 
-VToolBox::VToolBox( KMainWindow *mainWin, const char* name, KInstance* instance ) : KoToolBox( mainWin, name, instance, 5 )
+VToolBox::VToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance ) : KoToolBox( mainWin, name, instance, 5 )
 {
 }
 
diff --git a/karbon/widgets/vtoolbox.h b/karbon/widgets/vtoolbox.h
index b31a4cbb..857b72e7 100644
--- a/karbon/widgets/vtoolbox.h
+++ b/karbon/widgets/vtoolbox.h
@@ -31,7 +31,7 @@ class VToolBox : public KoToolBox
   
 
 public:
-	VToolBox( KMainWindow *mainWin, const char* name, KInstance* instance );
+	VToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance );
 	virtual ~VToolBox() {}
 
 	void registerTool( VTool * );
diff --git a/kchart/kchart_aboutdata.h b/kchart/kchart_aboutdata.h
index 4e413a00..0cdefae8 100644
--- a/kchart/kchart_aboutdata.h
+++ b/kchart/kchart_aboutdata.h
@@ -31,10 +31,10 @@ static const char* description=I18N_NOOP("KOffice Chart Generator");
 static const char* version=VERSION;
 
 
-KAboutData * newKChartAboutData()
+TDEAboutData * newKChartAboutData()
 {
-    KAboutData * aboutData= new KAboutData("kchart", I18N_NOOP("KChart"),
-                                           version, description, KAboutData::License_GPL,
+    TDEAboutData * aboutData= new TDEAboutData("kchart", I18N_NOOP("KChart"),
+                                           version, description, TDEAboutData::License_GPL,
                                            I18N_NOOP("(c) 1998-2006, Kalle Dalheimer and Klarälvdalens Datakonsult AB"),
                                            I18N_NOOP("The drawing engine which forms the base of KChart\nis also available as a commercial product\nfrom Klarälvdalens Datakonsult AB.\nContact [email protected]\nfor more information."),
 					   "http://www.koffice.org/kchart/");
diff --git a/kchart/kchart_factory.cc b/kchart/kchart_factory.cc
index 7c3fb0e7..4c3f7864 100644
--- a/kchart/kchart_factory.cc
+++ b/kchart/kchart_factory.cc
@@ -17,8 +17,8 @@
 namespace KChart
 {
 
-KInstance   *KChartFactory::s_global    = 0;
-KAboutData  *KChartFactory::s_aboutData = 0;
+TDEInstance   *KChartFactory::s_global    = 0;
+TDEAboutData  *KChartFactory::s_aboutData = 0;
 
 
 KChartFactory::KChartFactory( TQObject* parent, const char* name )
@@ -56,7 +56,7 @@ KParts::Part* KChartFactory::createPartObject( TQWidget *parentWidget,
 }
 
 
-KAboutData* KChartFactory::aboutData()
+TDEAboutData* KChartFactory::aboutData()
 {
     if( !s_aboutData )
         s_aboutData = newKChartAboutData();
@@ -64,11 +64,11 @@ KAboutData* KChartFactory::aboutData()
 }
 
 
-KInstance* KChartFactory::global()
+TDEInstance* KChartFactory::global()
 {
     if ( !s_global )
     {
-         s_global = new KInstance(aboutData());
+         s_global = new TDEInstance(aboutData());
          s_global->dirs()->addResourceType( "kchart_template",
          KStandardDirs::kde_default("data") + "kchart/templates/");
          // Tell the iconloader about share/apps/koffice/icons
diff --git a/kchart/kchart_factory.h b/kchart/kchart_factory.h
index a40c39e8..4e64c583 100644
--- a/kchart/kchart_factory.h
+++ b/kchart/kchart_factory.h
@@ -11,8 +11,8 @@
 #include <KoFactory.h>
 
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 namespace KChart
 {
@@ -32,14 +32,14 @@ public:
 					     const char* classname = "KoDocument",
 					     const TQStringList &args = TQStringList() );
 
-    static KInstance* global();
+    static TDEInstance* global();
 
-    // _Creates_ a KAboutData but doesn't keep ownership
-    static KAboutData* aboutData();
+    // _Creates_ a TDEAboutData but doesn't keep ownership
+    static TDEAboutData* aboutData();
 
 private:
-    static KInstance* s_global;
-    static KAboutData *s_aboutData;
+    static TDEInstance* s_global;
+    static TDEAboutData *s_aboutData;
 };
 
 }  //namespace KChart
diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index aaaf589e..dbaddb11 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -313,9 +313,9 @@ ObjectStatus::operator KexiDB::MessageHandler*()
 	return msgHandler;
 }
 
-void Kexi::initCmdLineArgs(int argc, char *argv[], KAboutData* aboutData)
+void Kexi::initCmdLineArgs(int argc, char *argv[], TDEAboutData* aboutData)
 {
-	KAboutData *about = aboutData;
+	TDEAboutData *about = aboutData;
 	if (!about)
 		about = Kexi::createAboutData();
 #ifdef CUSTOM_VERSION
diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h
index 5a6804a5..921db42b 100644
--- a/kexi/core/kexi.h
+++ b/kexi/core/kexi.h
@@ -36,7 +36,7 @@
 
 namespace Kexi
 {
-	KEXICORE_EXPORT void initCmdLineArgs(int argc, char *argv[], KAboutData* aboutData = 0);
+	KEXICORE_EXPORT void initCmdLineArgs(int argc, char *argv[], TDEAboutData* aboutData = 0);
 
 	/*! Modes of view for the dialogs. Used mostly for parts and KexiDialogBase. */
 	enum ViewMode { 
diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp
index 51265bdb..e41cf0ff 100644
--- a/kexi/core/kexiaboutdata.cpp
+++ b/kexi/core/kexiaboutdata.cpp
@@ -38,15 +38,15 @@ static const char *description =
 
 using namespace Kexi;
 
-KAboutData* Kexi::createAboutData()
+TDEAboutData* Kexi::createAboutData()
 {
-	KAboutData *aboutData=new KAboutData( "kexi", KEXI_APP_NAME,
+	TDEAboutData *aboutData=new TDEAboutData( "kexi", KEXI_APP_NAME,
 		KEXI_VERSION_STRING 
 #ifndef CUSTOM_VERSION
 		" (KOffice " KOFFICE_VERSION_STRING ")"
 #endif
 		, description, 
-		KAboutData::License_LGPL_V2,
+		TDEAboutData::License_LGPL_V2,
 		I18N_NOOP(	"(c) 2002-2007, Kexi Team\n"
 					"(c) 2003-2007, OpenOffice Polska LLC\n"),
 		I18N_NOOP(	"This software is developed by Kexi Team - an international group\n"
diff --git a/kexi/core/kexiaboutdata.h b/kexi/core/kexiaboutdata.h
index 948906c5..06e3497d 100644
--- a/kexi/core/kexiaboutdata.h
+++ b/kexi/core/kexiaboutdata.h
@@ -26,7 +26,7 @@
 
 namespace Kexi {
 
-KEXICORE_EXPORT KAboutData* createAboutData();
+KEXICORE_EXPORT TDEAboutData* createAboutData();
 
 }
 
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 67e81a5d..d9b5d884 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -134,7 +134,7 @@ TQSize KexiDialogBase::sizeHint() const
 }
 
 /*
-KInstance *KexiDialogBase::instance() {
+TDEInstance *KexiDialogBase::instance() {
 	return m_instance;
 }*/
 
diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index 814e14bd..45378782 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -175,7 +175,7 @@ TOP REQUESTED FEATURES LIST @ PL EXPO 2004:
 - scripting
 
 === Kexi Parts TODO ===
-- kexipart.h: add KexiPart::AboutData : public KAboutData
+- kexipart.h: add KexiPart::AboutData : public TDEAboutData
   and 
   #define KEXIPART_EXPORT_COMPONENT_FACTORY( libname, partClass, aboutData ) \
     K_EXPORT_COMPONENT_FACTORY( libname, KGenericFactory<partClass>(aboutData) )
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 79f1b05f..64f9e800 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -51,7 +51,7 @@
 	if(actionCollection()->action( name )) \
 		actionCollection()->action( name )->setEnabled( enable )
 
-KInstance *KFDFactory::m_instance = 0L;
+TDEInstance *KFDFactory::m_instance = 0L;
 
 KFDFactory::KFDFactory()
 : KParts::Factory(0, "libkformdesigner_kdev_part")
@@ -77,18 +77,18 @@ KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *,
 	return part;
 }
 
-KInstance*
+TDEInstance*
 KFDFactory::instance()
 {
 	if (!m_instance)
-		m_instance = new KInstance(aboutData());
+		m_instance = new TDEInstance(aboutData());
 	return m_instance;
 }
 
-KAboutData*
+TDEAboutData*
 KFDFactory::aboutData()
 {
-	KAboutData *about = new KAboutData("kformdesigner_kdev_part", I18N_NOOP("Form Designer Part"), "0.3");
+	TDEAboutData *about = new TDEAboutData("kformdesigner_kdev_part", I18N_NOOP("Form Designer Part"), "0.3");
 	return about;
 }
 
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h
index 57f75c12..f9899043 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.h
@@ -28,8 +28,8 @@
 
 #include "form.h"
 
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 class TQWorkspace;
 class TQCloseEvent;
 
@@ -48,11 +48,11 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *parent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
-		static KInstance *instance();
-		static KAboutData *aboutData();
+		static TDEInstance *instance();
+		static TDEAboutData *aboutData();
 
 	private:
-		static KInstance *m_instance;
+		static TDEInstance *m_instance;
 };
 
 class KFORMEDITOR_EXPORT KFormDesignerKDevPart : public Designer
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 02996580..eeeec6dc 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -81,7 +81,7 @@ class KFDPart_FormManager : public KFormDesigner::FormManager
 		KFormDesignerPart *m_part;
 };
 
-KInstance *KFDFactory::m_instance = 0L;
+TDEInstance *KFDFactory::m_instance = 0L;
 
 KFDFactory::KFDFactory()
 {}
@@ -106,18 +106,18 @@ KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *,
 	return part;
 }
 
-KInstance*
+TDEInstance*
 KFDFactory::instance()
 {
 	if (!m_instance)
-		m_instance = new KInstance(aboutData());
+		m_instance = new TDEInstance(aboutData());
 	return m_instance;
 }
 
-KAboutData*
+TDEAboutData*
 KFDFactory::aboutData()
 {
-	KAboutData *about = new KAboutData("kformdesigner_part", I18N_NOOP("Form Designer Part"), "0.3");
+	TDEAboutData *about = new TDEAboutData("kformdesigner_part", I18N_NOOP("Form Designer Part"), "0.3");
 	return about;
 }
 
diff --git a/kexi/formeditor/test/kfd_part.h b/kexi/formeditor/test/kfd_part.h
index 8ba652fd..b0d358ed 100644
--- a/kexi/formeditor/test/kfd_part.h
+++ b/kexi/formeditor/test/kfd_part.h
@@ -28,8 +28,8 @@
 
 #include "form.h"
 
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 class TQWorkspace;
 class TQCloseEvent;
 
@@ -47,11 +47,11 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *parent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
-		static KInstance *instance();
-		static KAboutData *aboutData();
+		static TDEInstance *instance();
+		static TDEAboutData *aboutData();
 
 	private:
-		static KInstance *m_instance;
+		static TDEInstance *m_instance;
 };
 
 class KFORMEDITOR_EXPORT KFormDesignerPart: public KParts::ReadWritePart
diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp
index 629a1026..dcda9cc9 100644
--- a/kexi/formeditor/test/main.cpp
+++ b/kexi/formeditor/test/main.cpp
@@ -37,8 +37,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("kformdesigner", I18N_NOOP("KFormDesigner"), version, description,
-                     KAboutData::License_LGPL, "(C) 2003-2005 Kexi Team", 0, 0);
+    TDEAboutData about("kformdesigner", I18N_NOOP("KFormDesigner"), version, description,
+                     TDEAboutData::License_LGPL, "(C) 2003-2005 Kexi Team", 0, 0);
     about.addCredit( "Lucijan Busch", "Original author", 0, "[email protected]" );
     about.addAuthor( "Cedric Pasteur", 0, "[email protected]");
     about.addCredit( "Jarosław Staniek", "Win32 version, some icons, many fixes, ideas and bug reports", "[email protected]", 0);
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp
index 677709e4..b5713297 100644
--- a/kexi/kexidb/drivermanager.cpp
+++ b/kexi/kexidb/drivermanager.cpp
@@ -91,9 +91,9 @@ bool DriverManagerInternal::lookupDrivers()
 	if (tqApp) {
 		connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits()));
 	}
-//TODO: for QT-only version check for KInstance wrapper
-//		KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without KInstance (KGlobal::instance()==0)!" << endl;
-//		setError("Driver Manager cannot work without KInstance (KGlobal::instance()==0)!");
+//TODO: for QT-only version check for TDEInstance wrapper
+//		KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (KGlobal::instance()==0)!" << endl;
+//		setError("Driver Manager cannot work without TDEInstance (KGlobal::instance()==0)!");
 
 	lookupDriversNeeded = false;
 	clearError();
diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp
index 6ba6624b..5b3732a5 100644
--- a/kexi/kexidb/simplecommandlineapp.cpp
+++ b/kexi/kexidb/simplecommandlineapp.cpp
@@ -72,7 +72,7 @@ public:
 
 	KexiDB::DriverManager manager;
 	KCmdLineOptions *allOptions;
-	KInstance* instance;
+	TDEInstance* instance;
 	ConnectionData connData;
 	TQGuardedPtr<Connection> conn;
 };
@@ -91,7 +91,7 @@ SimpleCommandLineApp::SimpleCommandLineApp(
 	TQFileInfo fi(argv[0]);
 	TQCString appName( fi.baseName().latin1() );
 	TDECmdLineArgs::init(argc, argv, 
-		new KAboutData( appName, programName,
+		new TDEAboutData( appName, programName,
 			version, shortDescription, licenseType, copyrightStatement, text, 
 			homePageAddress, bugsEmailAddress));
 
@@ -102,7 +102,7 @@ SimpleCommandLineApp::SimpleCommandLineApp(
 	for (KCmdLineOptions *optionsPtr = options; optionsPtr->name; optionsPtr++, userOptionsCount++)
 		;
 
-	d->instance = new KInstance(appName);
+	d->instance = new TDEInstance(appName);
 
 	// join the predefined options and user options
 	d->allOptions = new KCmdLineOptions[predefinedOptionsCount + userOptionsCount + 1];
@@ -212,7 +212,7 @@ bool SimpleCommandLineApp::closeDatabase()
 	return true;
 }
 
-KInstance* SimpleCommandLineApp::instance() const
+TDEInstance* SimpleCommandLineApp::instance() const
 {
 	return d->instance;
 }
diff --git a/kexi/kexidb/simplecommandlineapp.h b/kexi/kexidb/simplecommandlineapp.h
index c14a35ea..64cc1382 100644
--- a/kexi/kexidb/simplecommandlineapp.h
+++ b/kexi/kexidb/simplecommandlineapp.h
@@ -30,7 +30,7 @@ struct KCmdLineOptions;
 namespace KexiDB
 {
 	//! @short A skeleton for creating a simple command line database application.
-	/*! This class creates a KInstance object and automatically handles the following 
+	/*! This class creates a TDEInstance object and automatically handles the following 
 	 command line options:
 	 - --driver \<name\> (Database driver name) or -drv
 	 - --user \<name\> (Database user name) or -u
@@ -49,14 +49,14 @@ namespace KexiDB
 			SimpleCommandLineApp(
 				int argc, char** argv, KCmdLineOptions *options, const char *programName, 
 				const char *version, const char *shortDescription=0, 
-				int licenseType=KAboutData::License_Unknown, 
+				int licenseType=TDEAboutData::License_Unknown, 
 				const char *copyrightStatement=0, const char *text=0, 
 				const char *homePageAddress=0, const char *bugsEmailAddress="[email protected]");
 
 		~SimpleCommandLineApp();
 
 		//! \return program instance
-		KInstance* instance() const;
+		TDEInstance* instance() const;
 
 		/*! Opens database \a databaseName for connection data 
 		 specified via the command line. \return true in success.
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 96bd81be..d5d77cd9 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -144,7 +144,7 @@
 //-------------------------------------------------
 
 //static
-int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata)
+int KexiMainWindowImpl::create(int argc, char *argv[], TDEAboutData* aboutdata)
 {
 	Kexi::initCmdLineArgs( argc, argv, aboutdata );
 
@@ -3957,7 +3957,7 @@ void KexiMainWindowImpl::slotStartFeedbackAgent()
 {
 #ifndef KEXI_NO_FEEDBACK_AGENT
 #ifdef FEEDBACK_CLASS
-	const KAboutData* about = TDEApplication::kApplication()->aboutData();
+	const TDEAboutData* about = TDEApplication::kApplication()->aboutData();
 	FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(),
 		about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages );
 
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index f477d2fb..0e81a91b 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -55,7 +55,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		/*! Used by the main kexi routine. Creates a new Kexi main window and a new TDEApplication object.
 		 kdemain() has to destroy the latter on exit.
 		 \return result 1 on error and 0 on success (the result can be used as a result of kdemain()) */
-		static int create(int argc, char *argv[], KAboutData* aboutdata = 0);
+		static int create(int argc, char *argv[], TDEAboutData* aboutdata = 0);
 
 		//! \return KexiMainWindowImpl singleton (if it is instantiated)
 		static KexiMainWindowImpl* self() { return dynamic_cast<KexiMainWindowImpl*>(tqApp->mainWidget()); }
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 91bd6bfc..688bc7d9 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -142,7 +142,7 @@ TQString captionForDialogType(int type)
 }
 
 /*================================================================*/
-/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, KInstance* global,
+/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, TDEInstance* global,
 	const TQCString &format, const TQString &nativePattern,
 	const TQString &nativeName, const DialogType &dialogType,
 	const TQCString& templateType) :
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index 945f084c..6d0bbc78 100644
--- a/kexi/migration/migratemanager.cpp
+++ b/kexi/migration/migratemanager.cpp
@@ -94,9 +94,9 @@ bool MigrateManagerInternal::lookupDrivers()
 	if (tqApp) {
 		connect(tqApp,TQT_SIGNAL(aboutToQuit()),this,TQT_SLOT(slotAppQuits()));
 	}
-//TODO: for QT-only version check for KInstance wrapper
-//		KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without KInstance (KGlobal::instance()==0)!" << endl;
-//		setError("Driver Manager cannot work without KInstance (KGlobal::instance()==0)!");
+//TODO: for QT-only version check for TDEInstance wrapper
+//		KexiDBWarn << "DriverManagerInternal::lookupDrivers(): cannot work without TDEInstance (KGlobal::instance()==0)!" << endl;
+//		setError("Driver Manager cannot work without TDEInstance (KGlobal::instance()==0)!");
 
 	lookupDriversNeeded = false;
 	clearError();
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index 2a1cc900..33e53eb8 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -33,11 +33,11 @@ static KCmdLineOptions options[] =
 int main( int argc, char** argv )
 {
 	try {
-		KAboutData about("KoMacroTester",
+		TDEAboutData about("KoMacroTester",
 						 I18N_NOOP("KoMacroTester"),
 						 version,
 						 description,
-						 KAboutData::License_LGPL,
+						 TDEAboutData::License_LGPL,
 						"(C) 2005 Sebastian Sauer", 0, 0, "[email protected]");
 
 		TDECmdLineArgs::init(argc, argv, &about);
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index 3c9eb147..95c019f8 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -36,8 +36,8 @@ static const KCmdLineOptions options[] =
 int main( int argc, char** argv )
 {
 	try {
-		KAboutData const about("KomacroTests", I18N_NOOP("KomacroTests"), version, description,
-	KAboutData::License_LGPL, "(C) 2005 Tobi Krebs", 0, 0,
+		TDEAboutData const about("KomacroTests", I18N_NOOP("KomacroTests"), version, description,
+	TDEAboutData::License_LGPL, "(C) 2005 Tobi Krebs", 0, 0,
 	"[email protected]");
 
 		TDECmdLineArgs::init(argc, argv, &about);
diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp
index 7e8af75b..39e8e684 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -690,7 +690,7 @@ int main(int argc, char *argv[])
 	newArgv[0] = tqstrdup(argv[0]);
 	newArgv[1] = tqstrdup( "--skip-startup-dialog" );
 
-	KAboutData* aboutdata = Kexi::createAboutData();
+	TDEAboutData* aboutdata = Kexi::createAboutData();
 	aboutdata->setProgramName( "Kexi Alter Table Test" );
 	int result = KexiMainWindowImpl::create(newArgc, newArgv, aboutdata);
 	if (!tqApp)
diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp
index 4dbcb5a6..838fd5ea 100644
--- a/kexi/tests/gui/finddialog/main.cpp
+++ b/kexi/tests/gui/finddialog/main.cpp
@@ -26,7 +26,7 @@
 
 int main( int argc, char ** argv )
 {
-  KAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", KAboutData::License_LGPL );
+  TDEAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", TDEAboutData::License_LGPL );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDEApplication app;
 
diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp
index a87c49db..95e2c0b3 100644
--- a/kexi/tests/newapi/main.cpp
+++ b/kexi/tests/newapi/main.cpp
@@ -52,7 +52,7 @@ KexiDB::ConnectionData conn_data;
 TQGuardedPtr<KexiDB::Connection> conn;
 TQGuardedPtr<KexiDB::Driver> driver;
 TDEApplication *app = 0;
-KInstance *instance = 0;
+TDEInstance *instance = 0;
 
 static KCmdLineOptions options[] =
 {
@@ -116,8 +116,8 @@ int main(int argc, char** argv)
 	prgname = info.baseName().latin1();
 	
 	TDECmdLineArgs::init(argc, argv, 
-		new KAboutData( prgname, "KexiDBTest",
-			"0.1.2", "", KAboutData::License_GPL,
+		new TDEAboutData( prgname, "KexiDBTest",
+			"0.1.2", "", TDEAboutData::License_GPL,
 			"(c) 2003-2006, Kexi Team\n"
 			"(c) 2003-2006, OpenOffice Polska Ltd.\n",
 			"",
@@ -162,7 +162,7 @@ int main(int argc, char** argv)
 		KGlobal::iconLoader()->addAppDir("kexi");
 	}
 	else {
-		instance = new KInstance(prgname);
+		instance = new TDEInstance(prgname);
 	}
 
 	drv_name = args->arg(0);
diff --git a/kexi/tests/newapi/mysqlcursor.cpp b/kexi/tests/newapi/mysqlcursor.cpp
index 091cc8a1..426c65aa 100644
--- a/kexi/tests/newapi/mysqlcursor.cpp
+++ b/kexi/tests/newapi/mysqlcursor.cpp
@@ -9,7 +9,7 @@
 
 int main(int argc, char * argv[])
 {
-	KInstance instance("newapi");
+	TDEInstance instance("newapi");
 	KexiDB::DriverManager manager;
 	TQStringList names = manager.driverNames();
 	kdDebug() << "DRIVERS: " << endl;
diff --git a/kexi/tests/parser/main.cpp b/kexi/tests/parser/main.cpp
index 803e0193..1b5f8099 100644
--- a/kexi/tests/parser/main.cpp
+++ b/kexi/tests/parser/main.cpp
@@ -20,7 +20,7 @@ int main(int argc, char **argv)
 	kdDebug() << "main()" << endl;
 	TQFileInfo info=TQFileInfo(argv[0]);
 	prgname = info.baseName().latin1();
-	KInstance instance( prgname );
+	TDEInstance instance( prgname );
 	if (argc<2) {
 		return 1;
 	}
diff --git a/kformula/kformula_aboutdata.h b/kformula/kformula_aboutdata.h
index 5cddaa11..b7e98cd8 100644
--- a/kformula/kformula_aboutdata.h
+++ b/kformula/kformula_aboutdata.h
@@ -29,10 +29,10 @@
 static const char* description=I18N_NOOP("KOffice Formula Editor");
 static const char* version=VERSION;
 
-KAboutData * newKFormulaAboutData()
+TDEAboutData * newKFormulaAboutData()
 {
-    KAboutData * aboutData = new KAboutData( "kformula", I18N_NOOP( "KFormula" ),
-                                             version, description, KAboutData::License_GPL,
+    TDEAboutData * aboutData = new TDEAboutData( "kformula", I18N_NOOP( "KFormula" ),
+                                             version, description, TDEAboutData::License_GPL,
                                              "(c) 1998-2006, The KFormula Team", 0,
 					     "http://www.koffice.org/kformula/" );
     aboutData->addAuthor( "Alfredo Beaumont", 
diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc
index e8d3a918..8842aaea 100644
--- a/kformula/kformula_factory.cc
+++ b/kformula/kformula_factory.cc
@@ -14,10 +14,10 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkformulapart, KFormulaFactory )
 
-KInstance* KFormulaFactory::s_global = 0;
-KAboutData* KFormulaFactory::s_aboutData = 0;
+TDEInstance* KFormulaFactory::s_global = 0;
+TDEAboutData* KFormulaFactory::s_aboutData = 0;
 
-KAboutData* KFormulaFactory::aboutData()
+TDEAboutData* KFormulaFactory::aboutData()
 {
     if( !s_aboutData )
         s_aboutData=newKFormulaAboutData();
@@ -53,11 +53,11 @@ KParts::Part* KFormulaFactory::createPartObject( TQWidget *parentWidget, const c
   return doc;
 }
 
-KInstance* KFormulaFactory::global()
+TDEInstance* KFormulaFactory::global()
 {
     if ( !s_global )
     {
-      s_global = new KInstance(aboutData());
+      s_global = new TDEInstance(aboutData());
       s_global->dirs()->addResourceType( "toolbar",
 				         KStandardDirs::kde_default("data") + "koffice/toolbar/");
       // Tell the iconloader about share/apps/koffice/icons*/
diff --git a/kformula/kformula_factory.h b/kformula/kformula_factory.h
index 785e92ce..dc277207 100644
--- a/kformula/kformula_factory.h
+++ b/kformula/kformula_factory.h
@@ -4,9 +4,9 @@
 #include <KoFactory.h>
 //#include <kaboutdata.h>
 
-class KInstance;
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEInstance;
+class TDEAboutData;
 
 class KFormulaFactory : public KoFactory
 {
@@ -18,13 +18,13 @@ public:
 
     virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
-    static KInstance* global();
+    static TDEInstance* global();
 
-    static KAboutData* aboutData();
+    static TDEAboutData* aboutData();
 
 private:
-    static KInstance* s_global;
-    static KAboutData* s_aboutData;
+    static TDEInstance* s_global;
+    static TDEAboutData* s_aboutData;
 };
 
 #endif
diff --git a/kivio/kiviopart/kivio_aboutdata.h b/kivio/kiviopart/kivio_aboutdata.h
index bbfc5552..9d742905 100644
--- a/kivio/kiviopart/kivio_aboutdata.h
+++ b/kivio/kiviopart/kivio_aboutdata.h
@@ -28,10 +28,10 @@
 static const char* description = I18N_NOOP("KOffice Flowchart And Diagram Tool");
 static const char* version = KOFFICE_VERSION_STRING;
 
-KAboutData * newKivioAboutData()
+TDEAboutData * newKivioAboutData()
 {
-    KAboutData * aboutData=new KAboutData( "kivio", I18N_NOOP("Kivio"),
-                                           version, description, KAboutData::License_GPL,
+    TDEAboutData * aboutData=new TDEAboutData( "kivio", I18N_NOOP("Kivio"),
+                                           version, description, TDEAboutData::License_GPL,
                                            I18N_NOOP("(C) 2000-2006, The Kivio Team"), 0,
                                            "http://www.koffice.org/kivio/");
     aboutData->addAuthor("Peter Simonsson", I18N_NOOP("Maintainer"), "[email protected]");
diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp
index e883aa2d..20140fcc 100644
--- a/kivio/kiviopart/kivio_factory.cpp
+++ b/kivio/kiviopart/kivio_factory.cpp
@@ -26,8 +26,8 @@
 #include <kiconloader.h>
 
 
-KInstance* KivioFactory::s_global = 0;
-KAboutData* KivioFactory::s_aboutData = 0;
+TDEInstance* KivioFactory::s_global = 0;
+TDEAboutData* KivioFactory::s_aboutData = 0;
 
 KivioFactory::KivioFactory( TQObject* parent, const char* name )
 : KoFactory( parent, name )
@@ -55,18 +55,18 @@ KParts::Part* KivioFactory::createPartObject( TQWidget *parentWidget, const char
   return doc;
 }
 
-KAboutData* KivioFactory::aboutData()
+TDEAboutData* KivioFactory::aboutData()
 {
   if( !s_aboutData )
     s_aboutData = newKivioAboutData();
   return s_aboutData;
 }
 
-KInstance* KivioFactory::global()
+TDEInstance* KivioFactory::global()
 {
   if ( !s_global )
   {
-    s_global = new KInstance(aboutData());
+    s_global = new TDEInstance(aboutData());
     s_global->dirs()->addResourceType( "kivio_template", KStandardDirs::kde_default("data") + "kivio/templates/" );
     s_global->dirs()->addResourceType( "toolbar", KStandardDirs::kde_default("data") + "koffice/toolbar/");
     s_global->iconLoader()->addAppDir("koffice");
diff --git a/kivio/kiviopart/kivio_factory.h b/kivio/kiviopart/kivio_factory.h
index 8b747215..5814d42d 100644
--- a/kivio/kiviopart/kivio_factory.h
+++ b/kivio/kiviopart/kivio_factory.h
@@ -21,8 +21,8 @@
 
 #include <KoFactory.h>
 #include <koffice_export.h>
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class KIVIO_EXPORT KivioFactory : public KoFactory
 { Q_OBJECT
@@ -33,12 +33,12 @@ public:
 
   virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
-  static KInstance* global();
-  static KAboutData* aboutData();
+  static TDEInstance* global();
+  static TDEAboutData* aboutData();
 
 private:
-  static KInstance* s_global;
-  static KAboutData* s_aboutData;
+  static TDEInstance* s_global;
+  static TDEAboutData* s_aboutData;
 };
 
 #endif
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index b61e877a..fe301ba3 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -116,7 +116,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
                           index );
     else
     {
-      KInstance *instance;
+      TDEInstance *instance;
 
       if ( m_parentCollection )
         instance = m_parentCollection->instance();
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 0741dfdc..3c798b37 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -129,7 +129,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
                           index );
     else
     {
-      KInstance *instance;
+      TDEInstance *instance;
 
       if ( m_parentCollection )
         instance = m_parentCollection->instance();
diff --git a/kivio/plugins/kivioconnectortool/plugin.cpp b/kivio/plugins/kivioconnectortool/plugin.cpp
index 8a61df93..e55d4f9e 100644
--- a/kivio/plugins/kivioconnectortool/plugin.cpp
+++ b/kivio/plugins/kivioconnectortool/plugin.cpp
@@ -29,12 +29,12 @@
  ***************************************************/
 K_EXPORT_COMPONENT_FACTORY( libkivioconnectortool, ConnectorToolFactory )
 
-KInstance* ConnectorToolFactory::s_global = 0;
+TDEInstance* ConnectorToolFactory::s_global = 0;
 
 ConnectorToolFactory::ConnectorToolFactory( TQObject* parent, const char* name )
 : KLibFactory( parent, name )
 {
-  s_global = new KInstance("kivio");
+  s_global = new TDEInstance("kivio");
 }
 
 ConnectorToolFactory::~ConnectorToolFactory()
@@ -51,7 +51,7 @@ TQObject* ConnectorToolFactory::createObject( TQObject* parent, const char*, con
   return obj;
 }
 
-KInstance* ConnectorToolFactory::global()
+TDEInstance* ConnectorToolFactory::global()
 {
   return s_global;
 }
diff --git a/kivio/plugins/kivioconnectortool/plugin.h b/kivio/plugins/kivioconnectortool/plugin.h
index d8070335..7afc83ce 100644
--- a/kivio/plugins/kivioconnectortool/plugin.h
+++ b/kivio/plugins/kivioconnectortool/plugin.h
@@ -24,7 +24,7 @@
 
 #include <klibloader.h>
 
-class KInstance;
+class TDEInstance;
 
 class ConnectorToolFactory : public KLibFactory
 { Q_OBJECT
@@ -36,10 +36,10 @@ public:
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
-  static KInstance* global();
+  static TDEInstance* global();
 
 private:
-  static KInstance* s_global;
+  static TDEInstance* s_global;
 };
 
 #endif
diff --git a/kivio/plugins/kivioselecttool/plugin.cpp b/kivio/plugins/kivioselecttool/plugin.cpp
index fba217c6..9107adac 100644
--- a/kivio/plugins/kivioselecttool/plugin.cpp
+++ b/kivio/plugins/kivioselecttool/plugin.cpp
@@ -29,12 +29,12 @@
  ***************************************************/
 K_EXPORT_COMPONENT_FACTORY( libkivioselecttool, SelectToolFactory )
 
-KInstance* SelectToolFactory::s_global = 0;
+TDEInstance* SelectToolFactory::s_global = 0;
 
 SelectToolFactory::SelectToolFactory( TQObject* parent, const char* name )
 : KLibFactory( parent, name )
 {
-  s_global = new KInstance("kivio");
+  s_global = new TDEInstance("kivio");
 }
 
 SelectToolFactory::~SelectToolFactory()
@@ -51,7 +51,7 @@ TQObject* SelectToolFactory::createObject( TQObject* parent, const char*, const
   return obj;
 }
 
-KInstance* SelectToolFactory::global()
+TDEInstance* SelectToolFactory::global()
 {
   return s_global;
 }
diff --git a/kivio/plugins/kivioselecttool/plugin.h b/kivio/plugins/kivioselecttool/plugin.h
index fc43d4fb..ee901dd3 100644
--- a/kivio/plugins/kivioselecttool/plugin.h
+++ b/kivio/plugins/kivioselecttool/plugin.h
@@ -24,7 +24,7 @@
 
 #include <klibloader.h>
 
-class KInstance;
+class TDEInstance;
 
 class SelectToolFactory : public KLibFactory
 { Q_OBJECT
@@ -36,10 +36,10 @@ public:
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
-  static KInstance* global();
+  static TDEInstance* global();
 
 private:
-  static KInstance* s_global;
+  static TDEInstance* s_global;
 };
 
 #endif
diff --git a/kivio/plugins/kiviosmlconnector/plugin.cpp b/kivio/plugins/kiviosmlconnector/plugin.cpp
index 5c4b74f7..3f01b263 100644
--- a/kivio/plugins/kiviosmlconnector/plugin.cpp
+++ b/kivio/plugins/kiviosmlconnector/plugin.cpp
@@ -29,12 +29,12 @@
  ***************************************************/
 K_EXPORT_COMPONENT_FACTORY( libkiviosmlconnector, SMLConnectorFactory )
 
-KInstance* SMLConnectorFactory::s_global = 0;
+TDEInstance* SMLConnectorFactory::s_global = 0;
 
 SMLConnectorFactory::SMLConnectorFactory( TQObject* parent, const char* name )
 : KLibFactory( parent, name )
 {
-  s_global = new KInstance("kivio");
+  s_global = new TDEInstance("kivio");
 }
 
 SMLConnectorFactory::~SMLConnectorFactory()
@@ -51,7 +51,7 @@ TQObject* SMLConnectorFactory::createObject( TQObject* parent, const char*, cons
   return obj;
 }
 
-KInstance* SMLConnectorFactory::global()
+TDEInstance* SMLConnectorFactory::global()
 {
   return s_global;
 }
diff --git a/kivio/plugins/kiviosmlconnector/plugin.h b/kivio/plugins/kiviosmlconnector/plugin.h
index 2b3e8028..54c81ebc 100644
--- a/kivio/plugins/kiviosmlconnector/plugin.h
+++ b/kivio/plugins/kiviosmlconnector/plugin.h
@@ -24,7 +24,7 @@
 
 #include <klibloader.h>
 
-class KInstance;
+class TDEInstance;
 
 class SMLConnectorFactory : public KLibFactory
 { Q_OBJECT
@@ -36,10 +36,10 @@ public:
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
-  static KInstance* global();
+  static TDEInstance* global();
 
 private:
-  static KInstance* s_global;
+  static TDEInstance* s_global;
 };
 
 #endif
diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp
index 048c8e32..ebc5075f 100644
--- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp
+++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.cpp
@@ -22,12 +22,12 @@
 
 K_EXPORT_COMPONENT_FACTORY( libkiviotargettool, KivioTargetToolFactory )
 
-KInstance* KivioTargetToolFactory::s_global = 0;
+TDEInstance* KivioTargetToolFactory::s_global = 0;
 
 KivioTargetToolFactory::KivioTargetToolFactory(TQObject *parent, const char *name)
  : KLibFactory(parent, name)
 {
-  s_global = new KInstance("kivio");
+  s_global = new TDEInstance("kivio");
 }
 
 KivioTargetToolFactory::~KivioTargetToolFactory()
@@ -44,7 +44,7 @@ TQObject* KivioTargetToolFactory::createObject( TQObject* parent, const char*, c
   return obj;
 }
 
-KInstance* KivioTargetToolFactory::global()
+TDEInstance* KivioTargetToolFactory::global()
 {
   return s_global;
 }
diff --git a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
index 391c7823..091cba2d 100644
--- a/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
+++ b/kivio/plugins/kiviotargettool/kiviotargettoolfactory.h
@@ -24,7 +24,7 @@
 
 #include <klibloader.h>
 
-class KInstance;
+class TDEInstance;
 
 class KivioTargetToolFactory : public KLibFactory
 {
@@ -37,10 +37,10 @@ class KivioTargetToolFactory : public KLibFactory
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                             const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
   
-    static KInstance* global();
+    static TDEInstance* global();
   
   private:
-    static KInstance* s_global;
+    static TDEInstance* s_global;
 };
 
 #endif
diff --git a/kivio/plugins/kiviotexttool/plugin.cpp b/kivio/plugins/kiviotexttool/plugin.cpp
index fd173935..7e0ec4dc 100644
--- a/kivio/plugins/kiviotexttool/plugin.cpp
+++ b/kivio/plugins/kiviotexttool/plugin.cpp
@@ -29,12 +29,12 @@
  ***************************************************/
 K_EXPORT_COMPONENT_FACTORY( libkiviotexttool, TextToolFactory )
 
-KInstance* TextToolFactory::s_global = 0;
+TDEInstance* TextToolFactory::s_global = 0;
 
 TextToolFactory::TextToolFactory( TQObject* parent, const char* name )
 : KLibFactory( parent, name )
 {
-  s_global = new KInstance("kivio");
+  s_global = new TDEInstance("kivio");
 }
 
 TextToolFactory::~TextToolFactory()
@@ -51,7 +51,7 @@ TQObject* TextToolFactory::createObject( TQObject* parent, const char*, const ch
   return obj;
 }
 
-KInstance* TextToolFactory::global()
+TDEInstance* TextToolFactory::global()
 {
   return s_global;
 }
diff --git a/kivio/plugins/kiviotexttool/plugin.h b/kivio/plugins/kiviotexttool/plugin.h
index a8b63388..4eaa9cc6 100644
--- a/kivio/plugins/kiviotexttool/plugin.h
+++ b/kivio/plugins/kiviotexttool/plugin.h
@@ -24,7 +24,7 @@
 
 #include <klibloader.h>
 
-class KInstance;
+class TDEInstance;
 
 class TextToolFactory : public KLibFactory
 { Q_OBJECT
@@ -36,10 +36,10 @@ public:
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
-  static KInstance* global();
+  static TDEInstance* global();
 
 private:
-  static KInstance* s_global;
+  static TDEInstance* s_global;
 };
 
 #endif
diff --git a/kivio/plugins/kiviozoomtool/plugin.cpp b/kivio/plugins/kiviozoomtool/plugin.cpp
index 4ecd452d..cccdfaec 100644
--- a/kivio/plugins/kiviozoomtool/plugin.cpp
+++ b/kivio/plugins/kiviozoomtool/plugin.cpp
@@ -29,12 +29,12 @@
  ***************************************************/
 K_EXPORT_COMPONENT_FACTORY( libkiviozoomtool, ZoomToolFactory )
 
-KInstance* ZoomToolFactory::s_global = 0;
+TDEInstance* ZoomToolFactory::s_global = 0;
 
 ZoomToolFactory::ZoomToolFactory( TQObject* parent, const char* name )
 : KLibFactory( parent, name )
 {
-  s_global = new KInstance("kivio");
+  s_global = new TDEInstance("kivio");
 }
 
 ZoomToolFactory::~ZoomToolFactory()
@@ -51,7 +51,7 @@ TQObject* ZoomToolFactory::createObject( TQObject* parent, const char*, const ch
   return obj;
 }
 
-KInstance* ZoomToolFactory::global()
+TDEInstance* ZoomToolFactory::global()
 {
   return s_global;
 }
diff --git a/kivio/plugins/kiviozoomtool/plugin.h b/kivio/plugins/kiviozoomtool/plugin.h
index a6b12515..4b2d8038 100644
--- a/kivio/plugins/kiviozoomtool/plugin.h
+++ b/kivio/plugins/kiviozoomtool/plugin.h
@@ -24,7 +24,7 @@
 
 #include <klibloader.h>
 
-class KInstance;
+class TDEInstance;
 
 class ZoomToolFactory : public KLibFactory
 { Q_OBJECT
@@ -35,10 +35,10 @@ public:
 
   virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
                            const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
-  static KInstance* global();
+  static TDEInstance* global();
 
 private:
-  static KInstance* s_global;
+  static TDEInstance* s_global;
 };
 
 #endif
diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc
index e940360e..83be2342 100644
--- a/koshell/koshell_main.cc
+++ b/koshell/koshell_main.cc
@@ -69,8 +69,8 @@ int KoShellApp::newInstance()
 
 extern "C" KOSHELL_EXPORT int kdemain( int argc, char **argv )
 {
-  KAboutData * aboutData = new KAboutData( "koshell", I18N_NOOP("KOffice Workspace"),
-     version, description, KAboutData::License_GPL,
+  TDEAboutData * aboutData = new TDEAboutData( "koshell", I18N_NOOP("KOffice Workspace"),
+     version, description, TDEAboutData::License_GPL,
        "(c) 1998-2006, Torben Weis\n(c) 2002-2005, David Faure\n(c) 2005, Sven Lüppken");
   aboutData->addAuthor("Sven Lüppken", I18N_NOOP("Current Maintainer"), "[email protected]");
   aboutData->addAuthor("Torben Weis", 0, "[email protected]");
diff --git a/kounavail/kounavail.cc b/kounavail/kounavail.cc
index 364a8e84..d3db14cc 100644
--- a/kounavail/kounavail.cc
+++ b/kounavail/kounavail.cc
@@ -127,8 +127,8 @@ void KoUnavailView::paintEvent( TQPaintEvent* ev )
 
 K_EXPORT_COMPONENT_FACTORY( libkounavailpart, KoUnavailFactory )
 
-KInstance* KoUnavailFactory::s_global = 0L;
-KAboutData* KoUnavailFactory::s_aboutData = 0L;
+TDEInstance* KoUnavailFactory::s_global = 0L;
+TDEAboutData* KoUnavailFactory::s_aboutData = 0L;
 
 KoUnavailFactory::KoUnavailFactory( TQObject* parent, const char* name )
     : KoFactory( parent, name )
@@ -149,25 +149,25 @@ KParts::Part* KoUnavailFactory::createPartObject( TQWidget *parentWidget, const
     return new KoUnavailPart( parentWidget, widgetName, parent, name );
 }
 
-KAboutData* KoUnavailFactory::aboutData()
+TDEAboutData* KoUnavailFactory::aboutData()
 {
     if ( !s_aboutData )
     {
         static const char* description=I18N_NOOP("KoUnavail KOffice Program");
         static const char* version="0.1";
-        s_aboutData=new KAboutData( "kounavail", I18N_NOOP("KoUnavail"),
-                                    version, description, KAboutData::License_LGPL,
+        s_aboutData=new TDEAboutData( "kounavail", I18N_NOOP("KoUnavail"),
+                                    version, description, TDEAboutData::License_LGPL,
                                     "(c) 2001, David Faure");
         s_aboutData->addAuthor("David Faure",0, "[email protected]");
     }
     return s_aboutData;
 }
 
-KInstance* KoUnavailFactory::global()
+TDEInstance* KoUnavailFactory::global()
 {
     if ( !s_global )
     {
-        s_global = new KInstance( aboutData() );
+        s_global = new TDEInstance( aboutData() );
         // Tell the iconloader about share/apps/koffice/icons
         //s_global->iconLoader()->addAppDir("koffice");
     }
diff --git a/kounavail/kounavail.h b/kounavail/kounavail.h
index 1a0e1c0e..91bdd034 100644
--- a/kounavail/kounavail.h
+++ b/kounavail/kounavail.h
@@ -85,8 +85,8 @@ protected:
 
 #include <KoFactory.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class KoUnavailFactory : public KoFactory
 {
@@ -98,14 +98,14 @@ public:
 
     virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
-    static KInstance* global();
+    static TDEInstance* global();
 
-    // _Creates_ a KAboutData but doesn't keep ownership
-    static KAboutData* aboutData();
+    // _Creates_ a TDEAboutData but doesn't keep ownership
+    static TDEAboutData* aboutData();
 
 private:
-    static KInstance* s_global;
-    static KAboutData* s_aboutData;
+    static TDEInstance* s_global;
+    static TDEAboutData* s_aboutData;
 };
 
 #endif
diff --git a/kplato/kptaboutdata.h b/kplato/kptaboutdata.h
index a91c52c8..28bacafd 100644
--- a/kplato/kptaboutdata.h
+++ b/kplato/kptaboutdata.h
@@ -30,10 +30,10 @@ namespace KPlato
 static const char* KPLATO_DESCRIPTION=I18N_NOOP("KPlato - TDE Planning Tool");
 static const char* KPLATO_VERSION="0.6.3";
 
-KAboutData * newAboutData()
+TDEAboutData * newAboutData()
 {
-    KAboutData * aboutData=new KAboutData( "kplato", I18N_NOOP("KPlato"),
-                                           KPLATO_VERSION, KPLATO_DESCRIPTION, KAboutData::License_GPL,
+    TDEAboutData * aboutData=new TDEAboutData( "kplato", I18N_NOOP("KPlato"),
+                                           KPLATO_VERSION, KPLATO_DESCRIPTION, TDEAboutData::License_GPL,
                                            I18N_NOOP("(c) 1998-2006, The KPlato Team"), 0,
 					   "http://www.koffice.org/kplato/" );
     aboutData->addAuthor("Thomas Zander", 0, 0 ); // please don't re-add, I don't like getting personal emails :)
diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cc
index e342da3e..7e5c5405 100644
--- a/kplato/kptfactory.cc
+++ b/kplato/kptfactory.cc
@@ -31,8 +31,8 @@ namespace KPlato
 
 K_EXPORT_COMPONENT_FACTORY( libkplatopart, Factory )
 
-KInstance* Factory::s_global = 0L;
-KAboutData* Factory::s_aboutData = 0L;
+TDEInstance* Factory::s_global = 0L;
+TDEAboutData* Factory::s_aboutData = 0L;
 
 Factory::Factory( TQObject* parent, const char* name )
     : KoFactory( parent, name )
@@ -70,18 +70,18 @@ KParts::Part *Factory::createPartObject(TQWidget *parentWidget,
     return part;
 }
 
-KAboutData* Factory::aboutData()
+TDEAboutData* Factory::aboutData()
 {
     if ( !s_aboutData )
         s_aboutData = newAboutData();
     return s_aboutData;
 }
 
-KInstance* Factory::global()
+TDEInstance* Factory::global()
 {
     if ( !s_global )
     {
-        s_global = new KInstance( aboutData() );
+        s_global = new TDEInstance( aboutData() );
 
         // Add any application-specific resource directories here
 	s_global->dirs()->addResourceType("kplato_template",
diff --git a/kplato/kptfactory.h b/kplato/kptfactory.h
index 62f05267..61f271c1 100644
--- a/kplato/kptfactory.h
+++ b/kplato/kptfactory.h
@@ -22,7 +22,7 @@
 
 #include <KoFactory.h>
 
-class KAboutData;
+class TDEAboutData;
 
 namespace KPlato
 {
@@ -37,14 +37,14 @@ public:
 
     virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
-    static KInstance* global();
+    static TDEInstance* global();
 
-    // _Creates_ a KAboutData but doesn't keep ownership
-    static KAboutData* aboutData();
+    // _Creates_ a TDEAboutData but doesn't keep ownership
+    static TDEAboutData* aboutData();
 
 private:
-    static KInstance* s_global;
-    static KAboutData* s_aboutData;
+    static TDEInstance* s_global;
+    static TDEAboutData* s_aboutData;
 };
 
 } // KPlato namespace
diff --git a/kpresenter/KPrAboutData.h b/kpresenter/KPrAboutData.h
index c576b9d5..c5bb8a9a 100644
--- a/kpresenter/KPrAboutData.h
+++ b/kpresenter/KPrAboutData.h
@@ -27,10 +27,10 @@
 static const char* description=I18N_NOOP("KOffice Presentation Tool");
 static const char* version=KOFFICE_VERSION_STRING;
 
-KAboutData * newKPresenterAboutData()
+TDEAboutData * newKPresenterAboutData()
 {
-    KAboutData * aboutData=new KAboutData( "kpresenter", I18N_NOOP("KPresenter"),
-                                           version, description, KAboutData::License_LGPL,
+    TDEAboutData * aboutData=new TDEAboutData( "kpresenter", I18N_NOOP("KPresenter"),
+                                           version, description, TDEAboutData::License_LGPL,
                                            I18N_NOOP("(c) 1998-2006, The KPresenter Team"), 0,
                                            "http://www.koffice.org/kpresenter/");
     aboutData->addAuthor("Laurent Montel", I18N_NOOP("current maintainer"), "[email protected]");
diff --git a/kpresenter/KPrFactory.cpp b/kpresenter/KPrFactory.cpp
index f9419cbe..5a1a6be0 100644
--- a/kpresenter/KPrFactory.cpp
+++ b/kpresenter/KPrFactory.cpp
@@ -26,8 +26,8 @@
 #include <kinstance.h>
 
 
-KInstance* KPrFactory::s_global = 0;
-KAboutData* KPrFactory::s_aboutData = 0;
+TDEInstance* KPrFactory::s_global = 0;
+TDEAboutData* KPrFactory::s_aboutData = 0;
 
 KPrFactory::KPrFactory( TQObject* parent, const char* name )
     : KoFactory( parent, name )
@@ -56,18 +56,18 @@ KParts::Part* KPrFactory::createPartObject( TQWidget *parentWidget, const char *
     return doc;
 }
 
-KAboutData* KPrFactory::aboutData()
+TDEAboutData* KPrFactory::aboutData()
 {
     if( !s_aboutData )
         s_aboutData=newKPresenterAboutData();
     return s_aboutData;
 }
 
-KInstance* KPrFactory::global()
+TDEInstance* KPrFactory::global()
 {
     if ( !s_global )
     {
-        s_global = new KInstance(aboutData());
+        s_global = new TDEInstance(aboutData());
 
         s_global->dirs()->addResourceType("kpresenter_template",
                                           KStandardDirs::kde_default("data") + "kpresenter/templates/");
diff --git a/kpresenter/KPrFactory.h b/kpresenter/KPrFactory.h
index 7e37bf6d..80763049 100644
--- a/kpresenter/KPrFactory.h
+++ b/kpresenter/KPrFactory.h
@@ -22,7 +22,7 @@
 #define KPRESENTER_FACTORY_H
 
 #include <KoFactory.h>
-class KAboutData;
+class TDEAboutData;
 
 class KPrFactory : public KoFactory
 {
@@ -36,14 +36,14 @@ public:
                                             const char *name = 0, const char *classname = "KoDocument",
                                             const TQStringList &args = TQStringList() );
 
-    static KInstance* global();
+    static TDEInstance* global();
 
-    // _Creates_ a KAboutData but doesn't keep ownership
-    static KAboutData* aboutData();
+    // _Creates_ a TDEAboutData but doesn't keep ownership
+    static TDEAboutData* aboutData();
 
 private:
-    static KInstance* s_global;
-    static KAboutData* s_aboutData;
+    static TDEInstance* s_global;
+    static TDEAboutData* s_aboutData;
 };
 
 #endif
diff --git a/kspread/kspread_aboutdata.h b/kspread/kspread_aboutdata.h
index 0b0ce85a..f51a6e4c 100644
--- a/kspread/kspread_aboutdata.h
+++ b/kspread/kspread_aboutdata.h
@@ -32,10 +32,10 @@ static const char* description=I18N_NOOP("KOffice Spreadsheet Application");
 // Always the same as the KOffice version
 static const char* version=KOFFICE_VERSION_STRING;
 
-KAboutData * newAboutData()
+TDEAboutData * newAboutData()
 {
-    KAboutData * aboutData = new KAboutData( "kspread", I18N_NOOP("KSpread"),
-                                             version, description, KAboutData::License_LGPL,
+    TDEAboutData * aboutData = new TDEAboutData( "kspread", I18N_NOOP("KSpread"),
+                                             version, description, TDEAboutData::License_LGPL,
                                              I18N_NOOP("(c) 1998-2006, The KSpread Team"), 0,
                "http://www.koffice.org/kspread/");
     aboutData->addAuthor("Torben Weis", 0, "[email protected]");
diff --git a/kspread/kspread_factory.cc b/kspread/kspread_factory.cc
index 8d37c799..1258b9a4 100644
--- a/kspread/kspread_factory.cc
+++ b/kspread/kspread_factory.cc
@@ -28,9 +28,9 @@
 
 using namespace KSpread;
 
-KInstance* Factory::s_global = 0;
+TDEInstance* Factory::s_global = 0;
 DCOPObject* Factory::s_dcopObject = 0;
-KAboutData* Factory::s_aboutData = 0;
+TDEAboutData* Factory::s_aboutData = 0;
 
 Factory::Factory( TQObject* parent, const char* name )
     : KoFactory( parent, name )
@@ -65,18 +65,18 @@ KParts::Part* Factory::createPartObject( TQWidget *parentWidget, const char *wid
   return doc;
 }
 
-KAboutData* Factory::aboutData()
+TDEAboutData* Factory::aboutData()
 {
   if( !s_aboutData )
       s_aboutData = newAboutData();
   return s_aboutData;
 }
 
-KInstance* Factory::global()
+TDEInstance* Factory::global()
 {
     if ( !s_global )
     {
-      s_global = new KInstance(aboutData());
+      s_global = new TDEInstance(aboutData());
 
       s_global->dirs()->addResourceType( "kspread_template",
                                           KStandardDirs::kde_default("data") + "kspread/templates/");
diff --git a/kspread/kspread_factory.h b/kspread/kspread_factory.h
index e1897856..a2f467e0 100644
--- a/kspread/kspread_factory.h
+++ b/kspread/kspread_factory.h
@@ -22,7 +22,7 @@
 
 #include <KoFactory.h>
 
-class KAboutData;
+class TDEAboutData;
 class DCOPObject;
 
 namespace KSpread
@@ -38,17 +38,17 @@ public:
 
     virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
-    static KInstance* global();
+    static TDEInstance* global();
 
-    // _Creates_ a KAboutData but doesn't keep ownership
-    static KAboutData* aboutData();
+    // _Creates_ a TDEAboutData but doesn't keep ownership
+    static TDEAboutData* aboutData();
 
     static DCOPObject* dcopObject();
 
 private:
-    static KInstance* s_global;
+    static TDEInstance* s_global;
     static DCOPObject* s_dcopObject;
-    static KAboutData* s_aboutData;
+    static TDEAboutData* s_aboutData;
 };
 
 } // namespace KSpread
diff --git a/kspread/plugins/calculator/main.cpp b/kspread/plugins/calculator/main.cpp
index 2f1a0b89..48afebd7 100644
--- a/kspread/plugins/calculator/main.cpp
+++ b/kspread/plugins/calculator/main.cpp
@@ -41,12 +41,12 @@ using namespace KSpread;
 
 K_EXPORT_COMPONENT_FACTORY( libkspreadcalc, CalcFactory )
 
-KInstance* CalcFactory::s_global = 0;
+TDEInstance* CalcFactory::s_global = 0;
 
 CalcFactory::CalcFactory( TQObject* parent, const char* name )
     : KLibFactory( parent, name )
 {
-    s_global = new KInstance( "kspreadcalc" );
+    s_global = new TDEInstance( "kspreadcalc" );
 }
 
 CalcFactory::~CalcFactory()
@@ -66,7 +66,7 @@ TQObject* CalcFactory::createObject( TQObject* parent, const char* name, const c
     return obj;
 }
 
-KInstance* CalcFactory::global()
+TDEInstance* CalcFactory::global()
 {
     return s_global;
 }
diff --git a/kspread/plugins/calculator/main.h b/kspread/plugins/calculator/main.h
index 968057a7..f44a1a01 100644
--- a/kspread/plugins/calculator/main.h
+++ b/kspread/plugins/calculator/main.h
@@ -30,7 +30,7 @@
 #include <koffice_export.h>
 
 class TQtCalculator;
-class KInstance;
+class TDEInstance;
 
 namespace KSpread
 {
@@ -48,10 +48,10 @@ public:
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
 			     const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
 
-    static KInstance* global();
+    static TDEInstance* global();
 
 private:
-    static KInstance* s_global;
+    static TDEInstance* s_global;
 };
 
 class KSPREAD_EXPORT Calculator : public KParts::Plugin
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
index c0d5c1ca..9ad856f9 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
@@ -81,14 +81,14 @@ PluginInsertCalendar::~PluginInsertCalendar()
 {
 }
 
-KAboutData* PluginInsertCalendar::createAboutData()
+TDEAboutData* PluginInsertCalendar::createAboutData()
 {
-  KAboutData * aboutData = new KAboutData(
+  TDEAboutData * aboutData = new TDEAboutData(
     "kspreadinsertcalendar",  //app name
     I18N_NOOP("Insert Calendar"),  //program name
     KOFFICE_VERSION_STRING,  //version
     I18N_NOOP("KSpread Insert Calendar Plugin"),  //short description
-    KAboutData::License_BSD,  //license type
+    TDEAboutData::License_BSD,  //license type
     I18N_NOOP("(c) 2005, The KSpread Team"),  //copyright
     0,//I18N_NOOP("The Insert Calendar plugin can be used in spreadsheets"),  //text
     "http://www.koffice.org/kspread/");
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h
index 51052482..b8f68183 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.h
@@ -31,7 +31,7 @@
 
 #include <tqdatetime.h>
 
-class KAboutData;
+class TDEAboutData;
 
 namespace KSpread
 {
@@ -90,7 +90,7 @@ class KSPREAD_EXPORT PluginInsertCalendar : public KParts::Plugin
     /**
      * Creates about data for the Insert Calendar plugin.
      */
-    static KAboutData* createAboutData();
+    static TDEAboutData* createAboutData();
 
   public slots:
 
diff --git a/kugar/kudesigner/kudesigner_aboutdata.h b/kugar/kudesigner/kudesigner_aboutdata.h
index 9be6a2de..b9682fde 100644
--- a/kugar/kudesigner/kudesigner_aboutdata.h
+++ b/kugar/kudesigner/kudesigner_aboutdata.h
@@ -27,14 +27,14 @@
 static const char* description = I18N_NOOP( "GUI report template designer for Kugar report engine" );
 static const char* version = KOFFICE_VERSION_STRING;
 
-KAboutData * newKudesignerAboutData()
+TDEAboutData * newKudesignerAboutData()
 {
     // Change this, of course
-    // The first argument of the KAboutData constructor is the instance name.
+    // The first argument of the TDEAboutData constructor is the instance name.
     // It is very important, it's what's used for many things, like the subdir in share/apps, etc.
     // It must also match the name of the application's .desktop file.
-    KAboutData * aboutData = new KAboutData( "kudesigner", I18N_NOOP( "Kugar Report Designer" ),
-                             version, description, KAboutData::License_LGPL,
+    TDEAboutData * aboutData = new TDEAboutData( "kudesigner", I18N_NOOP( "Kugar Report Designer" ),
+                             version, description, TDEAboutData::License_LGPL,
                              "(c) 2002,2003, Alexander Dymo (and the Kugar Team)" );
     aboutData->addAuthor( "Alexander Dymo",
                           I18N_NOOP( "Maintainer, Report Designer, Kugar library enhancements" ),
diff --git a/kugar/kudesigner/kudesigner_factory.cpp b/kugar/kudesigner/kudesigner_factory.cpp
index 1f5a8740..82b88f03 100644
--- a/kugar/kudesigner/kudesigner_factory.cpp
+++ b/kugar/kudesigner/kudesigner_factory.cpp
@@ -26,8 +26,8 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
-KInstance* KudesignerFactory::s_global = 0L;
-KAboutData* KudesignerFactory::s_aboutData = 0L;
+TDEInstance* KudesignerFactory::s_global = 0L;
+TDEAboutData* KudesignerFactory::s_aboutData = 0L;
 
 KudesignerFactory::KudesignerFactory( TQObject* parent, const char* name )
         : KoFactory( parent, name )
@@ -74,18 +74,18 @@ KParts::Part* KudesignerFactory::createPartObject( TQWidget *parentWidget, const
     return part;
 }
 
-KAboutData* KudesignerFactory::aboutData()
+TDEAboutData* KudesignerFactory::aboutData()
 {
     if ( !s_aboutData )
         s_aboutData = newKudesignerAboutData();
     return s_aboutData;
 }
 
-KInstance* KudesignerFactory::global()
+TDEInstance* KudesignerFactory::global()
 {
     if ( !s_global )
     {
-        s_global = new KInstance( aboutData() );
+        s_global = new TDEInstance( aboutData() );
         // Add any application-specific resource directories here
         s_global->dirs() ->addResourceType( "kudesigner_template",
                                             KStandardDirs::kde_default( "data" ) + "kudesigner/templates/" );
diff --git a/kugar/kudesigner/kudesigner_factory.h b/kugar/kudesigner/kudesigner_factory.h
index f35e22e7..91e49690 100644
--- a/kugar/kudesigner/kudesigner_factory.h
+++ b/kugar/kudesigner/kudesigner_factory.h
@@ -22,8 +22,8 @@
 
 #include <KoFactory.h>
 #include <koffice_export.h>
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class KUGARDESIGNER_EXPORT KudesignerFactory : public KoFactory
 {
@@ -35,14 +35,14 @@ public:
 
     virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
-    static KInstance* global();
+    static TDEInstance* global();
 
-    // _Creates_ a KAboutData but doesn't keep ownership
-    static KAboutData* aboutData();
+    // _Creates_ a TDEAboutData but doesn't keep ownership
+    static TDEAboutData* aboutData();
 
 private:
-    static KInstance* s_global;
-    static KAboutData* s_aboutData;
+    static TDEInstance* s_global;
+    static TDEAboutData* s_aboutData;
 };
 
 #endif
diff --git a/kugar/part/kugar_about.h b/kugar/part/kugar_about.h
index d2740fcf..a38f9460 100644
--- a/kugar/part/kugar_about.h
+++ b/kugar/part/kugar_about.h
@@ -26,10 +26,10 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 
-KAboutData *newKugarAboutData()
+TDEAboutData *newKugarAboutData()
 {
-    KAboutData * aboutData = new KAboutData( "kugar", I18N_NOOP( "Kugar" ),
-                             VERSION, I18N_NOOP( "Report viewer(generator)" ), KAboutData::License_GPL,
+    TDEAboutData * aboutData = new TDEAboutData( "kugar", I18N_NOOP( "Kugar" ),
+                             VERSION, I18N_NOOP( "Report viewer(generator)" ), TDEAboutData::License_GPL,
                              I18N_NOOP( "(c) 1999-2006, The Kugar Team" ), 0, "http://www.koffice.org" );
 
     aboutData->addAuthor( "Alexander Dymo",
diff --git a/kugar/part/kugar_factory.cpp b/kugar/part/kugar_factory.cpp
index f0206802..602e5dc2 100644
--- a/kugar/part/kugar_factory.cpp
+++ b/kugar/part/kugar_factory.cpp
@@ -18,8 +18,8 @@
 #include "kugar_part.h"
 #include "kugar_about.h"
 
-KInstance *KugarFactory::s_instance = 0L;
-KAboutData *KugarFactory::s_aboutdata = 0L;
+TDEInstance *KugarFactory::s_instance = 0L;
+TDEAboutData *KugarFactory::s_aboutdata = 0L;
 
 
 // The part's entry point.
@@ -34,11 +34,11 @@ KugarFactory::KugarFactory( TQObject *parent, const char* name ) : KoFactory( pa
     global();
 }
 
-KInstance* KugarFactory::global()
+TDEInstance* KugarFactory::global()
 {
     if ( !s_instance )
     {
-        s_instance = new KInstance( aboutData() );
+        s_instance = new TDEInstance( aboutData() );
         s_instance->iconLoader() ->addAppDir( "koffice" );
         s_instance->iconLoader() ->addAppDir( "kugar" );
 
@@ -56,7 +56,7 @@ KugarFactory::~KugarFactory()
     s_aboutdata = 0;
 }
 
-KAboutData *KugarFactory::aboutData()
+TDEAboutData *KugarFactory::aboutData()
 {
     if ( !s_aboutdata )
         s_aboutdata = newKugarAboutData();
diff --git a/kugar/part/kugar_factory.h b/kugar/part/kugar_factory.h
index c809870b..3ee962f8 100644
--- a/kugar/part/kugar_factory.h
+++ b/kugar/part/kugar_factory.h
@@ -10,7 +10,7 @@
 #include <KoFactory.h>
 #include <kaboutdata.h>
 
-class KInstance;
+class TDEInstance;
 
 
 class KugarFactory : public KoFactory
@@ -25,13 +25,13 @@ public:
                                             TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument",
                                             const TQStringList &args = TQStringList() );
 
-    static KInstance* global();
+    static TDEInstance* global();
 
-    // _Creates_ a KAboutData but doesn't keep ownership
-    static KAboutData* aboutData();
+    // _Creates_ a TDEAboutData but doesn't keep ownership
+    static TDEAboutData* aboutData();
 private:
-    static KInstance* s_instance;
-    static KAboutData* s_aboutdata;
+    static TDEInstance* s_instance;
+    static TDEAboutData* s_aboutdata;
 };
 
 #endif
diff --git a/kugar/part/kugar_part.h b/kugar/part/kugar_part.h
index e41deb62..9d61361c 100644
--- a/kugar/part/kugar_part.h
+++ b/kugar/part/kugar_part.h
@@ -11,7 +11,7 @@
 #include "mpagecollection.h"
 #include "mreportengine.h"
 
-class KInstance;
+class TDEInstance;
 class KugarBrowserExtension;
 
 class KugarPart: public KoDocument
diff --git a/kword/KWAboutData.h b/kword/KWAboutData.h
index 42456598..849aecf4 100644
--- a/kword/KWAboutData.h
+++ b/kword/KWAboutData.h
@@ -32,10 +32,10 @@ static const char* KWORD_DESCRIPTION=I18N_NOOP("KOffice Word Processor");
 // From then on: always the same as the KOffice version
 static const char* KWORD_VERSION=KOFFICE_VERSION_STRING;
 
-KAboutData * newKWordAboutData()
+TDEAboutData * newKWordAboutData()
 {
-    KAboutData * aboutData=new KAboutData( "kword", I18N_NOOP("KWord"),
-                                           KWORD_VERSION, KWORD_DESCRIPTION, KAboutData::License_LGPL,
+    TDEAboutData * aboutData=new TDEAboutData( "kword", I18N_NOOP("KWord"),
+                                           KWORD_VERSION, KWORD_DESCRIPTION, TDEAboutData::License_LGPL,
                                            I18N_NOOP("(c) 1998-2006, The KWord Team"), 0,
                                            "http://www.koffice.org/kword/" );
     aboutData->addAuthor("David Faure", 0, "[email protected]");
diff --git a/kword/KWFactory.cpp b/kword/KWFactory.cpp
index 50648519..4c2009f1 100644
--- a/kword/KWFactory.cpp
+++ b/kword/KWFactory.cpp
@@ -25,8 +25,8 @@
 
 #include <kiconloader.h>
 
-KInstance* KWFactory::s_instance = 0;
-KAboutData* KWFactory::s_aboutData = 0;
+TDEInstance* KWFactory::s_instance = 0;
+TDEAboutData* KWFactory::s_aboutData = 0;
 
 KWFactory::KWFactory( TQObject* parent, const char* name )
     : KoFactory( parent, name )
@@ -56,7 +56,7 @@ KParts::Part* KWFactory::createPartObject( TQWidget *parentWidget, const char *w
     return doc;
 }
 
-KAboutData* KWFactory::aboutData()
+TDEAboutData* KWFactory::aboutData()
 {
     if(!s_aboutData) {
         s_aboutData = newKWordAboutData();
@@ -64,11 +64,11 @@ KAboutData* KWFactory::aboutData()
     return s_aboutData;
 }
 
-KInstance* KWFactory::instance()
+TDEInstance* KWFactory::instance()
 {
     if ( !s_instance )
     {
-      s_instance = new KInstance( aboutData() );
+      s_instance = new TDEInstance( aboutData() );
 
       s_instance->dirs()->addResourceType( "kword_template",
               KStandardDirs::kde_default("data") + "kword/templates/");
diff --git a/kword/KWFactory.h b/kword/KWFactory.h
index 30d69cf9..028756db 100644
--- a/kword/KWFactory.h
+++ b/kword/KWFactory.h
@@ -22,7 +22,7 @@
 
 #include <KoFactory.h>
 
-class KAboutData;
+class TDEAboutData;
 
 class KWFactory : public KoFactory
 {
@@ -34,14 +34,14 @@ public:
 
     virtual KParts::Part* createPartObject( TQWidget * = 0, const char * = 0, TQObject* parent = 0, const char* name = 0, const char* classname = "KoDocument", const TQStringList &args = TQStringList() );
 
-    static KInstance* instance();
+    static TDEInstance* instance();
 
-    // _Creates_ a KAboutData but doesn't keep ownership
-    static KAboutData* aboutData();
+    // _Creates_ a TDEAboutData but doesn't keep ownership
+    static TDEAboutData* aboutData();
 
 private:
-    static KInstance* s_instance;
-    static KAboutData* s_aboutData;
+    static TDEInstance* s_instance;
+    static TDEAboutData* s_aboutData;
 };
 
 #endif
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index 90606ce1..7303f1db 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -168,8 +168,8 @@ KWMailMergeDataSource *KWMailMergeDataBase::loadPlugin(const TQString& name)
           if (create)
           {
               // create the module
-              KWMailMergeDataSource * (*func)(KInstance*,TQObject*);
-              func = (KWMailMergeDataSource* (*)(KInstance*,TQObject*)) create;
+              KWMailMergeDataSource * (*func)(TDEInstance*,TQObject*);
+              func = (KWMailMergeDataSource* (*)(TDEInstance*,TQObject*)) create;
               KWMailMergeDataSource *tmpsource =func(KWFactory::instance(),this);
               if (tmpsource)
               {
diff --git a/kword/KWMailMergeDataSource.cpp b/kword/KWMailMergeDataSource.cpp
index d21c4bd0..924c665d 100644
--- a/kword/KWMailMergeDataSource.cpp
+++ b/kword/KWMailMergeDataSource.cpp
@@ -1,7 +1,7 @@
 #include "KWMailMergeDataSource.h"
 #include "KWMailMergeDataSource.moc"
 
-KWMailMergeDataSource::KWMailMergeDataSource(KInstance* inst,TQObject *parent): TQObject(parent),
+KWMailMergeDataSource::KWMailMergeDataSource(TDEInstance* inst,TQObject *parent): TQObject(parent),
 DCOPObject(TQCString(parent->name())+".plugin_loading"),m_instance(inst)
 {
 }
diff --git a/kword/KWMailMergeDataSource.h b/kword/KWMailMergeDataSource.h
index 4d5a2508..3cf5eea1 100644
--- a/kword/KWMailMergeDataSource.h
+++ b/kword/KWMailMergeDataSource.h
@@ -49,13 +49,13 @@ class KWORD_EXPORT KWMailMergeDataSource: public TQObject, public DCOPObject
 //    
     K_DCOP
     public:
-    KWMailMergeDataSource(KInstance* inst,TQObject *parent);
+    KWMailMergeDataSource(TDEInstance* inst,TQObject *parent);
     virtual ~KWMailMergeDataSource(){;}
     virtual class TQString getValue( const class TQString &name, int record = -1 ) const=0;
 
     const TQMap< TQString, TQString > &getRecordEntries() const;
 
-    KInstance *KWInstance(){return m_instance;}
+    TDEInstance *KWInstance(){return m_instance;}
     virtual  bool showConfigDialog(class TQWidget*,int) =0;
 
     virtual void save(TQDomDocument&, TQDomElement&)=0;
@@ -66,7 +66,7 @@ class KWORD_EXPORT KWMailMergeDataSource: public TQObject, public DCOPObject
     protected:
     DbRecord sampleRecord;
     private:
-    KInstance *m_instance;
+    TDEInstance *m_instance;
 k_dcop:
     virtual  int getNumRecords() const =0;
 };
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index f54e529c..ef76bea0 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -46,7 +46,7 @@
  *
  ******************************************************************/
 
-KWClassicSerialDataSource::KWClassicSerialDataSource(KInstance *inst,TQObject *parent)
+KWClassicSerialDataSource::KWClassicSerialDataSource(TDEInstance *inst,TQObject *parent)
 	: KWMailMergeDataSource(inst,parent)
 //    : doc( doc_ )
 {
@@ -561,7 +561,7 @@ void KWClassicMailMergeEditor::removeRecord()
 }
 
 extern "C" {
-	KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(KInstance *inst,TQObject *parent)
+	KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_classic(TDEInstance *inst,TQObject *parent)
 	{
 		return new KWClassicSerialDataSource(inst,parent);
 	}
diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h
index 6f6133e2..9863ffe0 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.h
+++ b/kword/mailmerge/KWClassicSerialDataSource.h
@@ -48,7 +48,7 @@ class KWClassicSerialDataSource: public KWMailMergeDataSource
     Q_OBJECT
   
     public:
-    KWClassicSerialDataSource(KInstance *inst,TQObject *parent);
+    KWClassicSerialDataSource(TDEInstance *inst,TQObject *parent);
     ~KWClassicSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 1886207c..74fc211c 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -33,7 +33,7 @@
 #include "KWMailMergeKABC.h"
 #include "KWMailMergeKABCConfig.h"
 
-KWMailMergeKABC::KWMailMergeKABC( KInstance *inst, TQObject *parent )
+KWMailMergeKABC::KWMailMergeKABC( TDEInstance *inst, TQObject *parent )
         : KWMailMergeDataSource( inst, parent )
 {
     _addressBook = KABC::StdAddressBook::self();
@@ -537,7 +537,7 @@ TQStringList KWMailMergeKABC::singleRecords() const
 
 extern "C"
 {
-    KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( KInstance *inst, TQObject *parent )
+    KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kabc( TDEInstance *inst, TQObject *parent )
     {
         return new KWMailMergeKABC( inst, parent );
     }
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h
index 818a06e8..32a078a6 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.h
@@ -36,7 +36,7 @@ class KWMailMergeKABC: public KWMailMergeDataSource
   
 
 public:
-    KWMailMergeKABC( KInstance *inst, TQObject *parent );
+    KWMailMergeKABC( TDEInstance *inst, TQObject *parent );
     ~KWMailMergeKABC();
 
     /**
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 025e9a4e..63a02876 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -29,7 +29,7 @@
 
 using namespace KSpread;
 
-KWMailMergeKSpread::KWMailMergeKSpread( KInstance *instance, TQObject *parent )
+KWMailMergeKSpread::KWMailMergeKSpread( TDEInstance *instance, TQObject *parent )
   : KWMailMergeDataSource( instance, parent ), _spreadSheetNumber( 1 )
 {
 }
@@ -202,7 +202,7 @@ TQString KWMailMergeKSpread::cellText( const Cell *cell ) const
 
 extern "C"
 {
-  KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( KInstance *instance, TQObject *parent )
+  KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_kspread( TDEInstance *instance, TQObject *parent )
   {
     return new KWMailMergeKSpread( instance, parent );
   }
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.h b/kword/mailmerge/kspread/kwmailmerge_kspread.h
index c093cb71..8f2a4f97 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.h
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.h
@@ -35,7 +35,7 @@ class KWMailMergeKSpread: public KWMailMergeDataSource
   
 
   public:
-    KWMailMergeKSpread( KInstance *inst, TQObject *parent );
+    KWMailMergeKSpread( TDEInstance *inst, TQObject *parent );
     ~KWMailMergeKSpread();
 
     /**
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index 466ac182..a30340ad 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -41,7 +41,7 @@
  *
  ******************************************************************/
 
-KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent)
+KWQtSqlPowerSerialDataSource::KWQtSqlPowerSerialDataSource(TDEInstance *inst,TQObject *parent)
 	: KWQtSqlSerialDataSourceBase(inst,parent),myquery(0)
 {
 	port=i18n("default");
@@ -249,7 +249,7 @@ KWQtSqlPowerMailMergeEditor::~KWQtSqlPowerMailMergeEditor(){;}
 
 
 extern "C" {
-        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(KInstance *inst,TQObject *parent)
+        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb_power(TDEInstance *inst,TQObject *parent)
         {
                 return new KWQtSqlPowerSerialDataSource(inst,parent);
         }
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
index 4df94a07..c9b24ac3 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
@@ -47,7 +47,7 @@ class KWQtSqlPowerSerialDataSource: public KWQtSqlSerialDataSourceBase
     Q_OBJECT
 //    
     public:
-    KWQtSqlPowerSerialDataSource(KInstance *inst,TQObject *parent);
+    KWQtSqlPowerSerialDataSource(TDEInstance *inst,TQObject *parent);
     ~KWQtSqlPowerSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 14c3640e..2b3f711d 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -38,7 +38,7 @@
  *
  ******************************************************************/
 
-KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent)
+KWQtSqlSerialDataSource::KWQtSqlSerialDataSource(TDEInstance *inst,TQObject *parent)
 	: KWQtSqlSerialDataSourceBase(inst,parent)
 {
   myquery=0;
@@ -211,7 +211,7 @@ void KWQtSqlDataSourceEditor::editFilter()
 }
 
 extern "C" {
-        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(KInstance *inst,TQObject *parent)
+        KWORD_MAILMERGE_EXPORT KWMailMergeDataSource *create_kwmailmerge_qtsqldb(TDEInstance *inst,TQObject *parent)
         {
                 return new KWQtSqlSerialDataSource(inst,parent);
         }
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
index 16a9051f..704ae05e 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.h
@@ -36,7 +36,7 @@
 class KWQtSqlSerialDataSource: public KWQtSqlSerialDataSourceBase
 {
     public:
-    KWQtSqlSerialDataSource(KInstance *inst,TQObject *parent);
+    KWQtSqlSerialDataSource(TDEInstance *inst,TQObject *parent);
     ~KWQtSqlSerialDataSource();
 
     virtual void save( TQDomDocument &doc,TQDomElement&);
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index 9a333a8d..41e971be 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -46,7 +46,7 @@
 
 int KWQtSqlSerialDataSourceBase::connectionId=0;
 
-KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent)
+KWQtSqlSerialDataSourceBase::KWQtSqlSerialDataSourceBase(TDEInstance *inst,TQObject *parent)
 	: KWMailMergeDataSource(inst,parent)
 {
 	DataBaseConnection=TQString("KWTQTSQLPOWER")+parent->name()+TQString("--%1").arg(connectionId++);
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
index 388e9751..120ce209 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.h
@@ -41,7 +41,7 @@ class KWQtSqlSerialDataSourceBase: public KWMailMergeDataSource
 //    
     K_DCOP
     public:
-    KWQtSqlSerialDataSourceBase(KInstance *inst,TQObject *parent);
+    KWQtSqlSerialDataSourceBase(TDEInstance *inst,TQObject *parent);
     ~KWQtSqlSerialDataSourceBase();
 
    virtual bool showConfigDialog(TQWidget *par,int action);
diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc
index 966404ed..19b534a0 100644
--- a/lib/kformula/main.cc
+++ b/lib/kformula/main.cc
@@ -236,8 +236,8 @@ static const KCmdLineOptions options[]= {
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("math test", "KFormula test",
-                         "0.01", "test", KAboutData::License_GPL,
+    TDEAboutData aboutData("math test", "KFormula test",
+                         "0.01", "test", TDEAboutData::License_GPL,
                          "(c) 2003, Ulrich Kuettler");
     aboutData.addAuthor("Ulrich Kuettler",0, "[email protected]");
 
diff --git a/lib/kofficecore/DESIGN b/lib/kofficecore/DESIGN
index c191128b..bc5d16cd 100644
--- a/lib/kofficecore/DESIGN
+++ b/lib/kofficecore/DESIGN
@@ -5,17 +5,17 @@
 | from the answers given by David Faure <[email protected]>
 -------------------------------------------------------------------------
 
-Q: Where is the pointer to the application's instance of KAboutData
+Q: Where is the pointer to the application's instance of TDEAboutData
 data stored?
 
 A: In a static member of the TDECmdLineArgs class.
 
 
 
-Q: One of the arguments to KAboutData's constructor is the program
+Q: One of the arguments to TDEAboutData's constructor is the program
 name. Will this be used later to run the program?
 
-A: No (by the time the KAboutData's constructor is called, the program
+A: No (by the time the TDEAboutData's constructor is called, the program
 is already running). The program name is in fact the "instance name",
 which is used to locate the application's own data
 (/share/apps/<application name>/...) and many other things.
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 66828e99..1e204af7 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -75,13 +75,13 @@ class KoTemplatesPanePrivate
     {
     }
 
-    KInstance* m_instance;
+    TDEInstance* m_instance;
     bool m_selected;
     TQString m_alwaysUseTemplate;
 };
 
 
-KoTemplatesPane::KoTemplatesPane(TQWidget* parent, KInstance* instance,
+KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance,
                                  KoTemplateGroup *group, KoTemplate* /*defaultTemplate*/)
   : KoDetailsPaneBase(parent, "TemplatesPane")
 {
@@ -265,10 +265,10 @@ class KoRecentDocumentsPanePrivate
     }
 
     KIO::PreviewJob* m_previewJob;
-    KInstance* m_instance;
+    TDEInstance* m_instance;
 };
 
-KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instance)
+KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* instance)
   : KoDetailsPaneBase(parent, "RecentDocsPane")
 {
   d = new KoRecentDocumentsPanePrivate;
diff --git a/lib/kofficecore/KoDetailsPane.h b/lib/kofficecore/KoDetailsPane.h
index 9f1cf7ba..86190ede 100644
--- a/lib/kofficecore/KoDetailsPane.h
+++ b/lib/kofficecore/KoDetailsPane.h
@@ -25,7 +25,7 @@
 
 class KoTemplateGroup;
 class KoTemplate;
-class KInstance;
+class TDEInstance;
 class TQListViewItem;
 class KoRecentDocumentsPanePrivate;
 class KoRichTextListItemPrivate;
@@ -56,7 +56,7 @@ class KoTemplatesPane : public KoDetailsPaneBase
      * @param defaultTemplate pointer to the default template. Used to select a
      * template when none has been selected before.
      */
-    KoTemplatesPane(TQWidget* parent, KInstance* instance,
+    KoTemplatesPane(TQWidget* parent, TDEInstance* instance,
                     KoTemplateGroup* group, KoTemplate* defaultTemplate);
     ~KoTemplatesPane();
 
@@ -104,7 +104,7 @@ class KoRecentDocumentsPane : public KoDetailsPaneBase
      * @param parent the parent widget
      * @param instance the instance object for the app
      */
-    KoRecentDocumentsPane(TQWidget* parent, KInstance* instance);
+    KoRecentDocumentsPane(TQWidget* parent, TDEInstance* instance);
     ~KoRecentDocumentsPane();
 
     virtual bool eventFilter(TQObject* watched, TQEvent* e);
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 6abf8083..7eebcbca 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -2217,7 +2217,7 @@ TQCString KoDocument::nativeOasisMimeType() const
 
 
 //static
-KService::Ptr KoDocument::readNativeService( KInstance *instance )
+KService::Ptr KoDocument::readNativeService( TDEInstance *instance )
 {
     TQString instname = instance ? instance->instanceName() : kapp->instanceName();
 
@@ -2241,7 +2241,7 @@ KService::Ptr KoDocument::readNativeService( KInstance *instance )
     return service;
 }
 
-TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static
+TQCString KoDocument::readNativeFormatMimeType( TDEInstance *instance ) //static
 {
     KService::Ptr service = readNativeService( instance );
     if ( !service )
@@ -2262,7 +2262,7 @@ TQCString KoDocument::readNativeFormatMimeType( KInstance *instance ) //static
     return service->property( "X-TDE-NativeMimeType" ).toString().latin1();
 }
 
-TQStringList KoDocument::readExtraNativeMimeTypes( KInstance *instance ) //static
+TQStringList KoDocument::readExtraNativeMimeTypes( TDEInstance *instance ) //static
 {
     KService::Ptr service = readNativeService( instance );
     if ( !service )
@@ -2600,7 +2600,7 @@ void KoDocument::startCustomDocument() {
     deleteOpenPane();
 }
 
-KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, KInstance* instance,
+KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, TDEInstance* instance,
                                         const TQString& templateType )
 {
     KoOpenPane* openPane = new KoOpenPane( parent, instance, templateType );
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index 63fd47c9..30b9ad97 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -188,7 +188,7 @@ public:
      * @see KService
      * @see KDesktopFile
      */
-    static TQCString readNativeFormatMimeType( KInstance *instance = 0 );
+    static TQCString readNativeFormatMimeType( TDEInstance *instance = 0 );
 
     /**
      * Used by KoMainWindow, when no document exists yet.
@@ -200,14 +200,14 @@ public:
      * @see KService
      * @see KDesktopFile
      */
-    static TQStringList readExtraNativeMimeTypes( KInstance *instance = 0 );
+    static TQStringList readExtraNativeMimeTypes( TDEInstance *instance = 0 );
 
     /**
      * With the help of @p instance or TDEApplication::instance() this
      * method figures out which .desktop file matches this application,
      * and returns the KService instance for it.
      */
-    static KService::Ptr readNativeService( KInstance *instance = 0 );
+    static KService::Ptr readNativeService( TDEInstance *instance = 0 );
 
     /**
      * setup the XML reader, so that we don't have to duplicate the code.
@@ -1123,11 +1123,11 @@ protected:
     /**
      * Creates the open widget showed at application start up.
      * @param parent the parent widget
-     * @param instance the KInstance to be used for KConfig data
+     * @param instance the TDEInstance to be used for KConfig data
      * @param templateType the template-type (group) that should be selected on creation.
      * @since 1.5
      */
-    KoOpenPane* createOpenPane( TQWidget* parent, KInstance* instance,
+    KoOpenPane* createOpenPane( TQWidget* parent, TDEInstance* instance,
                                 const TQString& templateType = TQString());
 
 private slots:
diff --git a/lib/kofficecore/KoFactory.h b/lib/kofficecore/KoFactory.h
index 9435a79e..db9e12ad 100644
--- a/lib/kofficecore/KoFactory.h
+++ b/lib/kofficecore/KoFactory.h
@@ -22,7 +22,7 @@
 
 #include <kparts/factory.h>
 #include <koffice_export.h>
-class KInstance;
+class TDEInstance;
 
 class KOFFICECORE_EXPORT KoFactory : public KParts::Factory
 {
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 19fea823..2487993a 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -183,7 +183,7 @@ public:
   KSharedPtr<KoSpeaker> m_koSpeaker;
 };
 
-KoMainWindow::KoMainWindow( KInstance *instance, const char* name )
+KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
     : KParts::MainWindow( name )
 {
     setStandardToolBarMenuEnabled(true); // should there be a check for >= 3.1 ?
diff --git a/lib/kofficecore/KoMainWindow.h b/lib/kofficecore/KoMainWindow.h
index 433c93d4..293d7722 100644
--- a/lib/kofficecore/KoMainWindow.h
+++ b/lib/kofficecore/KoMainWindow.h
@@ -59,7 +59,7 @@ public:
      *
      *  Initializes a KOffice main window (with its basic GUI etc.).
      */
-    KoMainWindow( KInstance *instance, const char *_name = 0 );
+    KoMainWindow( TDEInstance *instance, const char *_name = 0 );
 
     /**
      *  Destructor.
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 83978239..1079d589 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -91,10 +91,10 @@ class KoOpenPanePrivate
     {
     }
 
-    KInstance* m_instance;
+    TDEInstance* m_instance;
 };
 
-KoOpenPane::KoOpenPane(TQWidget *parent, KInstance* instance, const TQString& templateType)
+KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& templateType)
   : KoOpenPaneBase(parent, "OpenPane")
 {
   d = new KoOpenPanePrivate;
diff --git a/lib/kofficecore/KoOpenPane.h b/lib/kofficecore/KoOpenPane.h
index ad6a8db5..d9abf832 100644
--- a/lib/kofficecore/KoOpenPane.h
+++ b/lib/kofficecore/KoOpenPane.h
@@ -27,7 +27,7 @@ class KoCustomDocumentCreator;
 class KConfig;
 class KoTemplateGroup;
 class KoOpenPanePrivate;
-class KInstance;
+class TDEInstance;
 class TQPixmap;
 class KListViewItem;
 class KoTemplatesPane;
@@ -42,10 +42,10 @@ class KoOpenPane : public KoOpenPaneBase
     /**
      * Constructor
      * @param parent the parent widget
-     * @param instance the KInstance to be used for KConfig data
+     * @param instance the TDEInstance to be used for KConfig data
      * @param templateType the template-type (group) that should be selected on creation.
      */
-    KoOpenPane(TQWidget *parent, KInstance* instance, const TQString& templateType = TQString());
+    KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& templateType = TQString());
     virtual ~KoOpenPane();
 
     TQListViewItem* addPane(const TQString& title, const TQString& icon, TQWidget* widget, int sortWeight);
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index a86d799a..e020213e 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -45,7 +45,7 @@ KoTemplate::KoTemplate(const TQString &name, const TQString &description, const
 {
 }
 
-const TQPixmap &KoTemplate::loadPicture( KInstance* instance ) {
+const TQPixmap &KoTemplate::loadPicture( TDEInstance* instance ) {
 
     if(m_cached)
         return m_pixmap;
@@ -130,7 +130,7 @@ KoTemplate *KoTemplateGroup::find(const TQString &name) const {
 
 
 KoTemplateTree::KoTemplateTree(const TQCString &templateType,
-                               KInstance *instance, bool readTree) :
+                               TDEInstance *instance, bool readTree) :
     m_templateType(templateType), m_instance(instance), m_defaultGroup(0L),
     m_defaultTemplate(0L) {
 
diff --git a/lib/kofficecore/KoTemplates.h b/lib/kofficecore/KoTemplates.h
index d65fab44..481b9a94 100644
--- a/lib/kofficecore/KoTemplates.h
+++ b/lib/kofficecore/KoTemplates.h
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 #include <koffice_export.h>
 
-class KInstance;
+class TDEInstance;
 
 /** @internal */
 class KOFFICECORE_EXPORT KoTemplate {
@@ -46,7 +46,7 @@ public:
     TQString file() const { return m_file; }
     TQString picture() const { return m_picture; }
     TQString fileName() const { return m_fileName; }
-    const TQPixmap &loadPicture( KInstance* instance );
+    const TQPixmap &loadPicture( TDEInstance* instance );
 
     bool isHidden() const { return m_hidden; }
     void setHidden(bool hidden=true) { m_hidden=hidden; m_touched=true; }
@@ -108,12 +108,12 @@ private:
 class KoTemplateTree {
 
 public:
-    KoTemplateTree(const TQCString &templateType, KInstance *instance,
+    KoTemplateTree(const TQCString &templateType, TDEInstance *instance,
 		   bool readTree=false);
     ~KoTemplateTree() {}
 
     TQCString templateType() const { return m_templateType; }
-    KInstance *instance() const { return m_instance; }
+    TDEInstance *instance() const { return m_instance; }
     void readTemplateTree();
     void writeTemplateTree();
 
@@ -136,7 +136,7 @@ private:
 		       const TQString &localDir);
 
     TQCString m_templateType;
-    KInstance *m_instance;
+    TDEInstance *m_instance;
     TQPtrList<KoTemplateGroup> m_groups;
     KoTemplateGroup *m_defaultGroup;
     KoTemplate *m_defaultTemplate;
diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h
index db8e1fc6..549296da 100644
--- a/lib/kofficecore/KoView.h
+++ b/lib/kofficecore/KoView.h
@@ -37,7 +37,7 @@ class KoViewPrivate;
 class KoViewChild;
 class KoFrame;
 class KStatusBar;
-class KInstance;
+class TDEInstance;
 class KPrinter;
 class KoDocumentChild;
 class DCOPObject;
diff --git a/lib/kofficecore/tests/filter_graph.cpp b/lib/kofficecore/tests/filter_graph.cpp
index cffc4c54..8ef386cb 100644
--- a/lib/kofficecore/tests/filter_graph.cpp
+++ b/lib/kofficecore/tests/filter_graph.cpp
@@ -25,7 +25,7 @@
 
 int main( int /*argc*/, char ** /*argv*/ )
 {
-    KInstance instance( "filter_graph" );  // we need an instance when using the trader
+    TDEInstance instance( "filter_graph" );  // we need an instance when using the trader
 
     TQCString output = "digraph filters {\n";
 
diff --git a/lib/kofficecore/tests/filterchain_test.cpp b/lib/kofficecore/tests/filterchain_test.cpp
index 05592b92..27594d29 100644
--- a/lib/kofficecore/tests/filterchain_test.cpp
+++ b/lib/kofficecore/tests/filterchain_test.cpp
@@ -24,7 +24,7 @@
 
 int main( int /*argc*/, char ** /*argv*/ )
 {
-    KInstance instance( "filterchain_test" );  // we need an instance when using the trader
+    TDEInstance instance( "filterchain_test" );  // we need an instance when using the trader
     KOffice::Graph g( "application/x-kspread" );
     g.dump();
     g.setSourceMimeType( "application/x-kword" );
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 2742ff11..4bda8821 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -120,7 +120,7 @@ int KoSelectAction::plug(TQWidget* widget, int index)
                           TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
                           index );
     } else {
-      KInstance *instance;
+      TDEInstance *instance;
 
       if ( m_parentCollection ) {
         instance = m_parentCollection->instance();
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index af79486d..d904fac0 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -119,7 +119,7 @@ private:
 
 class KoTemplateChooseDiaPrivate {
     public:
-	KoTemplateChooseDiaPrivate(const TQCString& templateType, KInstance* instance,
+	KoTemplateChooseDiaPrivate(const TQCString& templateType, TDEInstance* instance,
                                    const TQCString &format,
                                    const TQString &nativeName,
                                    const TQStringList& extraNativeMimeTypes,
@@ -136,7 +136,7 @@ class KoTemplateChooseDiaPrivate {
 	~KoTemplateChooseDiaPrivate() {}
 
 	TQCString m_templateType;
-	KInstance* m_instance;
+	TDEInstance* m_instance;
 	TQCString m_format;
 	TQString m_nativeName;
         TQStringList m_extraNativeMimeTypes;
@@ -178,7 +178,7 @@ class KoTemplateChooseDiaPrivate {
 /******************************************************************/
 
 /*================================================================*/
-KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance,
+KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *parent, const char *name, TDEInstance* instance,
                                          const TQCString &format,
                                          const TQString &nativeName,
                                          const TQStringList &extraNativeMimeTypes,
@@ -227,7 +227,7 @@ static bool cancelQuits() {
     return onlyDoc && onlyMainWindow && kapp->instanceName() != "koshell"; // hack for koshell
 }
 
-KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file,
+KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file,
                                                             const KoTemplateChooseDia::DialogType &dialogType,
                                                             const TQCString& templateType,
                                                             TQWidget* parent)
@@ -241,7 +241,7 @@ KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance,
                    dialogType, templateType, parent );
 }
 
-KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file,
+KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file,
                                        const TQCString &format,
                                        const TQString &nativeName,
                                        const TQStringList& extraNativeMimeTypes,
@@ -746,7 +746,7 @@ TQString KoTemplateChooseDia::descriptionText(const TQString &name, const TQStri
 
 /*================================================================*/
 
-TQIconViewItem * KoTCDIconCanvas::load( KoTemplateGroup *group, const TQString& name, KInstance* instance )
+TQIconViewItem * KoTCDIconCanvas::load( KoTemplateGroup *group, const TQString& name, TDEInstance* instance )
 {
     TQIconViewItem * itemtoreturn = 0;
 
diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h
index 5bedde84..d39bc7ee 100644
--- a/lib/kofficeui/KoTemplateChooseDia.h
+++ b/lib/kofficeui/KoTemplateChooseDia.h
@@ -49,7 +49,7 @@ class KoTCDIconCanvas : public KIconCanvas
 	    : KIconCanvas( parent, name ) {}
 
 	bool isCurrentValid() { return currentItem(); }
-	TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, KInstance* instance);
+	TQIconViewItem * load(KoTemplateGroup *group, const TQString& name, TDEInstance* instance);
 
     protected:
 	virtual void keyPressEvent( TQKeyEvent *e ) {
@@ -118,7 +118,7 @@ class KoTCDRecentFilesIconView : public KFileIconView {
         TQLabel* toolTip;
 };
 
-class KInstance;
+class TDEInstance;
 class KoTemplateChooseDiaPrivate;
 
 /**
@@ -159,7 +159,7 @@ public:
      * This is the static method you'll normally use to show the
      * dialog.
      *
-     * @param instance the KInstance of your app
+     * @param instance the TDEInstance of your app
      * The native mimetype is retrieved from the (desktop file of) that instance.
      * @param file this is the filename which is returned to your app
      * More precisely, it's a url (to give to KURL) if ReturnType is File
@@ -171,14 +171,14 @@ public:
      * @param parent pointer to parent widget
      * @return The return type (see above)
      */
-    static ReturnType choose(KInstance* instance, TQString &file,
+    static ReturnType choose(TDEInstance* instance, TQString &file,
                              const DialogType &dialogType,
                              const TQCString& templateType,
                              TQWidget* parent);
 
 private:
     /// Ditto, with extraNativeMimeTypes added
-    static ReturnType choose(KInstance* instance, TQString &file,
+    static ReturnType choose(TDEInstance* instance, TQString &file,
                              const TQCString &format,
                              const TQString &nativeName,
                              const TQStringList& extraNativeMimeTypes,
@@ -215,7 +215,7 @@ private:
      *
      * @param parent parent the parent of the dialog
      * @param name the TQt internal name
-     * @param instance the KInstance of your app
+     * @param instance the TDEInstance of your app
      * @param format is the mimetype of the app (e.g. application/x-kspread)
      * @param nativeName is the name of your app (e.g KSpread)
      * @param dialogType the type of the dialog
@@ -224,7 +224,7 @@ private:
      *
      * @return The return type (see above)
      */
-    KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance,
+    KoTemplateChooseDia(TQWidget *parent, const char *name, TDEInstance* instance,
                         const TQCString &format,
                         const TQString &nativeName,
                         const TQStringList &extraNativeMimeTypes,
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 91684726..c3b206e8 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -55,7 +55,7 @@
 
 class KoTemplateCreateDiaPrivate {
 public:
-    KoTemplateCreateDiaPrivate( TQWidget* /*parent*/, KInstance * instance)
+    KoTemplateCreateDiaPrivate( TQWidget* /*parent*/, TDEInstance * instance)
          : m_instance( instance ), m_tempFile( TQString(), ".png" )
     {
         m_tree=0L;
@@ -84,7 +84,7 @@ public:
     KListView *m_groups;
     TQPushButton *m_add, *m_remove;
     TQCheckBox *m_defaultTemplate;
-    KInstance *m_instance;
+    TDEInstance *m_instance;
     bool m_changed;
     /// Temp file for remote picture file
     KTempFile m_tempFile;
@@ -97,7 +97,7 @@ public:
  *
  ****************************************************************************/
 
-KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstance *instance,
+KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInstance *instance,
                                           const TQString &file, const TQPixmap &pix, TQWidget *parent ) :
     KDialogBase( parent, "template create dia", true, i18n( "Create Template" ),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok ), m_file(file), m_pixmap(pix) {
@@ -200,7 +200,7 @@ void KoTemplateCreateDia::slotSelectionChanged()
     }
 }
 
-void KoTemplateCreateDia::createTemplate( const TQCString &templateType, KInstance *instance,
+void KoTemplateCreateDia::createTemplate( const TQCString &templateType, TDEInstance *instance,
                                           const TQString &file, const TQPixmap &pix, TQWidget *parent ) {
 
     KoTemplateCreateDia *dia = new KoTemplateCreateDia( templateType, instance, file, pix, parent );
diff --git a/lib/kofficeui/KoTemplateCreateDia.h b/lib/kofficeui/KoTemplateCreateDia.h
index e3e30322..73833975 100644
--- a/lib/kofficeui/KoTemplateCreateDia.h
+++ b/lib/kofficeui/KoTemplateCreateDia.h
@@ -28,7 +28,7 @@
 class TQString;
 class TQPixmap;
 class TQWidget;
-class KInstance;
+class TDEInstance;
 class KLineEdit;
 class TQListViewItem;
 class KoTemplateCreateDiaPrivate;
@@ -45,11 +45,11 @@ class KOFFICEUI_EXPORT KoTemplateCreateDia : public KDialogBase
   
 
 public:
-    KoTemplateCreateDia( const TQCString &templateType, KInstance *instance,
+    KoTemplateCreateDia( const TQCString &templateType, TDEInstance *instance,
                          const TQString &file, const TQPixmap &pix, TQWidget *parent=0L );
     ~KoTemplateCreateDia();
 
-    static void createTemplate( const TQCString &templateType, KInstance *instance,
+    static void createTemplate( const TQCString &templateType, TDEInstance *instance,
                                 const TQString &file, const TQPixmap &pix, TQWidget *parent=0L );
 
 protected:
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index db4d6467..ba3c3a9b 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -44,7 +44,7 @@
 #include <config.h>
 #endif
 
-KoToolBox::KoToolBox( KMainWindow *mainWin, const char* name, KInstance* instance, int numberOfTooltypes )
+KoToolBox::KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes )
     : KToolBar( mainWin, TQt::DockLeft, false, name, true, true), m_instance(instance)
 {
     setFullSize( false );
diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h
index 4b83f03c..25c9f1c4 100644
--- a/lib/kofficeui/KoToolBox.h
+++ b/lib/kofficeui/KoToolBox.h
@@ -49,7 +49,7 @@ class KOFFICEUI_EXPORT KoToolBox : public KToolBar {
 
 public:
 
-    KoToolBox( KMainWindow *mainWin, const char* name, KInstance* instance, int numberOfTooltypes);
+    KoToolBox( KMainWindow *mainWin, const char* name, TDEInstance* instance, int numberOfTooltypes);
     virtual ~KoToolBox();
 
     // Called by the toolcontroller for each tool. For every category,
@@ -88,7 +88,7 @@ private:
 
     TQPtrList<ToolList> m_tools;
     TQPtrList<KAction> m_idToActionMap; // Map the buttongroup id's to actions for easy activating.
-    KInstance* m_instance;
+    TDEInstance* m_instance;
 };
 
 
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 10334c32..cc606584 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -646,7 +646,7 @@ void KoColorPopupProxy::slotMoreColors()
 
 
 KoToolButton::KoToolButton( const TQString& icon, int id, TQWidget* parent,
-                            const char* name, const TQString& txt, KInstance* _instance ) :
+                            const char* name, const TQString& txt, TDEInstance* _instance ) :
     KToolBarButton( icon, id, parent, name, txt, _instance ), m_arrowPressed( false )
 {
     init();
diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h
index 78d67cd5..4e1fab71 100644
--- a/lib/kofficeui/KoTooluButton.h
+++ b/lib/kofficeui/KoTooluButton.h
@@ -145,7 +145,7 @@ public:
      */
     KoToolButton( const TQString& icon, int id, TQWidget* parent,
                   const char* name = 0L, const TQString& txt = TQString(),
-                  KInstance* _instance = KGlobal::instance() );
+                  TDEInstance* _instance = KGlobal::instance() );
 
     /**
      * Construct a button with an existing pixmap.  It is not
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index e09ef63d..201afa8e 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -245,7 +245,7 @@ int KSelectColorAction::plug( TQWidget* w, int index )
         if ( hasIcon() )
         {
             /* ###### CHECK: We're not allowed to specify the instance in iconSet()
-            KInstance *instance;
+            TDEInstance *instance;
             if ( parentCollection() )
                 instance = parentCollection()->instance();
             else
@@ -281,7 +281,7 @@ int KSelectColorAction::plug( TQWidget* w, int index )
         KToolBar *bar = static_cast<KToolBar *>( w );
 
         int id_ = getToolButtonID();
-        KInstance *instance;
+        TDEInstance *instance;
         if ( parentCollection() )
             instance = parentCollection()->instance();
         else
diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index 65b4de02..402c8d2c 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -56,7 +56,7 @@ int TKAction::plug(TQWidget* widget, int index)
   if ( widget->inherits("KToolBar") ) {
     KToolBar* bar = static_cast<KToolBar*>(widget);
     int id_ = KAction::getToolButtonID();
-    KInstance *instance;
+    TDEInstance *instance;
 
     if ( parentCollection() )
       instance = parentCollection()->instance();
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index 8a2798e0..c1b2f8cb 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -85,12 +85,12 @@ public:
   TQTimer     *m_delayTimer;
   TQPopupMenu *m_popup;
 
-  KInstance  *m_instance;
+  TDEInstance  *m_instance;
 };
 
 TKToolBarButton::TKToolBarButton( const TQString& icon, const TQString& txt,
                                         TQWidget* parent, const char* name,
-                                        KInstance *instance )
+                                        TDEInstance *instance )
 : TQToolButton(parent,name)
 {
   d = new TKToolBarButtonPrivate;
diff --git a/lib/kofficeui/tktoolbarbutton.h b/lib/kofficeui/tktoolbarbutton.h
index 17fc3758..bfa3a148 100644
--- a/lib/kofficeui/tktoolbarbutton.h
+++ b/lib/kofficeui/tktoolbarbutton.h
@@ -27,7 +27,7 @@
 #include <kglobal.h>
 
 class KToolBar;
-class KInstance;
+class TDEInstance;
 class TQPopupMenu;
 class TQPainter;
 
@@ -37,7 +37,7 @@ class TKToolBarButton : public TQToolButton
 public:
   TKToolBarButton(const TQString& icon, const TQString& txt,
                      TQWidget* parent = 0, const char *name=0L,
-                     KInstance *_instance = KGlobal::instance());
+                     TDEInstance *_instance = KGlobal::instance());
 
   TKToolBarButton(const TQPixmap&, const TQString&, TQWidget* parent=0, const char* name=0);
   ~TKToolBarButton();
diff --git a/lib/koproperty/test/main.cpp b/lib/koproperty/test/main.cpp
index 2ac77391..818d6637 100644
--- a/lib/koproperty/test/main.cpp
+++ b/lib/koproperty/test/main.cpp
@@ -36,8 +36,8 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    KAboutData about("proptest", "KoProperty Test", version, description,
-                     KAboutData::License_GPL, "(C) 2005 Cedric Pasteur", 0, 0, "[email protected]");
+    TDEAboutData about("proptest", "KoProperty Test", version, description,
+                     TDEAboutData::License_GPL, "(C) 2005 Cedric Pasteur", 0, 0, "[email protected]");
     about.addAuthor( "Cedric Pasteur", 0, "[email protected]" );
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index cb8116c9..47d7004b 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -1087,7 +1087,7 @@ KoLinkVariable * KoTextView::linkVariable()
     return dynamic_cast<KoLinkVariable *>(variable());
 }
 
-TQPtrList<KAction> KoTextView::dataToolActionList(KInstance * instance, const TQString& word, bool & _singleWord )
+TQPtrList<KAction> KoTextView::dataToolActionList(TDEInstance * instance, const TQString& word, bool & _singleWord )
 {
     m_singleWord = false;
     m_wordUnderCursor = TQString();
diff --git a/lib/kotext/KoTextView.h b/lib/kotext/KoTextView.h
index d1e9ee44..0954192b 100644
--- a/lib/kotext/KoTextView.h
+++ b/lib/kotext/KoTextView.h
@@ -36,7 +36,7 @@ class KoParagCounter;
 class KCommand;
 class TQTimer;
 class KAction;
-class KInstance;
+class TDEInstance;
 class KDataToolInfo;
 class KoLinkVariable;
 class KoVariable;
@@ -134,7 +134,7 @@ public:
     TQString wordUnderCursor( const KoTextCursor& cursor );
 
     /** Return the list of actions from data-tools. Used to populate a RMB popupmenu usually. */
-    TQPtrList<KAction> dataToolActionList( KInstance * instance, const TQString& word, bool & _singleWord );
+    TQPtrList<KAction> dataToolActionList( TDEInstance * instance, const TQString& word, bool & _singleWord );
 
     void insertSoftHyphen();
     void insertLineBreak();
diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp
index 74c84cf3..e554fc23 100644
--- a/lib/kross/runner/main.cpp
+++ b/lib/kross/runner/main.cpp
@@ -98,11 +98,11 @@ int main(int argc, char **argv)
 {
     int result = ERROR_OK;
 
-    KAboutData about("krossrunner",
+    TDEAboutData about("krossrunner",
                      "krossrunner",
                      "0.1",
                      "KDE application to run Kross scripts.",
-                     KAboutData::License_LGPL,
+                     TDEAboutData::License_LGPL,
                      "(C) 2006 Sebastian Sauer",
                      "Run Kross scripts.",
                      "http://www.dipe.org/kross",
diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp
index a42f9f46..275a9e93 100644
--- a/lib/kross/test/main.cpp
+++ b/lib/kross/test/main.cpp
@@ -144,11 +144,11 @@ int main(int argc, char **argv)
 {
     int result = 0;
 
-    KAboutData about("krosstest",
+    TDEAboutData about("krosstest",
                      "KrossTest",
                      "0.1",
                      "KDE application to test the Kross framework.",
-                     KAboutData::License_LGPL,
+                     TDEAboutData::License_LGPL,
                      "(C) 2005 Sebastian Sauer",
                      "Test the Kross framework!",
                      "http://www.dipe.org/kross",
diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index d40d9545..fdef847f 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -72,9 +72,9 @@ void ProgressObject::slotProgress(int /* progress */ )
 
 int main( int argc, char **argv )
 {
-    KAboutData aboutData( "koconverter", I18N_NOOP("KOConverter"), "1.4",
+    TDEAboutData aboutData( "koconverter", I18N_NOOP("KOConverter"), "1.4",
                           I18N_NOOP("KOffice Document Converter"),
-                          KAboutData::License_GPL,
+                          TDEAboutData::License_GPL,
                           I18N_NOOP("(c) 2001-2004 KOffice developers") );
     aboutData.addAuthor("David Faure",0, "[email protected]");
     aboutData.addAuthor("Nicolas Goutte",0, "[email protected]");
diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc
index 5786227d..d7d33479 100644
--- a/tools/kthesaurus/main.cc
+++ b/tools/kthesaurus/main.cc
@@ -35,8 +35,8 @@ static KCmdLineOptions options[] =
 extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv)
 {
 
-	KAboutData aboutData("kthesaurus", I18N_NOOP("KThesaurus"), "1.0",
-		I18N_NOOP( "KThesaurus - List synonyms" ), KAboutData::License_GPL,
+	TDEAboutData aboutData("kthesaurus", I18N_NOOP("KThesaurus"), "1.0",
+		I18N_NOOP( "KThesaurus - List synonyms" ), TDEAboutData::License_GPL,
 		I18N_NOOP( "(c) 2001 Daniel Naber" ) );
 
 	TDECmdLineArgs::init(argc, argv, &aboutData);