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

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

(limited to 'kcm_gtk')

diff --git a/kcm_gtk/kcmgtk.h b/kcm_gtk/kcmgtk.h
index dee376b..7199d96 100644
--- a/kcm_gtk/kcmgtk.h
+++ b/kcm_gtk/kcmgtk.h
@@ -67,7 +67,7 @@ public:
 	virtual void save();
 	virtual int buttons();
 	virtual TQString quickHelp() const;
-	virtual const KAboutData *aboutData()const
+	virtual const TDEAboutData *aboutData()const
 	{ return myAboutData; };
 
 public slots:
@@ -97,7 +97,7 @@ private:
 	TQMap<TQString,TQString> themes;
 	TQMap<TQString,TQString> gtk3Themes;
 	GtkRcParser parser;
-	KAboutData *myAboutData;
+	TDEAboutData *myAboutData;
 	TQFont font;
 	TQMap<TQString,TQString> profiles;
 	EmacsDetails* emacsDetailsDialog;
-- 
cgit v1.2.1