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: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kcm_gtk/kcmgtk.h      | 4 ++--
 src/qt_qt_wrapper.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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;
diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp
index 4ef9672..8448087 100644
--- a/src/qt_qt_wrapper.cpp
+++ b/src/qt_qt_wrapper.cpp
@@ -171,8 +171,8 @@ void createTQApp()
 	argv[0] = (char*) malloc(sizeof(char) * 19);
 	strncpy(argv[0], "gtk-qt-application", 19);
 
-	KAboutData aboutData("gtk-qt-engine", I18N_NOOP("gtk-qt-engine"), "v0.1",
-		"GTK Qt theme engine", KAboutData::License_GPL,
+	TDEAboutData aboutData("gtk-qt-engine", I18N_NOOP("gtk-qt-engine"), "v0.1",
+		"GTK Qt theme engine", TDEAboutData::License_GPL,
 		"(c) 2011, Timothy Pearson",
 		"message goes here", 0 /* TODO: Website */, "kb9vqf@pearsoncomputing.net");
 	TDECmdLineArgs::init(argc, argv, &aboutData);