Rename KInstance and KAboutData to avoid conflicts with KDE4

7 files changed, 31 insertions, 31 deletions

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