Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 5 insertions, 5 deletions

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