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

---
 languages/cpp/app_templates/dcopservice/main.cpp | 4 ++--
 languages/cpp/app_templates/kapp/main.cpp        | 6 +++---
 languages/cpp/app_templates/kconfig35/main.cpp   | 6 +++---
 languages/cpp/app_templates/kde4app/main.cpp     | 6 +++---
 languages/cpp/app_templates/kdedcop/main.cpp     | 6 +++---
 languages/cpp/app_templates/khello/main.cpp      | 6 +++---
 languages/cpp/app_templates/khello2/main.cpp     | 6 +++---
 languages/cpp/app_templates/kmake/app.cpp        | 6 +++---
 languages/cpp/app_templates/kofficepart/main.cpp | 4 ++--
 languages/cpp/app_templates/kpartapp/main.cpp    | 6 +++---
 languages/cpp/app_templates/kscons_kmdi/main.cpp | 6 +++---
 languages/cpp/app_templates/kscons_kxt/main.cpp  | 6 +++---
 languages/cpp/app_templates/kxt/main.cpp         | 6 +++---
 13 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'languages/cpp/app_templates')

diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp
index ad5e1b2a..43f72701 100644
--- a/languages/cpp/app_templates/dcopservice/main.cpp
+++ b/languages/cpp/app_templates/dcopservice/main.cpp
@@ -26,8 +26,8 @@ int main (int argc, char *argv[])
 				KAboutData::License_GPL, "(C) %{YEAR}, %{AUTHOR}");
 	aboutdata.addAuthor("%{AUTHOR}",I18N_NOOP("Developer"),"%{EMAIL}");
 
-	KCmdLineArgs::init( argc, argv, &aboutdata );
-	KCmdLineArgs::addCmdLineOptions( options );
+	TDECmdLineArgs::init( argc, argv, &aboutdata );
+	TDECmdLineArgs::addCmdLineOptions( options );
 	KUniqueApplication::addCmdLineOptions();
 
 	if (!KUniqueApplication::start())
diff --git a/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp
index 06f98e8e..cfc877b4 100644
--- a/languages/cpp/app_templates/kapp/main.cpp
+++ b/languages/cpp/app_templates/kapp/main.cpp
@@ -23,8 +23,8 @@ int main(int argc, char **argv)
     KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
                      KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KApplication app;
 
     // register ourselves as a dcop client
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         if (args->count() == 0)
         {
             %{APPNAME} *widget = new %{APPNAME};
diff --git a/languages/cpp/app_templates/kconfig35/main.cpp b/languages/cpp/app_templates/kconfig35/main.cpp
index 64ef71e3..ac88952e 100644
--- a/languages/cpp/app_templates/kconfig35/main.cpp
+++ b/languages/cpp/app_templates/kconfig35/main.cpp
@@ -22,8 +22,8 @@ int main(int argc, char **argv)
     KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
                      KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KApplication app;
 
     // see if we are starting with session management
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         if (args->count() == 0)
         {
             %{APPNAMELC} *widget = new %{APPNAMELC};
diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp
index 2bb5b6bf..e164ac59 100644
--- a/languages/cpp/app_templates/kde4app/main.cpp
+++ b/languages/cpp/app_templates/kde4app/main.cpp
@@ -16,11 +16,11 @@ int main(int argc, char **argv)
     KAboutData about("%{APPNAMELC}", 0, ki18n("%{APPNAME}"), version, ki18n(description),
                      KAboutData::License_%{LICENSE}, ki18n("(C) %{YEAR} %{AUTHOR}"), KLocalizedString(), 0, "%{EMAIL}");
     about.addAuthor( ki18n("%{AUTHOR}"), KLocalizedString(), "%{EMAIL}" );
-    KCmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::init(argc, argv, &about);
 
     KCmdLineOptions options;
     options.add("+[URL]", ki18n( "Document to open" ));
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KApplication app;
 
     %{APPNAME} *widget = new %{APPNAME};
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         if (args->count() == 0)
         {
             //%{APPNAMELC} *widget = new %{APPNAMELC};
diff --git a/languages/cpp/app_templates/kdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp
index 2ef65dc0..e643ed21 100644
--- a/languages/cpp/app_templates/kdedcop/main.cpp
+++ b/languages/cpp/app_templates/kdedcop/main.cpp
@@ -22,8 +22,8 @@ int main(int argc, char **argv)
     KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
                      KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
     %{APPNAME} *mainWin = 0;
 
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
         /// @todo do something with the command line args here
 
diff --git a/languages/cpp/app_templates/khello/main.cpp b/languages/cpp/app_templates/khello/main.cpp
index ee7ae8fc..fb84ad48 100644
--- a/languages/cpp/app_templates/khello/main.cpp
+++ b/languages/cpp/app_templates/khello/main.cpp
@@ -22,8 +22,8 @@ int main(int argc, char **argv)
     KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
 		     KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
     %{APPNAME} *mainWin = 0;
 
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
         /// @todo do something with the command line args here
 
diff --git a/languages/cpp/app_templates/khello2/main.cpp b/languages/cpp/app_templates/khello2/main.cpp
index f74c4a5b..b50fb446 100644
--- a/languages/cpp/app_templates/khello2/main.cpp
+++ b/languages/cpp/app_templates/khello2/main.cpp
@@ -22,8 +22,8 @@ int main(int argc, char **argv)
     KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
                      KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
     %{APPNAME} *mainWin = 0;
 
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
         /// @todo do something with the command line args here
 
diff --git a/languages/cpp/app_templates/kmake/app.cpp b/languages/cpp/app_templates/kmake/app.cpp
index ffcbb4b0..d0352538 100644
--- a/languages/cpp/app_templates/kmake/app.cpp
+++ b/languages/cpp/app_templates/kmake/app.cpp
@@ -21,9 +21,9 @@ int main(int argc, char **argv)
 	KAboutData about("%{APPNAME}", I18N_NOOP("%{APPNAME}"), version, description,
 	                 KAboutData::License_%{LICENSE}, "(C) 2004 %{AUTHOR}", 0, 0, "%{EMAIL}");
 	about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(options);
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+	TDECmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 	KApplication app;
 	MainViewImp *widget = new MainViewImp;
 	app.setMainWidget(widget);
diff --git a/languages/cpp/app_templates/kofficepart/main.cpp b/languages/cpp/app_templates/kofficepart/main.cpp
index 1561922a..01fa0c3d 100644
--- a/languages/cpp/app_templates/kofficepart/main.cpp
+++ b/languages/cpp/app_templates/kofficepart/main.cpp
@@ -20,8 +20,8 @@ static const KCmdLineOptions options[]=
 
 int main( int argc, char **argv )
 {
-    KCmdLineArgs::init( argc, argv, new%{APPNAME}AboutData() );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init( argc, argv, new%{APPNAME}AboutData() );
+    TDECmdLineArgs::addCmdLineOptions( options );
     KoApplication app;
 
     app.dcopClient()->attach();
diff --git a/languages/cpp/app_templates/kpartapp/main.cpp b/languages/cpp/app_templates/kpartapp/main.cpp
index c6749a8b..ea94c304 100644
--- a/languages/cpp/app_templates/kpartapp/main.cpp
+++ b/languages/cpp/app_templates/kpartapp/main.cpp
@@ -21,8 +21,8 @@ int main(int argc, char **argv)
     KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
                      KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app;
 
     // see if we are starting with session management
@@ -33,7 +33,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
         if ( args->count() == 0 )
         {
diff --git a/languages/cpp/app_templates/kscons_kmdi/main.cpp b/languages/cpp/app_templates/kscons_kmdi/main.cpp
index 7e43b0e7..ac324166 100644
--- a/languages/cpp/app_templates/kscons_kmdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/main.cpp
@@ -28,8 +28,8 @@ int main(int argc, char **argv)
 	// warning, utf-8 char
 	//about.addCredit( "bksys authors", "Thomas Nagy, Julien Antille" );
 
-	KCmdLineArgs::init(argc, argv, &about);
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::init(argc, argv, &about);
+	TDECmdLineArgs::addCmdLineOptions(options);
 
 	KApplication app;
 
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	  } else */
 	{
 		// no session.. just start up normally
-		KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
 		%{APPNAMELC}kmdi *widget = new %{APPNAMELC}kmdi( KMdi::IDEAlMode );
 
diff --git a/languages/cpp/app_templates/kscons_kxt/main.cpp b/languages/cpp/app_templates/kscons_kxt/main.cpp
index 36607ded..2fd5430b 100644
--- a/languages/cpp/app_templates/kscons_kxt/main.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/main.cpp
@@ -22,8 +22,8 @@ int main(int argc, char **argv)
     KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
                      KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KApplication app;
 
     // see if we are starting with session management
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         if (args->count() == 0)
         {
             %{APPNAME} *widget = new %{APPNAME};
diff --git a/languages/cpp/app_templates/kxt/main.cpp b/languages/cpp/app_templates/kxt/main.cpp
index 64ef71e3..ac88952e 100644
--- a/languages/cpp/app_templates/kxt/main.cpp
+++ b/languages/cpp/app_templates/kxt/main.cpp
@@ -22,8 +22,8 @@ int main(int argc, char **argv)
     KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
                      KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
     about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
-    KCmdLineArgs::init(argc, argv, &about);
-    KCmdLineArgs::addCmdLineOptions(options);
+    TDECmdLineArgs::init(argc, argv, &about);
+    TDECmdLineArgs::addCmdLineOptions(options);
     KApplication app;
 
     // see if we are starting with session management
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
     else
     {
         // no session.. just start up normally
-        KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         if (args->count() == 0)
         {
             %{APPNAMELC} *widget = new %{APPNAMELC};
-- 
cgit v1.2.1