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

---
 kcontrol/kcontrol/modules.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kcontrol/kcontrol/modules.h')

diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h
index bcdc7d7e4..fc5406fa6 100644
--- a/kcontrol/kcontrol/modules.h
+++ b/kcontrol/kcontrol/modules.h
@@ -27,7 +27,7 @@
 
 template<class ConfigModule> class TQPtrList;
 class TQStringList;
-class KAboutData;
+class TDEAboutData;
 class KCModule;
 class ProxyWidget;
 class KProcess;
@@ -50,7 +50,7 @@ public:
 
   bool isActive() { return _module != 0; };
   ProxyWidget *module();
-  const KAboutData *aboutData() const;
+  const TDEAboutData *aboutData() const;
 
 
 public slots:
-- 
cgit v1.2.3