From 5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 21 Jan 2013 18:57:01 -0600 Subject: [PATCH] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- doc/kde_app_devel/index.docbook | 6 +++--- doc/kdearch/index.docbook | 2 +- languages/java/app_templates/kappjava/app.java | 6 +++--- src/Mainpage.dox | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook index 46114f6c..92652bbc 100644 --- a/doc/kde_app_devel/index.docbook +++ b/doc/kde_app_devel/index.docbook @@ -859,8 +859,8 @@ by selecting the "Global Functions" folder. 3 KAboutData about("kscribble", I18N_NOOP("KScribble"), version, description, 4 KAboutData::License_GPL, "(C) 2002 Your Name", 0, 0, "you@you.com"); 5 about.addAuthor( "Your Name", 0, "you@you.com" ); -6 KCmdLineArgs::init(argc, argv, &about); -7 KCmdLineArgs::addCmdLineOptions(options); +6 TDECmdLineArgs::init(argc, argv, &about); +7 TDECmdLineArgs::addCmdLineOptions(options); 8 TDEApplication app; 9 10 // register ourselves as a dcop client @@ -872,7 +872,7 @@ by selecting the "Global Functions" folder. 16 else 17 { 18 // no session.. just start up normally -19 KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); +19 TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); 20 if (args->count() == 0) 21 { 22 KScribble *widget = new KScribble; diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index 65963503..353bb436 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -128,7 +128,7 @@ Holds information for the about box. -<ulink url="kdeapi:tdecore/KCmdLineArgs">KCmdLineArgs</ulink> +<ulink url="kdeapi:tdecore/TDECmdLineArgs">TDECmdLineArgs</ulink> Command line argument processing. diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index b8a51016..83ebfbf0 100644 --- a/languages/java/app_templates/kappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java @@ -240,8 +240,8 @@ static void main(String[] cmdLineArgs) KAboutData about = new KAboutData("%{APPNAMELC}", "%{APPNAME}", version, description, KAboutData.License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", null, null, "%{EMAIL}"); about.addAuthor( "%{AUTHOR}", null, "%{EMAIL}" ); - KCmdLineArgs.init(cmdLineArgs, about); - KCmdLineArgs.addCmdLineOptions(options); + TDECmdLineArgs.init(cmdLineArgs, about); + TDECmdLineArgs.addCmdLineOptions(options); TDEApplication app = new TDEApplication(); // see if we are starting with session management @@ -250,7 +250,7 @@ static void main(String[] cmdLineArgs) 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/src/Mainpage.dox b/src/Mainpage.dox index bbf96246..78ee051b 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -48,8 +48,8 @@ Example: "", "http://www.myapp.org"); aboutData.addAuthor("Me", I18N_NOOP("Creator"), "me@myapp.org"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); TDEApplication app;