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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kontact/interfaces/plugin.cpp')

diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index 14248250..bedd52c3 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 ) {
-- 
cgit v1.2.3