From 86586707fb22dcb88fa8fcff79fb83b303ca75a5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 19:57:28 -0600
Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 ksquirrel/ksquirrel-libs-configurator/main.cpp | 4 ++--
 ksquirrel/ksquirrelpart/ksquirrelpart.cpp      | 6 +++---
 ksquirrel/ksquirrelpart/ksquirrelpart.h        | 4 ++--
 ksquirrel/main.cpp                             | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ksquirrel/ksquirrel-libs-configurator/main.cpp b/ksquirrel/ksquirrel-libs-configurator/main.cpp
index 30d4df3..38f2da3 100644
--- a/ksquirrel/ksquirrel-libs-configurator/main.cpp
+++ b/ksquirrel/ksquirrel-libs-configurator/main.cpp
@@ -32,12 +32,12 @@ int main(int argc, char *argv[])
 {
     const TQCString App = "ksquirrel-libs-configurator";
 
-    KAboutData aboutData(
+    TDEAboutData aboutData(
             "ksquirrel-libs-configurator",
             "ksquirrel-libs-configurator",
             "0.1",
             I18N_NOOP("ksquirrel-libs-configurator"),
-            KAboutData::License_GPL,
+            TDEAboutData::License_GPL,
             "(c) 2007 Baryshev Dmitry",
             TQString(),
             "http://ksquirrel.sourceforge.net",
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
index b4cad73..b25c9f1 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@@ -199,14 +199,14 @@ void KSquirrelPart::print()
     gl->slotPrint();
 }
 
-KAboutData* KSquirrelPart::createAboutData()
+TDEAboutData* KSquirrelPart::createAboutData()
 {
-    KAboutData *kAboutData = new KAboutData(
+    TDEAboutData *kAboutData = new TDEAboutData(
         "ksquirrel",
         I18N_NOOP("KSquirrelPart"),
 	"0.1.2",
         I18N_NOOP("Image Viewer"),
-	KAboutData::License_GPL,
+	TDEAboutData::License_GPL,
 	"(c) 2007, Dmitry Baryshev <ksquirrel.iv@gmail.com>");
 
     return kAboutData;
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.h b/ksquirrel/ksquirrelpart/ksquirrelpart.h
index 9bb3f9c..408955d 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.h
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.h
@@ -20,7 +20,7 @@
 
 #include <kparts/part.h>
 
-class KAboutData;
+class TDEAboutData;
 class KToggleAction;
 class KSelectAction;
 
@@ -55,7 +55,7 @@ class KSquirrelPart : public KParts::ReadOnlyPart
 	KSquirrelPart(TQWidget*, const char*, TQObject*, const char*, const TQStringList &);
 	virtual ~KSquirrelPart();
 
-	static KAboutData* createAboutData();
+	static TDEAboutData* createAboutData();
 
 	TQString filePath();
 
diff --git a/ksquirrel/main.cpp b/ksquirrel/main.cpp
index 319cc36..4b2673e 100644
--- a/ksquirrel/main.cpp
+++ b/ksquirrel/main.cpp
@@ -61,12 +61,12 @@ int main(int argc, char *argv[])
     SQ_HLOptions         *high;
     const TQCString App = "ksquirrel";
 
-    KAboutData aboutData(
+    TDEAboutData aboutData(
             "ksquirrel",
             "KSquirrel",
             VERSION,
             I18N_NOOP("KSquirrel - image viewer for TDE"),
-            KAboutData::License_GPL,
+            TDEAboutData::License_GPL,
             "(c) 2003-2007 Baryshev Dmitry",
             TQString(),
             "http://ksquirrel.sourceforge.net",