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

---
 kerry/src/kerryapp.cpp | 2 +-
 kerry/src/kerryapp.h   | 4 ++--
 kerry/src/main.cpp     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kerry/src/kerryapp.cpp b/kerry/src/kerryapp.cpp
index 8aecc9d..cf094ad 100644
--- a/kerry/src/kerryapp.cpp
+++ b/kerry/src/kerryapp.cpp
@@ -83,7 +83,7 @@ int KerryApplication::newInstance()
     return KUniqueApplication::newInstance();
 }
 
-void KerryApplication::init(const KAboutData* /*about*/)
+void KerryApplication::init(const TDEAboutData* /*about*/)
 {
   if (hitListWindow)
       return;
diff --git a/kerry/src/kerryapp.h b/kerry/src/kerryapp.h
index 2684ef5..987d7a3 100644
--- a/kerry/src/kerryapp.h
+++ b/kerry/src/kerryapp.h
@@ -31,7 +31,7 @@ class kerry;
 class TDECmdLineArgs;
 class SearchDlg;
 class KHelpMenu;
-class KAboutData;
+class TDEAboutData;
 class KProcess;
 
 class KerryApplication : public KUniqueApplication
@@ -42,7 +42,7 @@ class KerryApplication : public KUniqueApplication
   public:
     KerryApplication();
     ~KerryApplication();
-    void init(const KAboutData* about);
+    void init(const TDEAboutData* about);
     int newInstance();
     void search(const TQString&);
 
diff --git a/kerry/src/main.cpp b/kerry/src/main.cpp
index 99b831c..8c5eff0 100644
--- a/kerry/src/main.cpp
+++ b/kerry/src/main.cpp
@@ -85,9 +85,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
       }
     }
 
-    KAboutData about("kerry", I18N_NOOP("Kerry Beagle Search"),
+    TDEAboutData about("kerry", I18N_NOOP("Kerry Beagle Search"),
                      version, description,
-                     KAboutData::License_GPL,
+                     TDEAboutData::License_GPL,
                      "(c) 2005,2006 Novell, Inc.",
                      0, "http://opensuse.org/kerry");
     about.addAuthor("Stephan Binner", 0, "binner@kde.org");