Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent aa1c1b863d
commit 4ffd16a310

@ -199,7 +199,7 @@ Atlantik::Atlantik ()
m_mainLayout->setColStretch(1, 1); // make m_board stretch horizontally, not the rest
// Check command-line args to see if we need to connect or show Monopigator window
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQCString host = args->getOption("host");
TQCString port = args->getOption("port");
@ -787,7 +787,7 @@ void Atlantik::sendHandshake()
m_atlantikNetwork->setImage(m_config.playerImage);
// Check command-line args to see if we need to auto-join
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQCString game = args->getOption("game");
if (!game.isNull())

@ -57,8 +57,8 @@ int main(int argc, char *argv[])
aboutData.addCredit("Elhay Achiam", I18N_NOOP("icons"), "elhay_a@bezeqint.net");
aboutData.addCredit("Carlo Caneva", I18N_NOOP("icons"), "webmaster@molecola.com", "http://www.molecola.com/");
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions (options);
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions (options);
KApplication::addCmdLineOptions();
KApplication kapplication;

@ -27,7 +27,7 @@ int main( int argc, char *argv[] )
KASTEROIDS_VERSION, description, KAboutData::License_GPL,
"(c) 1997, Martin R. Jones");
aboutData.addAuthor("Martin R. Jones",0, "mjones@kde.org");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -50,7 +50,7 @@ int main(int argc, char **argv)
aboutData.addCredit("Kai Jung", I18N_NOOP("6 new levels"), "jung@fh-fresenius.de");
aboutData.addCredit("Danny Allen", I18N_NOOP("Game graphics and application icon"), "danny@dannyallen.co.uk");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
TQApplication::setColorSpec(TQApplication::ManyColor);
KApplication a;

@ -49,7 +49,7 @@ int main(int argc, char *argv[])
about.addCredit ("Bo Thorsen", I18N_NOOP("Initial anti-aliasing of the board"),
"gobo@imada.sdu.dk");
KCmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::init(argc, argv, &about);
KApplication app;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -1066,7 +1066,7 @@ void KBattleshipWindow::slotChangeEnemyFieldData(int fieldx, int fieldy, int typ
}
void KBattleshipWindow::parseCommandLine() {
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count() > 0 )
{
KURL u( args->url(0));

@ -46,8 +46,8 @@ int main(int argc, char *argv[])
aboutData.addCredit("Inge Wallin", I18N_NOOP("Bugfixes and refactoring"), "inge@lysator.liu.se");
aboutData.addCredit("Jakub Stachowski", I18N_NOOP("DNS-SD discovery"), "qbast@go2.pl");
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -30,7 +30,7 @@ int main( int argc, char **argv )
KBVERSION, description, KAboutData::License_GPL,
"(c) 1999-2000, Robert Cimrman");
aboutData.addAuthor("Robert Cimrman",0, "cimrman3@students.zcu.cz");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication a;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -52,7 +52,7 @@ int main(int argc, char **argv)
aboutData.addAuthor("Sandro Sigala", I18N_NOOP("Highscore"), "ssigala@globalnet.it");
aboutData.addAuthor("Benjamin Meyer", I18N_NOOP("Contributions"), "ben+kbounce@meyerhome.net");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
TQApplication::setColorSpec(TQApplication::ManyColor);
KApplication a;

@ -25,7 +25,7 @@ static KCmdLineOptions options[] =
KCmdLineLastOption
};
AbTop *create(KCmdLineArgs *args)
AbTop *create(TDECmdLineArgs *args)
{
AbTop* top = new AbTop;
if (args->isSet("port"))
@ -43,14 +43,14 @@ int main(int argc, char *argv[])
"(c) 1997-2000, Josef Weidendorfer");
aboutData.addAuthor("Josef Weidendorfer",0, "Josef.Weidendorfer@gmx.de");
aboutData.addAuthor("Robert Williams");
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app;
KGlobal::locale()->insertCatalogue("libtdegames");
/* command line handling */
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
/* session management */
if ( app.isRestored() ) {

@ -26,7 +26,7 @@ int main (int argc, char **argv)
"ianw2@optusnet.com.au" );
about.addAuthor( "Marco Krüger", I18N_NOOP("Original author"), 0);
KCmdLineArgs::init (argc, argv, &about);
TDECmdLineArgs::init (argc, argv, &about);
KApplication app;

@ -41,7 +41,7 @@ int main(int argc, char *argv[])
"(c) 1998-2000, Matthias Kiefer");
aboutData.addAuthor("Matthias Kiefer",0, "matthias.kiefer@gmx.de");
aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+kjumpingcube@meyerhome.net");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -40,7 +40,7 @@ int main( int argc, char **argv )
description, KAboutData::License_GPL);
aboutData.addAuthor("Roman Merzlyakov", I18N_NOOP("Original author"), "roman@sbrf.barrt.ru");
aboutData.addAuthor("Roman Razilov", I18N_NOOP("Rewrite and Extension"), "Roman.Razilov@gmx.de");
KCmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::init(argc, argv, &aboutData);
KApplication a;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -20,7 +20,7 @@ int main( int argc, char** argv )
aboutData.addAuthor("Osvaldo Stark", I18N_NOOP("Tile set contributor and web page maintainer"), "starko@dnet.it");
aboutData.addCredit("Benjamin Meyer", I18N_NOOP("Code cleanup"), "ben+kmahjongg@meyerhome.net");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication a;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -245,7 +245,7 @@ int main(int argc, char **argv)
aboutData.addCredit("Andreas Zehender", I18N_NOOP("Smiley pixmaps"));
aboutData.addCredit("Mikhail Kourinny", I18N_NOOP("Solver/Adviser"));
aboutData.addCredit("Thomas Capricelli", I18N_NOOP("Magic reveal mode"));
KCmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::init(argc, argv, &aboutData);
KApplication a;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -45,14 +45,14 @@ int main(int argc, char ** argv)
about.addAuthor( "Andi Peredri", 0, "andi@ukr.net" );
about.addAuthor( "Thomas Nagy", 0, "tnagy2^8@yahoo.fr" );
KCmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options);
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
KGlobal::locale()->insertCatalogue("libtdegames");
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("Novice")) Settings::setSkill(Settings::EnumSkill::Novice);
if (args->isSet("Normal")) Settings::setSkill(Settings::EnumSkill::Normal);
if (args->isSet("Expert")) Settings::setSkill(Settings::EnumSkill::Expert);

@ -41,14 +41,14 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
aboutData.addCredit("Rob Renaud", I18N_NOOP("Wall-bouncing help"), 0);
aboutData.addCredit("Aaron Seigo", I18N_NOOP("Suggestions, bug reports"), 0);
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions(options);
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
// I've actually added this for my web site uploaded courses display
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("course-info"))
{
KCmdLineArgs::enable_i18n();
TDECmdLineArgs::enable_i18n();
TQString filename(TQFile::decodeName(args->getOption("course-info")));
if (TQFile::exists(filename))
@ -66,7 +66,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
}
else
{
KCmdLineArgs::usage(i18n("Course %1 does not exist.").arg(filename.latin1()));
TDECmdLineArgs::usage(i18n("Course %1 does not exist.").arg(filename.latin1()));
}
}

@ -16,7 +16,7 @@ main(int argc, char **argv)
KONQUEST_VERSION, description, KAboutData::License_GPL,
I18N_NOOP("Copyright (c) 1999-2001, Developers"));
aboutData.addAuthor("Russ Steffen",0, "rsteffen@bayarea.net");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication a;
TQApplication::setGlobalMouseTracking( true );

@ -53,9 +53,9 @@ int main( int argc, char **argv )
aboutData.addAuthor("Maren Pakura", I18N_NOOP("Documentation"), "maren@kde.org");
aboutData.addAuthor("Inge Wallin", I18N_NOOP("Bug fixes"), "inge@lysator.liu.se");
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 a;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -38,7 +38,7 @@ int main( int argc, char *argv[] )
I18N_NOOP("Current maintainer"), "b_mann@gmx.de");
aboutData.addAuthor("Jochen Tuchbreiter",
I18N_NOOP("Original author"), "whynot@mabi.de");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication myApp;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -64,7 +64,7 @@ int main(int argc, char **argv)
aboutData.addCredit("Arne Klaassen", I18N_NOOP("Raytraced chips."), 0);
aboutData.addCredit("Inge Wallin", I18N_NOOP("Cleaning, bugfixes, some enhancements."), 0);
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication a;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -37,7 +37,7 @@ int main( int argc, char **argv ) {
KAboutData aboutData("ksame", I18N_NOOP("SameGame"), KSAME_VERSION,
description, KAboutData::License_GPL, copyright);
aboutData.addAuthor("Marcus Kreutzberger", 0, "kreutzbe@informatik.mu-luebeck.de");
KCmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::init(argc, argv, &aboutData);
KApplication::setColorSpec(TQApplication::ManyColor+TQApplication::CustomColor);
KApplication a;

@ -60,7 +60,7 @@ int main(int argc, char **argv)
aboutData.addAuthor("Mario Weilguni", I18N_NOOP("Original Author"), "mweilguni@sime.com");
aboutData.addCredit("Jason Lane", I18N_NOOP("Added 'tiles removed' counter\nTile smooth-scaling and window resizing"), "jglane@btopenworld.com");
aboutData.addCredit(0, I18N_NOOP("Thanks also to everyone who should be listed here but isn't!"), 0);
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication a;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -6,12 +6,12 @@
int main(int argc, char **argv)
{
// read argument
KCmdLineArgs::init(argc, argv, "check_score", 0, 0, true);
TDECmdLineArgs::init(argc, argv, "check_score", 0, 0, true);
static KCmdLineOptions options[] =
{ {"+file", "Count of removed lines", 0} };
KCmdLineArgs::addCmdLineOptions(options);
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
if ( args->count()==0 ) KCmdLineArgs::usage();
TDECmdLineArgs::addCmdLineOptions(options);
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if ( args->count()==0 ) TDECmdLineArgs::usage();
TQString s = args->arg(0);
bool ok;
uint nb = s.toUInt(&ok);

@ -40,7 +40,7 @@ int main(int argc, char **argv)
VERSION, description, KAboutData::License_GPL,
"(c) 1998, Sandro Sigala");
aboutData.addAuthor("Sandro Sigala",0, "ssigala@globalnet.it");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app;

@ -41,7 +41,7 @@ int main( int argc, char **argv )
aboutData.addAuthor("Andrew Chant",0, "andrew.chant@utoronto.ca");
aboutData.addCredit("André Luiz dos Santos", I18N_NOOP("AI stuff"), "andre@netvision.com.br");
aboutData.addCredit("Benjamin Meyer", I18N_NOOP("Improvements"), "ben+ksnake@meyerhome.net");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -53,8 +53,8 @@ main (int argc, char **argv)
I18N_NOOP("For contributing the Sokoban levels included in this game"),
"sasquatch@bentonrea.com",
"http://users.bentonrea.com/~sasquatch/");
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions(options);
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
// KUniqueApplication::addCmdLineOptions();
// if (!KUniqueApplication::start())
@ -70,7 +70,7 @@ main (int argc, char **argv)
app.setMainWidget(widget);
widget->show();
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count() > 0) {
widget->openURL(args->url(0));
}

@ -13,7 +13,7 @@ int main(int argc,char **argv)
KSPACEDUEL_VERSION, description, KAboutData::License_GPL,
"(c) 1998-2000, Andreas Zehender");
aboutData.addAuthor("Andreas Zehender",0, "az@azweb.de");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication myapplication;
MyTopLevelWidget* top = new MyTopLevelWidget( );

@ -38,7 +38,7 @@ int main(int argc, char* argv[])
KTRON_VERSION, description, KAboutData::License_GPL, notice);
aboutData.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"), "matthias.kiefer@gmx.de");
aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+ktron@meyerhome.net");
KCmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication a;
KGlobal::locale()->insertCatalogue("libtdegames");

@ -36,8 +36,8 @@ int main(int argc, char *argv[])
aboutData.addCredit("Agnieszka Czajkowska", I18N_NOOP("New artwork"), "agnieszka@imagegalaxy.de");
aboutData.addCredit("Bas Willems", I18N_NOOP("New artwork"), "cybersurfer@euronet.nl");
aboutData.addCredit("Roger Larsson", I18N_NOOP("Sounds tuning"), "roger.larsson@norran.net");
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions(options);
TDECmdLineArgs::init(argc, argv, &aboutData);
TDECmdLineArgs::addCmdLineOptions(options);
KApplication app;
KGlobal::locale()->insertCatalogue("libtdegames");
@ -50,7 +50,7 @@ int main(int argc, char *argv[])
else {
toplevel = new TopLevel();
toplevel->show();
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count())
toplevel->open(args->url(0));
args->clear();

@ -27,7 +27,7 @@ BaseFactory::BaseFactory(const MainData &md, const BaseBoardInfo &bi)
void BaseFactory::init(int argc, char **argv)
{
KCmdLineArgs::init(argc, argv, _aboutData);
TDECmdLineArgs::init(argc, argv, _aboutData);
(void)new KApplication;
KGlobal::locale()->insertCatalogue("libtdegames");
KGlobal::locale()->insertCatalogue("libksirtet");

@ -37,11 +37,11 @@ int main(int argc, char *argv[])
"(c) 2000, Martin Heni");
aboutData.addAuthor("Martin Heni",0, "martin@heni-online.de");
aboutData.addCredit("Laura", I18N_NOOP("Beta testing"), 0);
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
/* command line handling */
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("debug"))
{

@ -44,11 +44,11 @@ int main(int argc, char *argv[])
aboutData.addAuthor("Martin Heni",0, "martin@heni-online.de");
aboutData.addCredit("Laura", I18N_NOOP("Beta testing"), 0);
aboutData.addAuthor("Benjamin Meyer", I18N_NOOP("Code Improvements"), 0);
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
/* command line handling */
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("debug"))
{

Loading…
Cancel
Save