From 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 19 Jan 2013 18:46:45 -0600
Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

---
 kded/kbuildsycoca.cpp |  6 +++---
 kded/kde-menu.cpp     | 10 +++++-----
 kded/kded.cpp         |  6 +++---
 kded/khostname.cpp    |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kded')

diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index f111b3762..ec5139d86 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -724,9 +724,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    d.addAuthor("David Faure", I18N_NOOP("Author"), "faure@kde.org");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &d);
-   KCmdLineArgs::addCmdLineOptions(options);
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs::init(argc, argv, &d);
+   TDECmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    bGlobalDatabase = args->isSet("global");
    bMenuTest = args->isSet("menutest");
 
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp
index 0362e10e9..81887a695 100644
--- a/kded/kde-menu.cpp
+++ b/kded/kde-menu.cpp
@@ -118,8 +118,8 @@ int main(int argc, char **argv)
                 KAboutData::License_GPL, "(c) 2003 Waldo Bastian");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &d);
-   KCmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs::init(argc, argv, &d);
+   TDECmdLineArgs::addCmdLineOptions(options);
 
 //   KApplication k(false, false);
    KApplication k(false);
@@ -128,9 +128,9 @@ int main(int argc, char **argv)
    // this program is in tdelibs so it uses tdelibs as catalog
    KLocale::setMainCatalogue("tdelibs");
 
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    if (args->count() != 1)
-      KCmdLineArgs::usage(i18n("You must specify an application-id such as 'tde-konsole.desktop'"));
+      TDECmdLineArgs::usage(i18n("You must specify an application-id such as 'tde-konsole.desktop'"));
 
    utf8 = args->isSet("utf8");
 
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
    bHighlight = args->isSet("highlight");
 
    if (!bPrintMenuId && !bPrintMenuName && !bHighlight)
-      KCmdLineArgs::usage(i18n("You must specify at least one of --print-menu-id, --print-menu-name or --highlight"));
+      TDECmdLineArgs::usage(i18n("You must specify at least one of --print-menu-id, --print-menu-name or --highlight"));
 
    if (args->isSet("cache-update"))
    {
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 4b891d48a..40e1983f7 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -878,11 +878,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
 
      KApplication::installSigpipeHandler();
 
-     KCmdLineArgs::init(argc, argv, &aboutData);
+     TDECmdLineArgs::init(argc, argv, &aboutData);
 
      KUniqueApplication::addCmdLineOptions();
 
-     KCmdLineArgs::addCmdLineOptions( options );
+     TDECmdLineArgs::addCmdLineOptions( options );
 
      // this program is in tdelibs so it uses tdelibs as catalog
      KLocale::setMainCatalogue("tdelibs");
@@ -891,7 +891,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
      putenv(strdup("SESSION_MANAGER="));
 
      // Parse command line before checking DCOP
-     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+     TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
      // Check DCOP communication.
      {
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index d8c568869..60c7ba8f5 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -65,7 +65,7 @@ protected:
 
 KHostName::KHostName()
 {
-   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    if (args->count() != 2)
       args->usage();
    oldName = args->arg(0);
@@ -371,8 +371,8 @@ int main(int argc, char **argv)
                 KAboutData::License_GPL, "(c) 2001 Waldo Bastian");
    d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org");
 
-   KCmdLineArgs::init(argc, argv, &d);
-   KCmdLineArgs::addCmdLineOptions(options);
+   TDECmdLineArgs::init(argc, argv, &d);
+   TDECmdLineArgs::addCmdLineOptions(options);
 
    KInstance k(&d);
 
-- 
cgit v1.2.1