Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 5 insertions, 5 deletions

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/");