From 5fc6f26e12b596addd235f87320c31761bd5a84d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:22:15 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kontact/interfaces/plugin.cpp | 4 ++--
 kontact/interfaces/plugin.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kontact/interfaces')

diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index 14248250e..bedd52c3a 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -126,11 +126,11 @@ KParts::ReadOnlyPart *Plugin::loadPart()
   return core()->createPart( d->partLibraryName );
 }
 
-const KAboutData *Plugin::aboutData()
+const TDEAboutData *Plugin::aboutData()
 {
   kdDebug(5601) << "Plugin::aboutData(): libname: " << d->partLibraryName << endl;
 
-  const KInstance *instance =
+  const TDEInstance *instance =
     KParts::Factory::partInstanceFromLibrary( d->partLibraryName );
 
   if ( instance ) {
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 09bc25c7f..6e0abdfb8 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -32,7 +32,7 @@
 class TQStringList;
 class DCOPClient;
 class DCOPObject;
-class KAboutData;
+class TDEAboutData;
 class KAction;
 class KConfig;
 class TQWidget;
@@ -142,7 +142,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
       Reimplement this method if you want to add your credits to the Kontact
       about dialog.
     */
-    virtual const KAboutData *aboutData();
+    virtual const TDEAboutData *aboutData();
 
     /**
       You can use this method if you need to access the current part. You can be
-- 
cgit v1.2.1