Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 5 insertions, 5 deletions

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