From 135b621d92a61ad9c740e7c4d8f7257b3dac9ac1 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 19 Jan 2013 18:46:26 -0600
Subject: [PATCH] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with
 KDE4

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

diff --git a/kerry/src/kerryapp.cpp b/kerry/src/kerryapp.cpp
index 5e7999a..8aecc9d 100644
--- a/kerry/src/kerryapp.cpp
+++ b/kerry/src/kerryapp.cpp
@@ -70,7 +70,7 @@ int KerryApplication::newInstance()
     if (!hitListWindow)
         init(KGlobal::instance()->aboutData());
 
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         if (args->isSet("show-searchdialog")) {
             hitListWindow->showSearchDialog();
         }
diff --git a/kerry/src/kerryapp.h b/kerry/src/kerryapp.h
index 3692a4e..2684ef5 100644
--- a/kerry/src/kerryapp.h
+++ b/kerry/src/kerryapp.h
@@ -28,7 +28,7 @@
 #define MAX_HISTORY_ITEMS 10
 
 class kerry;
-class KCmdLineArgs;
+class TDECmdLineArgs;
 class SearchDlg;
 class KHelpMenu;
 class KAboutData;
diff --git a/kerry/src/main.cpp b/kerry/src/main.cpp
index 949b3fd..99b831c 100644
--- a/kerry/src/main.cpp
+++ b/kerry/src/main.cpp
@@ -91,8 +91,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
                      "(c) 2005,2006 Novell, Inc.",
                      0, "http://opensuse.org/kerry");
     about.addAuthor("Stephan Binner", 0, "binner@kde.org");
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KUniqueApplication::addCmdLineOptions();
 
     KSessionManaged ksm;