diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:49 -0600 | 
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:49 -0600 | 
| commit | bdeb717137b6fc8693198008ccb97f8213973416 (patch) | |
| tree | aa91b6811b0632aeea6ac8402022cd6e1ff122fb | |
| parent | 57c30b2881457b03f7ca0a20b14178e5c3baad63 (diff) | |
| download | tdevelop-bdeb717137b6fc8693198008ccb97f8213973416.tar.gz tdevelop-bdeb717137b6fc8693198008ccb97f8213973416.zip  | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
20 files changed, 56 insertions, 56 deletions
diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp index 378ebbed..489dd754 100644 --- a/buildtools/lib/parsers/qmake/tests/runner.cpp +++ b/buildtools/lib/parsers/qmake/tests/runner.cpp @@ -133,14 +133,14 @@ private:  };  int main(int argc, char *argv[])  { -  KCmdLineArgs::init( argc, argv, "TQMake Parser", "qmake-parser", "Parse TQMake project files", "1.0.0"); -    KCmdLineArgs::addCmdLineOptions(options); +  TDECmdLineArgs::init( argc, argv, "TQMake Parser", "qmake-parser", "Parse TQMake project files", "1.0.0"); +    TDECmdLineArgs::addCmdLineOptions(options); -    KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); +    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();      if( args->count() < 1 )      { -        KCmdLineArgs::usage(0); +        TDECmdLineArgs::usage(0);      }      int debug = 0; diff --git a/kdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp index 49dd597f..0a472a97 100644 --- a/kdevdesigner/src/main.cpp +++ b/kdevdesigner/src/main.cpp @@ -44,8 +44,8 @@ int main(int argc, char **argv)                       KAboutData::License_GPL, "KDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nTQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0);      about.addAuthor( "Trolltech AS", "TQt Designer code (Free Edition)" );      about.addAuthor( "Alexander Dymo", "Port to KDE, partification", "adymo@tdevelop.org" ); -    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 @@ -68,7 +68,7 @@ int main(int argc, char **argv)          app.processEvents(); -        KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); +        TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();          if ( args->count() == 0 )          { 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}; diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index 908ac4e0..07ded01c 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -453,14 +453,14 @@ int main(int argc, char *argv[])      KAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"),                           "0.2", I18N_NOOP("TDE Index generator for documentation files.")); -    KCmdLineArgs::init(argc, argv, &aboutData); -    KCmdLineArgs::addCmdLineOptions(options); +    TDECmdLineArgs::init(argc, argv, &aboutData); +    TDECmdLineArgs::addCmdLineOptions(options);      KApplication app;      KGlobal::locale()->setMainCatalogue("tdevelop"); -    KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); +    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();      if (args->isSet("c"))      { diff --git a/src/main.cpp b/src/main.cpp index a0711997..f6ff2789 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -80,9 +80,9 @@ int main(int argc, char *argv[])    aboutData.addCredit("Robert Gruber" , I18N_NOOP("SnippetPart, debugger and usability patches"), "rgruber@users.sourceforge.net");    aboutData.addCredit("Zoran Karavla", I18N_NOOP("Artwork for the Ruby language"), "webmaster@the-error.net", "http://the-error.net"); -  KCmdLineArgs::init(argc, argv, &aboutData); -  KCmdLineArgs::addCmdLineOptions( options ); -  KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); +  TDECmdLineArgs::init(argc, argv, &aboutData); +  TDECmdLineArgs::addCmdLineOptions( options ); +  TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();    KApplication app; diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index b4b22221..25e7202a 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -74,9 +74,9 @@ int main(int argc, char *argv[])    aboutData.addCredit("Andreas Koepfle" , I18N_NOOP("TQMake project manager patches"), "koepfle@ti.uni-mannheim.de");    aboutData.addCredit("Sascha Cunz" , I18N_NOOP("Cleanup and bugfixes for qEditor, AutoMake and much other stuff"), "mail@sacu.de"); -  KCmdLineArgs::init(argc, argv, &aboutData); -  KCmdLineArgs::addCmdLineOptions( options ); -//  KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); +  TDECmdLineArgs::init(argc, argv, &aboutData); +  TDECmdLineArgs::addCmdLineOptions( options ); +//  TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();    KApplication app; diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 6d579346..e598b456 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -84,7 +84,7 @@ PluginController::PluginController()  			 KStandardDirs::kde_default( "data" ) +  			 TQString::fromLatin1("/tdevelop/profiles/FullIDE");*/ -    KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); +    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();      if( args->isSet("profile") ){          m_profile = TQString::fromLocal8Bit( args->getOption("profile") );      } else { diff --git a/src/profileengine/editor/main.cpp b/src/profileengine/editor/main.cpp index eeff6afc..7c43d24f 100644 --- a/src/profileengine/editor/main.cpp +++ b/src/profileengine/editor/main.cpp @@ -33,8 +33,8 @@ int main(int argc, char **argv)      KAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "",                       KAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, "");      about.addAuthor("Alexander Dymo", 0, "adymo@tdevelop.org"); -    KCmdLineArgs::init(argc, argv, &about); -    KCmdLineArgs::addCmdLineOptions(options); +    TDECmdLineArgs::init(argc, argv, &about); +    TDECmdLineArgs::addCmdLineOptions(options);      KApplication app(argc, argv);      ProfileEditor editor;  | 
