From a81a3f2a9c7ed08b8697aee2b5ebceade19c97d3 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:03:13 -0600
Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 ChangeLog                       | 2 +-
 libkipi/libkipi/imagedialog.cpp | 4 ++--
 libkipi/libkipi/plugin.cpp      | 4 ++--
 libkipi/libkipi/plugin.h        | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a6f930..02dba97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1099,7 +1099,7 @@ v0.1.0                                                            2004-09-06
 
 	  The basic point of all this was that the
 	  KIPI::Plugin::actionCollection() needed to know about the plugins
-	  KInstance - as it was till this change, it got the KInstance for
+	  TDEInstance - as it was till this change, it got the TDEInstance for
 	  the host application, and would thus look for icons in the host
 	  applications directory.
 
diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp
index 05ea6ca..606648a 100644
--- a/libkipi/libkipi/imagedialog.cpp
+++ b/libkipi/libkipi/imagedialog.cpp
@@ -124,11 +124,11 @@ ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface,
     
     // About data and help button.
     
-    KAboutData* about = new KAboutData("kipiplugins",
+    TDEAboutData* about = new TDEAboutData("kipiplugins",
                                        I18N_NOOP("Image selector dialog"), 
                                        kipi_version,
                                        I18N_NOOP("A Kipi dialog for image selection"),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004,2005, Kipi development team", 
                                        0,
                                        "http://extragear.kde.org/apps/kipi");
diff --git a/libkipi/libkipi/plugin.cpp b/libkipi/libkipi/plugin.cpp
index 65a04fe..66acf1c 100644
--- a/libkipi/libkipi/plugin.cpp
+++ b/libkipi/libkipi/plugin.cpp
@@ -37,13 +37,13 @@
 
 struct KIPI::Plugin::Private {
     TQMap<TQWidget*, KActionCollection*> m_actionCollection;
-    KInstance* m_instance;
+    TDEInstance* m_instance;
     TQMap<TQWidget*, KActionPtrList> m_actions;
     TQWidget* m_defaultWidget;
 };
 
 
-KIPI::Plugin::Plugin( KInstance* instance, TQObject *parent, const char* name)
+KIPI::Plugin::Plugin( TDEInstance* instance, TQObject *parent, const char* name)
             : TQObject( parent, name)
 {
     d=new Private;
diff --git a/libkipi/libkipi/plugin.h b/libkipi/libkipi/plugin.h
index 272ad4c..0ffa25b 100644
--- a/libkipi/libkipi/plugin.h
+++ b/libkipi/libkipi/plugin.h
@@ -37,7 +37,7 @@
 
 #include "libkipi/libkipi_export.h"
 
-class KInstance;
+class TDEInstance;
 
 /** @namespace KIPI */
 namespace KIPI
@@ -56,7 +56,7 @@ namespace KIPI
     class LIBKIPI_EXPORT Plugin : public TQObject
     {
     public:
-        Plugin( KInstance* instance, TQObject *parent, const char* name);
+        Plugin( TDEInstance* instance, TQObject *parent, const char* name);
         virtual ~Plugin();
 
         virtual void setup( TQWidget* widget ) = 0;