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

---
 kutils/kcmoduleproxy.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kutils/kcmoduleproxy.cpp')

diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index 2323cd262..3528ae738 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -586,12 +586,12 @@ TQString KCModuleProxy::quickHelp() const
 	}
 }
 
-const KAboutData * KCModuleProxy::aboutData() const
+const TDEAboutData * KCModuleProxy::aboutData() const
 {
 	if( !d->rootMode )
 		return realModule() ? realModule()->aboutData() : 0;
 	else
-	/* This needs fixing, perhaps cache a KAboutData copy 
+	/* This needs fixing, perhaps cache a TDEAboutData copy 
 	 * while in root mode? */
 		return 0;
 		
@@ -614,7 +614,7 @@ bool KCModuleProxy::useRootOnlyMsg() const
 	return realModule() ? realModule()->useRootOnlyMsg() : true;
 }
 
-KInstance * KCModuleProxy::instance() const
+TDEInstance * KCModuleProxy::instance() const
 {
 	return realModule() ? realModule()->instance() : 0;
 }
-- 
cgit v1.2.3