Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 57c30b2881
commit bdeb717137

@ -133,14 +133,14 @@ private:
}; };
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KCmdLineArgs::init( argc, argv, "TQMake Parser", "qmake-parser", "Parse TQMake project files", "1.0.0"); TDECmdLineArgs::init( argc, argv, "TQMake Parser", "qmake-parser", "Parse TQMake project files", "1.0.0");
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if( args->count() < 1 ) if( args->count() < 1 )
{ {
KCmdLineArgs::usage(0); TDECmdLineArgs::usage(0);
} }
int debug = 0; int debug = 0;

@ -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); 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( "Trolltech AS", "TQt Designer code (Free Edition)" );
about.addAuthor( "Alexander Dymo", "Port to KDE, partification", "adymo@tdevelop.org" ); about.addAuthor( "Alexander Dymo", "Port to KDE, partification", "adymo@tdevelop.org" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; KApplication app;
// see if we are starting with session management // see if we are starting with session management
@ -68,7 +68,7 @@ int main(int argc, char **argv)
app.processEvents(); app.processEvents();
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() == 0 ) if ( args->count() == 0 )
{ {

@ -26,8 +26,8 @@ int main (int argc, char *argv[])
KAboutData::License_GPL, "(C) %{YEAR}, %{AUTHOR}"); KAboutData::License_GPL, "(C) %{YEAR}, %{AUTHOR}");
aboutdata.addAuthor("%{AUTHOR}",I18N_NOOP("Developer"),"%{EMAIL}"); aboutdata.addAuthor("%{AUTHOR}",I18N_NOOP("Developer"),"%{EMAIL}");
KCmdLineArgs::init( argc, argv, &aboutdata ); TDECmdLineArgs::init( argc, argv, &aboutdata );
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KUniqueApplication::addCmdLineOptions(); KUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start()) if (!KUniqueApplication::start())

@ -23,8 +23,8 @@ int main(int argc, char **argv)
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; KApplication app;
// register ourselves as a dcop client // register ourselves as a dcop client
@ -38,7 +38,7 @@ int main(int argc, char **argv)
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count() == 0) if (args->count() == 0)
{ {
%{APPNAME} *widget = new %{APPNAME}; %{APPNAME} *widget = new %{APPNAME};

@ -22,8 +22,8 @@ int main(int argc, char **argv)
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; KApplication app;
// see if we are starting with session management // see if we are starting with session management
@ -34,7 +34,7 @@ int main(int argc, char **argv)
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count() == 0) if (args->count() == 0)
{ {
%{APPNAMELC} *widget = new %{APPNAMELC}; %{APPNAMELC} *widget = new %{APPNAMELC};

@ -16,11 +16,11 @@ int main(int argc, char **argv)
KAboutData about("%{APPNAMELC}", 0, ki18n("%{APPNAME}"), version, ki18n(description), KAboutData about("%{APPNAMELC}", 0, ki18n("%{APPNAME}"), version, ki18n(description),
KAboutData::License_%{LICENSE}, ki18n("(C) %{YEAR} %{AUTHOR}"), KLocalizedString(), 0, "%{EMAIL}"); KAboutData::License_%{LICENSE}, ki18n("(C) %{YEAR} %{AUTHOR}"), KLocalizedString(), 0, "%{EMAIL}");
about.addAuthor( ki18n("%{AUTHOR}"), KLocalizedString(), "%{EMAIL}" ); about.addAuthor( ki18n("%{AUTHOR}"), KLocalizedString(), "%{EMAIL}" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineOptions options; KCmdLineOptions options;
options.add("+[URL]", ki18n( "Document to open" )); options.add("+[URL]", ki18n( "Document to open" ));
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; KApplication app;
%{APPNAME} *widget = new %{APPNAME}; %{APPNAME} *widget = new %{APPNAME};
@ -33,7 +33,7 @@ int main(int argc, char **argv)
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count() == 0) if (args->count() == 0)
{ {
//%{APPNAMELC} *widget = new %{APPNAMELC}; //%{APPNAMELC} *widget = new %{APPNAMELC};

@ -22,8 +22,8 @@ int main(int argc, char **argv)
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; KApplication app;
%{APPNAME} *mainWin = 0; %{APPNAME} *mainWin = 0;
@ -34,7 +34,7 @@ int main(int argc, char **argv)
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
/// @todo do something with the command line args here /// @todo do something with the command line args here

@ -22,8 +22,8 @@ int main(int argc, char **argv)
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; KApplication app;
%{APPNAME} *mainWin = 0; %{APPNAME} *mainWin = 0;
@ -34,7 +34,7 @@ int main(int argc, char **argv)
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
/// @todo do something with the command line args here /// @todo do something with the command line args here

@ -22,8 +22,8 @@ int main(int argc, char **argv)
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; KApplication app;
%{APPNAME} *mainWin = 0; %{APPNAME} *mainWin = 0;
@ -34,7 +34,7 @@ int main(int argc, char **argv)
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
/// @todo do something with the command line args here /// @todo do something with the command line args here

@ -21,9 +21,9 @@ int main(int argc, char **argv)
KAboutData about("%{APPNAME}", I18N_NOOP("%{APPNAME}"), version, description, KAboutData about("%{APPNAME}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) 2004 %{AUTHOR}", 0, 0, "%{EMAIL}"); KAboutData::License_%{LICENSE}, "(C) 2004 %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
KApplication app; KApplication app;
MainViewImp *widget = new MainViewImp; MainViewImp *widget = new MainViewImp;
app.setMainWidget(widget); app.setMainWidget(widget);

@ -20,8 +20,8 @@ static const KCmdLineOptions options[]=
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KCmdLineArgs::init( argc, argv, new%{APPNAME}AboutData() ); TDECmdLineArgs::init( argc, argv, new%{APPNAME}AboutData() );
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KoApplication app; KoApplication app;
app.dcopClient()->attach(); app.dcopClient()->attach();

@ -21,8 +21,8 @@ int main(int argc, char **argv)
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication app; KApplication app;
// see if we are starting with session management // see if we are starting with session management
@ -33,7 +33,7 @@ int main(int argc, char **argv)
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() == 0 ) if ( args->count() == 0 )
{ {

@ -28,8 +28,8 @@ int main(int argc, char **argv)
// warning, utf-8 char // warning, utf-8 char
//about.addCredit( "bksys authors", "Thomas Nagy, Julien Antille" ); //about.addCredit( "bksys authors", "Thomas Nagy, Julien Antille" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; KApplication app;
@ -40,7 +40,7 @@ int main(int argc, char **argv)
} else */ } else */
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
%{APPNAMELC}kmdi *widget = new %{APPNAMELC}kmdi( KMdi::IDEAlMode ); %{APPNAMELC}kmdi *widget = new %{APPNAMELC}kmdi( KMdi::IDEAlMode );

@ -22,8 +22,8 @@ int main(int argc, char **argv)
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; KApplication app;
// see if we are starting with session management // see if we are starting with session management
@ -34,7 +34,7 @@ int main(int argc, char **argv)
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count() == 0) if (args->count() == 0)
{ {
%{APPNAME} *widget = new %{APPNAME}; %{APPNAME} *widget = new %{APPNAME};

@ -22,8 +22,8 @@ int main(int argc, char **argv)
KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}"); KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}");
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; KApplication app;
// see if we are starting with session management // see if we are starting with session management
@ -34,7 +34,7 @@ int main(int argc, char **argv)
else else
{ {
// no session.. just start up normally // no session.. just start up normally
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count() == 0) if (args->count() == 0)
{ {
%{APPNAMELC} *widget = new %{APPNAMELC}; %{APPNAMELC} *widget = new %{APPNAMELC};

@ -453,14 +453,14 @@ int main(int argc, char *argv[])
KAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"), KAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"),
"0.2", I18N_NOOP("TDE Index generator for documentation files.")); "0.2", I18N_NOOP("TDE Index generator for documentation files."));
KCmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; KApplication app;
KGlobal::locale()->setMainCatalogue("tdevelop"); KGlobal::locale()->setMainCatalogue("tdevelop");
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("c")) if (args->isSet("c"))
{ {

@ -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("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"); aboutData.addCredit("Zoran Karavla", I18N_NOOP("Artwork for the Ruby language"), "webmaster@the-error.net", "http://the-error.net");
KCmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
KApplication app; KApplication app;

@ -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("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"); aboutData.addCredit("Sascha Cunz" , I18N_NOOP("Cleanup and bugfixes for qEditor, AutoMake and much other stuff"), "mail@sacu.de");
KCmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
// KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); // TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
KApplication app; KApplication app;

@ -84,7 +84,7 @@ PluginController::PluginController()
KStandardDirs::kde_default( "data" ) + KStandardDirs::kde_default( "data" ) +
TQString::fromLatin1("/tdevelop/profiles/FullIDE");*/ TQString::fromLatin1("/tdevelop/profiles/FullIDE");*/
KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
if( args->isSet("profile") ){ if( args->isSet("profile") ){
m_profile = TQString::fromLocal8Bit( args->getOption("profile") ); m_profile = TQString::fromLocal8Bit( args->getOption("profile") );
} else { } else {

@ -33,8 +33,8 @@ int main(int argc, char **argv)
KAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "", KAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "",
KAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, ""); KAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, "");
about.addAuthor("Alexander Dymo", 0, "adymo@tdevelop.org"); about.addAuthor("Alexander Dymo", 0, "adymo@tdevelop.org");
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app(argc, argv); KApplication app(argc, argv);
ProfileEditor editor; ProfileEditor editor;

Loading…
Cancel
Save