Rename KInstance and KAboutData to avoid conflicts with KDE4

4 files changed, 20 insertions, 20 deletions

diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index 68d1c425..08619841 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -364,12 +364,12 @@ KGVPart::~KGVPart()
     writeSettings();
 }
 
-KAboutData* KGVPart::createAboutData()
+TDEAboutData* KGVPart::createAboutData()
 {
-    KAboutData* about = new KAboutData( "kghostview", I18N_NOOP( "KGhostView"),
+    TDEAboutData* about = new TDEAboutData( "kghostview", I18N_NOOP( "KGhostView"),
             KGHOSTVIEW_VERSION,
             I18N_NOOP( "Viewer for PostScript (.ps, .eps) and Portable Document Format (.pdf) files"),
-            KAboutData::License_GPL,
+            TDEAboutData::License_GPL,
             "(C) 1998 Mark Donohoe, (C) 1999-2000 David Sweet, "
             "(C) 2000-2003 Wilco Greven",
             I18N_NOOP( "KGhostView displays, prints, and saves "
diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h
index 61c9d77c..d758ce5c 100644
--- a/kghostview/kgv_view.h
+++ b/kghostview/kgv_view.h
@@ -31,11 +31,11 @@
 class TQFrame;
 class TQWidget;
 
-class KAboutData;
+class TDEAboutData;
 class KAction;
 class KActionCollection;
 class KDirWatch;
-class KInstance;
+class TDEInstance;
 class KPopupMenu;
 class KSelectAction;
 class KToggleAction;
@@ -77,7 +77,7 @@ public:
      */
     virtual bool closeURL();
 
-    KDE_EXPORT static KAboutData* createAboutData();
+    KDE_EXPORT static TDEAboutData* createAboutData();
 
 public slots:
     /**
diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp
index c7024c59..dfeea82a 100644
--- a/kghostview/kgvfactory.cpp
+++ b/kghostview/kgvfactory.cpp
@@ -42,15 +42,15 @@ KGVFactory::~KGVFactory()
     s_self = 0;
 }
 
-KInstance *KGVFactory::createInstance()
+TDEInstance *KGVFactory::createInstance()
 {
-    KInstance* res = new KInstance( aboutData() );
+    TDEInstance* res = new TDEInstance( aboutData() );
     return res;
 }
 
 KGVFactory *KGVFactory::s_self;
-KInstance *KGVFactory::s_instance;
-KAboutData *KGVFactory::s_aboutData;
+TDEInstance *KGVFactory::s_instance;
+TDEAboutData *KGVFactory::s_aboutData;
 
 KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
         TQObject *parent, const char *name,
@@ -84,19 +84,19 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *
     return part;
 }
 
-KInstance *KGVFactory::instance()
+TDEInstance *KGVFactory::instance()
 {
     if ( !s_instance )
     {
         if ( s_self )
             s_instance = s_self->createInstance();
         else
-            s_instance = new KInstance( aboutData() );
+            s_instance = new TDEInstance( aboutData() );
     }
     return s_instance;
 }
 
-KAboutData *KGVFactory::aboutData()
+TDEAboutData *KGVFactory::aboutData()
 {
     if ( !s_aboutData )
         s_aboutData = KGVPart::createAboutData();
diff --git a/kghostview/kgvfactory.h b/kghostview/kgvfactory.h
index 1c49926f..1b2e0801 100644
--- a/kghostview/kgvfactory.h
+++ b/kghostview/kgvfactory.h
@@ -22,16 +22,16 @@
 #include <kparts/factory.h>
 #include <kparts/part.h>
 
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
 
 class KDE_EXPORT KGVFactory : public KParts::Factory
 {
     public:
         KGVFactory();
         virtual ~KGVFactory();
-        static KInstance *instance();
-        static KAboutData *aboutData();
+        static TDEInstance *instance();
+        static TDEAboutData *aboutData();
 
         virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
                 TQObject *parent, const char *name,
@@ -39,11 +39,11 @@ class KDE_EXPORT KGVFactory : public KParts::Factory
                 const TQStringList &args );
 
     protected:
-        virtual KInstance *createInstance();
+        virtual TDEInstance *createInstance();
     private:
         static KGVFactory*s_self;
-        static KInstance *s_instance;
-        static KAboutData *s_aboutData;
+        static TDEInstance *s_instance;
+        static TDEAboutData *s_aboutData;
 };
 
 #endif