7 files changed, 25 insertions, 25 deletions
diff --git a/kspread/kspread_aboutdata.h b/kspread/kspread_aboutdata.h
index 0b0ce85a7..f51a6e4ce 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, "weis@kde.org");
diff --git a/kspread/kspread_factory.cc b/kspread/kspread_factory.cc
index 8d37c7998..1258b9a49 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 e1897856e..a2f467e0f 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 2f1a0b89e..48afebd7d 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 968057a70..f44a1a01d 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 c0d5c1ca9..9ad856f9b 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 510524820..b8f681837 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: