From 68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:28 -0600 Subject: [PATCH] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- chalk/main.cc | 4 ++-- chalk/plugins/viewplugins/screenshot/main.cpp | 2 +- example/main.cc | 4 ++-- karbon/main.cc | 4 ++-- kchart/main.cc | 4 ++-- kexi/core/kexi.cpp | 4 ++-- kexi/formeditor/test/main.cpp | 6 +++--- kexi/kexidb/simplecommandlineapp.cpp | 6 +++--- kexi/main/startup/KexiStartup.cpp | 4 ++-- kexi/main/startup/KexiStartup.h | 4 ++-- kexi/plugins/macros/tests/komacrotest.cpp | 4 ++-- kexi/plugins/macros/tests/komacrotestgui.cpp | 4 ++-- kexi/tests/gui/finddialog/main.cpp | 2 +- kexi/tests/newapi/main.cpp | 6 +++--- kexi/tests/widgets/kexidbdrivercombotest.cpp | 2 +- kformula/main.cc | 4 ++-- kivio/kiviopart/main.cpp | 4 ++-- koshell/koshell_main.cc | 2 +- kplato/main.cc | 4 ++-- kpresenter/main.cpp | 4 ++-- kspread/main.cc | 4 ++-- kspread/tests/test_formula.cc | 2 +- kugar/kudesigner/main.cpp | 4 ++-- kugar/part/main.cpp | 4 ++-- kword/main.cpp | 4 ++-- lib/kformula/main.cc | 6 +++--- lib/kofficecore/KoApplication.cpp | 6 +++--- lib/koproperty/test/main.cpp | 6 +++--- lib/koproperty/test/test.cpp | 2 +- lib/kotext/tests/kobordertest.cpp | 2 +- lib/kross/runner/main.cpp | 8 ++++---- lib/kross/test/main.cpp | 6 +++--- lib/store/tests/storage_test.cpp | 2 +- lib/store/tests/storedroptest.cpp | 2 +- tools/converter/koconverter.cpp | 8 ++++---- tools/kthesaurus/main.cc | 6 +++--- 36 files changed, 75 insertions(+), 75 deletions(-) diff --git a/chalk/main.cc b/chalk/main.cc index 52ffc2fd0..2260aa72b 100644 --- a/chalk/main.cc +++ b/chalk/main.cc @@ -30,8 +30,8 @@ static const KCmdLineOptions options[] = { extern "C" KRITA_EXPORT int kdemain(int argc, char **argv) { - KCmdLineArgs::init(argc, argv, newChalkAboutData()); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, newChalkAboutData()); + TDECmdLineArgs::addCmdLineOptions(options); KoApplication app; diff --git a/chalk/plugins/viewplugins/screenshot/main.cpp b/chalk/plugins/viewplugins/screenshot/main.cpp index 0a004a870..6d74a63e7 100644 --- a/chalk/plugins/viewplugins/screenshot/main.cpp +++ b/chalk/plugins/viewplugins/screenshot/main.cpp @@ -19,7 +19,7 @@ int main(int argc, char **argv) aboutData.addAuthor("Aaron J. Seigo", 0, "aseigo@kde.org"); aboutData.addCredit( "Nadeem Hasan", "Region Grabbing\nReworked GUI", "nhasan@kde.org" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; diff --git a/example/main.cc b/example/main.cc index e12a1242d..2aae1f4b6 100644 --- a/example/main.cc +++ b/example/main.cc @@ -34,8 +34,8 @@ static const KCmdLineOptions options[]= extern "C" EXAMPLE_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, newExampleAboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, newExampleAboutData() ); + TDECmdLineArgs::addCmdLineOptions( options ); KoApplication app; if (!app.start()) // parses command line args, create initial docs and shells diff --git a/karbon/main.cc b/karbon/main.cc index edd929c35..6c6296a23 100644 --- a/karbon/main.cc +++ b/karbon/main.cc @@ -36,8 +36,8 @@ static const KCmdLineOptions options[] = extern "C" KARBONBASE_EXPORT int kdemain( int argc, char* argv[] ) { - KCmdLineArgs::init( argc, argv, newKarbonAboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, newKarbonAboutData() ); + TDECmdLineArgs::addCmdLineOptions( options ); KoApplication app; if( !app.start() ) // parses command line args, create initial docs and shells diff --git a/kchart/main.cc b/kchart/main.cc index eb8fe655a..35dd041d3 100644 --- a/kchart/main.cc +++ b/kchart/main.cc @@ -38,8 +38,8 @@ static const KCmdLineOptions options[]= extern "C" KCHART_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, newKChartAboutData()); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, newKChartAboutData()); + TDECmdLineArgs::addCmdLineOptions( options ); KoApplication app; if (!app.start()) diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp index e297ee523..aaaf589ed 100644 --- a/kexi/core/kexi.cpp +++ b/kexi/core/kexi.cpp @@ -321,8 +321,8 @@ void Kexi::initCmdLineArgs(int argc, char *argv[], KAboutData* aboutData) #ifdef CUSTOM_VERSION # include "../custom_startup.h" #endif - KCmdLineArgs::init( argc, argv, about ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, about ); + TDECmdLineArgs::addCmdLineOptions( options ); } void KEXI_UNFINISHED(const TQString& feature_name, const TQString& extra_text) diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp index f4866f29f..5c79f55fc 100644 --- a/kexi/formeditor/test/main.cpp +++ b/kexi/formeditor/test/main.cpp @@ -43,8 +43,8 @@ int main(int argc, char **argv) about.addAuthor( "Cedric Pasteur", 0, "cedric.pasteur@free.fr"); about.addCredit( "Jarosław Staniek", "Win32 version, some icons, many fixes, ideas and bug reports", "js@iidea.pl", 0); about.addCredit( "Kristof Borrey ", "Icons", 0, "kristof.borrey@skynet.be" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; KGlobal::iconLoader()->addAppDir("kexi"); @@ -67,7 +67,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() >= 1) { for (int i = 0; i < args->count(); i++) diff --git a/kexi/kexidb/simplecommandlineapp.cpp b/kexi/kexidb/simplecommandlineapp.cpp index c0f953915..6ba6624b3 100644 --- a/kexi/kexidb/simplecommandlineapp.cpp +++ b/kexi/kexidb/simplecommandlineapp.cpp @@ -90,7 +90,7 @@ SimpleCommandLineApp::SimpleCommandLineApp( { TQFileInfo fi(argv[0]); TQCString appName( fi.baseName().latin1() ); - KCmdLineArgs::init(argc, argv, + TDECmdLineArgs::init(argc, argv, new KAboutData( appName, programName, version, shortDescription, licenseType, copyrightStatement, text, homePageAddress, bugsEmailAddress)); @@ -123,9 +123,9 @@ SimpleCommandLineApp::SimpleCommandLineApp( allOptionsPtr->name = 0; //end allOptionsPtr->description = 0; allOptionsPtr->def = 0; - KCmdLineArgs::addCmdLineOptions( d->allOptions ); + TDECmdLineArgs::addCmdLineOptions( d->allOptions ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); d->connData.driverName = args->getOption("driver"); d->connData.userName = args->getOption("user"); diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index 17afbc7d2..07cb71850 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -206,7 +206,7 @@ KexiStartupHandler::~KexiStartupHandler() delete d; } -bool KexiStartupHandler::getAutoopenObjects(KCmdLineArgs *args, const TQCString &action_name) +bool KexiStartupHandler::getAutoopenObjects(TDECmdLineArgs *args, const TQCString &action_name) { QCStringList list = args->getOptionList(action_name); QCStringList::ConstIterator it; @@ -268,7 +268,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) { m_action = DoNothing; // d->showConnectionDetailsExecuted = false; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(0); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(0); if (!args) return true; diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h index 37a2011da..6f59dedca 100644 --- a/kexi/main/startup/KexiStartup.h +++ b/kexi/main/startup/KexiStartup.h @@ -30,7 +30,7 @@ class KexiProjectData; class KexiProjectData; -class KCmdLineArgs; +class TDECmdLineArgs; class KexiStartupHandlerPrivate; namespace KexiDB { class ConnectionData; @@ -123,7 +123,7 @@ class KEXIMAIN_EXPORT KexiStartupHandler // void slotShowConnectionDetails(); protected: - bool getAutoopenObjects(KCmdLineArgs *args, const TQCString &action_name); + bool getAutoopenObjects(TDECmdLineArgs *args, const TQCString &action_name); KexiStartupHandlerPrivate *d; }; diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp index cc64aa8df..34435fba4 100644 --- a/kexi/plugins/macros/tests/komacrotest.cpp +++ b/kexi/plugins/macros/tests/komacrotest.cpp @@ -40,8 +40,8 @@ int main( int argc, char** argv ) KAboutData::License_LGPL, "(C) 2005 Sebastian Sauer", 0, 0, "mail@dipe.org"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; //create an new "Console"-runner diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp index cddb4596b..8fad02302 100644 --- a/kexi/plugins/macros/tests/komacrotestgui.cpp +++ b/kexi/plugins/macros/tests/komacrotestgui.cpp @@ -40,8 +40,8 @@ int main( int argc, char** argv ) KAboutData::License_LGPL, "(C) 2005 Tobi Krebs", 0, 0, "Tobi.Krebs@gmail.com"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); //create new kapplication KApplication app; //create new kunitrunnergui diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp index 7da98bf48..3a9148fb1 100644 --- a/kexi/tests/gui/finddialog/main.cpp +++ b/kexi/tests/gui/finddialog/main.cpp @@ -27,7 +27,7 @@ int main( int argc, char ** argv ) { KAboutData aboutData( "test", I18N_NOOP("KFind"), "0", "", KAboutData::License_LGPL ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; KexiFindDialog dlg(true, 0, "dialog"); diff --git a/kexi/tests/newapi/main.cpp b/kexi/tests/newapi/main.cpp index 9eaff2ab6..7bb6a059f 100644 --- a/kexi/tests/newapi/main.cpp +++ b/kexi/tests/newapi/main.cpp @@ -115,7 +115,7 @@ int main(int argc, char** argv) TQFileInfo info=TQFileInfo(argv[0]); prgname = info.baseName().latin1(); - KCmdLineArgs::init(argc, argv, + TDECmdLineArgs::init(argc, argv, new KAboutData( prgname, "KexiDBTest", "0.1.2", "", KAboutData::License_GPL, "(c) 2003-2006, Kexi Team\n" @@ -125,9 +125,9 @@ int main(int argc, char** argv) "submit@bugs.kde.org" ) ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); QCStringList tests; tests << "cursors" << "schema" << "dbcreation" << "tables" << "tableview" << "parser" << "dr_prop"; diff --git a/kexi/tests/widgets/kexidbdrivercombotest.cpp b/kexi/tests/widgets/kexidbdrivercombotest.cpp index 1ada79b17..32d1cdb7c 100644 --- a/kexi/tests/widgets/kexidbdrivercombotest.cpp +++ b/kexi/tests/widgets/kexidbdrivercombotest.cpp @@ -45,7 +45,7 @@ int main(int argc, char** argv) { // Initialise the program - KCmdLineArgs::init(argc, argv, "kexidbcomboboxtest", "", "", "", true); + TDECmdLineArgs::init(argc, argv, "kexidbcomboboxtest", "", "", "", true); KApplication* app = new KApplication(true, true); // Look for installed database drivers diff --git a/kformula/main.cc b/kformula/main.cc index 825e5f0ba..8e0c8881b 100644 --- a/kformula/main.cc +++ b/kformula/main.cc @@ -33,8 +33,8 @@ static const KCmdLineOptions options[]= extern "C" KFORMULA_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, newKFormulaAboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, newKFormulaAboutData() ); + TDECmdLineArgs::addCmdLineOptions( options ); KoApplication app; diff --git a/kivio/kiviopart/main.cpp b/kivio/kiviopart/main.cpp index 096364677..442e2b939 100644 --- a/kivio/kiviopart/main.cpp +++ b/kivio/kiviopart/main.cpp @@ -33,8 +33,8 @@ static const KCmdLineOptions options[]= extern "C" KIVIO_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, newKivioAboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, newKivioAboutData() ); + TDECmdLineArgs::addCmdLineOptions( options ); KoApplication app; diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc index b4c84ad79..e940360ed 100644 --- a/koshell/koshell_main.cc +++ b/koshell/koshell_main.cc @@ -75,7 +75,7 @@ extern "C" KOSHELL_EXPORT int kdemain( int argc, char **argv ) aboutData->addAuthor("Sven Lüppken", I18N_NOOP("Current Maintainer"), "sven@kde.org"); aboutData->addAuthor("Torben Weis", 0, "weis@kde.org"); aboutData->addAuthor("David Faure", 0, "faure@kde.org"); - KCmdLineArgs::init( argc, argv, aboutData ); + TDECmdLineArgs::init( argc, argv, aboutData ); if ( !KoShellApp::start() ) { // Already running, brought to the foreground. diff --git a/kplato/main.cc b/kplato/main.cc index cca5b39d1..9c53afb01 100644 --- a/kplato/main.cc +++ b/kplato/main.cc @@ -37,8 +37,8 @@ static const KCmdLineOptions options[]= extern "C" KPLATO_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, KPlato::newAboutData()); - KCmdLineArgs::addCmdLineOptions( KPlato::options ); + TDECmdLineArgs::init( argc, argv, KPlato::newAboutData()); + TDECmdLineArgs::addCmdLineOptions( KPlato::options ); KoApplication app; diff --git a/kpresenter/main.cpp b/kpresenter/main.cpp index 91517ebd6..96716370c 100644 --- a/kpresenter/main.cpp +++ b/kpresenter/main.cpp @@ -34,8 +34,8 @@ static const KCmdLineOptions options[]= extern "C" KPRESENTER_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, newKPresenterAboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, newKPresenterAboutData() ); + TDECmdLineArgs::addCmdLineOptions( options ); KoApplication app; diff --git a/kspread/main.cc b/kspread/main.cc index e23ca662c..d04822682 100644 --- a/kspread/main.cc +++ b/kspread/main.cc @@ -34,8 +34,8 @@ static const KCmdLineOptions options[]= extern "C" KSPREAD_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, newAboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, newAboutData() ); + TDECmdLineArgs::addCmdLineOptions( options ); KoApplication app; diff --git a/kspread/tests/test_formula.cc b/kspread/tests/test_formula.cc index 93acc86fc..2d9920853 100644 --- a/kspread/tests/test_formula.cc +++ b/kspread/tests/test_formula.cc @@ -51,7 +51,7 @@ void run( Tester* test ) int main( int argc, char** argv ) { // Initialize command line args - KCmdLineArgs::init(argc, argv, "formulatest", "formulatest", "unit test", "0.1", true); + TDECmdLineArgs::init(argc, argv, "formulatest", "formulatest", "unit test", "0.1", true); KApplication app(false, false); run( new FormulaParserTester() ); diff --git a/kugar/kudesigner/main.cpp b/kugar/kudesigner/main.cpp index 6a8435a2d..afe985d76 100644 --- a/kugar/kudesigner/main.cpp +++ b/kugar/kudesigner/main.cpp @@ -36,8 +36,8 @@ static const KCmdLineOptions options[] = extern "C" KUGARDESIGNER_EXPORT int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue( "kugar" ); - KCmdLineArgs::init( argc, argv, newKudesignerAboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, newKudesignerAboutData() ); + TDECmdLineArgs::addCmdLineOptions( options ); KoApplication app; if ( !app.start() ) // parses command line args, create initial docs and shells diff --git a/kugar/part/main.cpp b/kugar/part/main.cpp index e37c77995..a846972ac 100644 --- a/kugar/part/main.cpp +++ b/kugar/part/main.cpp @@ -31,8 +31,8 @@ static KCmdLineOptions options[] = extern "C" KUGAR_EXPORT int kdemain( int argc, char *argv[] ) { - KCmdLineArgs::init( argc, argv, newKugarAboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, newKugarAboutData() ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KoApplication app; diff --git a/kword/main.cpp b/kword/main.cpp index 6f07e68af..8ef608649 100644 --- a/kword/main.cpp +++ b/kword/main.cpp @@ -30,8 +30,8 @@ static const KCmdLineOptions options[]= extern "C" KWORD_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, newKWordAboutData()); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, newKWordAboutData()); + TDECmdLineArgs::addCmdLineOptions( options ); KoApplication app; diff --git a/lib/kformula/main.cc b/lib/kformula/main.cc index 56a9e837e..a08cecd9c 100644 --- a/lib/kformula/main.cc +++ b/lib/kformula/main.cc @@ -241,8 +241,8 @@ int main(int argc, char** argv) "(c) 2003, Ulrich Kuettler"); aboutData.addAuthor("Ulrich Kuettler",0, "ulrich.kuettler@gmx.de"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; @@ -261,7 +261,7 @@ int main(int argc, char** argv) scrollview1a->setCaption("Test1a of the formula engine"); scrollview1a->show(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); for ( int i = 0; i < args->count(); ++i ) { TQFileInfo fi( args->url( i ).path() ); if ( fi.extension() == "mml" ) diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp index b4cfd2c4c..5346ff0ab 100644 --- a/lib/kofficecore/KoApplication.cpp +++ b/lib/kofficecore/KoApplication.cpp @@ -73,7 +73,7 @@ KoApplication::KoApplication() // This gets called before entering KApplication::KApplication bool KoApplication::initHack() { - KCmdLineArgs::addCmdLineOptions( options, I18N_NOOP("KOffice"), "koffice", "kde" ); + TDECmdLineArgs::addCmdLineOptions( options, I18N_NOOP("KOffice"), "koffice", "kde" ); return true; } @@ -102,10 +102,10 @@ bool KoApplication::start() } // Get the command line arguments which we have to parse - KCmdLineArgs *args= KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args= TDECmdLineArgs::parsedArgs(); int argsCount = args->count(); - KCmdLineArgs *koargs = KCmdLineArgs::parsedArgs("koffice"); + TDECmdLineArgs *koargs = TDECmdLineArgs::parsedArgs("koffice"); TQCString dpiValues = koargs->getOption( "dpi" ); if ( !dpiValues.isEmpty() ) { int sep = dpiValues.find( TQRegExp( "[x, ]" ) ); diff --git a/lib/koproperty/test/main.cpp b/lib/koproperty/test/main.cpp index 83370cfd7..b28a80342 100644 --- a/lib/koproperty/test/main.cpp +++ b/lib/koproperty/test/main.cpp @@ -39,8 +39,8 @@ int main(int argc, char **argv) KAboutData about("proptest", "KoProperty Test", version, description, KAboutData::License_GPL, "(C) 2005 Cedric Pasteur", 0, 0, "cedric.pasteur@free.fr"); about.addAuthor( "Cedric Pasteur", 0, "cedric.pasteur@free.fr" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; Test *mainWin = 0; @@ -51,7 +51,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/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index 1c4678c97..ecf414736 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -39,7 +39,7 @@ using namespace KoProperty; Test::Test() : KMainWindow(0,"koproperty_test") { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); const bool flat = args->isSet("flat"); const bool readOnly = args->isSet("ro"); diff --git a/lib/kotext/tests/kobordertest.cpp b/lib/kotext/tests/kobordertest.cpp index 356b01589..6dd37aa4d 100644 --- a/lib/kotext/tests/kobordertest.cpp +++ b/lib/kotext/tests/kobordertest.cpp @@ -48,7 +48,7 @@ private: int main (int argc, char ** argv) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"kobordertest", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"kobordertest", 0, 0, 0, 0); KApplication app; KoZoomHandler* zh = new KoZoomHandler(); diff --git a/lib/kross/runner/main.cpp b/lib/kross/runner/main.cpp index 1093a47b7..fcff2bb0e 100644 --- a/lib/kross/runner/main.cpp +++ b/lib/kross/runner/main.cpp @@ -110,18 +110,18 @@ int main(int argc, char **argv) about.addAuthor("Sebastian Sauer", "Author", "mail@dipe.org"); // Initialize command line args - KCmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::init(argc, argv, &about); // Tell which options are supported and parse them. static KCmdLineOptions options[] = { { "+file", I18N_NOOP("Scriptfile"), 0 }, KCmdLineLastOption }; - KCmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // If no options are defined. if(args->count() < 1) { - std::cout << "Syntax: " << KCmdLineArgs::appName() << " scriptfile1 [scriptfile2] [scriptfile3] ..." << std::endl; + std::cout << "Syntax: " << TDECmdLineArgs::appName() << " scriptfile1 [scriptfile2] [scriptfile3] ..." << std::endl; return ERROR_HELP; } diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp index 7f304ba6a..f8caf2d80 100644 --- a/lib/kross/test/main.cpp +++ b/lib/kross/test/main.cpp @@ -155,10 +155,10 @@ int main(int argc, char **argv) "kross@dipe.org"); about.addAuthor("Sebastian Sauer", "Author", "mail@dipe.org"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString interpretername = args->getOption("interpreter"); TQString scriptfilename = args->getOption("scriptfile"); diff --git a/lib/store/tests/storage_test.cpp b/lib/store/tests/storage_test.cpp index 1c7269ad0..fdb56b1d0 100644 --- a/lib/store/tests/storage_test.cpp +++ b/lib/store/tests/storage_test.cpp @@ -205,7 +205,7 @@ int test( const char* testName, KoStore::Backend backend, const TQString& testFi int main( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, "storage_test", "A test for the KoStore classes", "1" ); + TDECmdLineArgs::init( argc, argv, "storage_test", "A test for the KoStore classes", "1" ); KApplication app( argc, argv ); // KZip (due to KSaveFile) doesn't support relative filenames diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp index 09e308266..2845e5905 100644 --- a/lib/store/tests/storedroptest.cpp +++ b/lib/store/tests/storedroptest.cpp @@ -25,7 +25,7 @@ private: int main( int argc, char** argv ) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc, argv, "storedroptest", 0, 0, 0, 0); + TDECmdLineArgs::init(argc, argv, "storedroptest", 0, 0, 0, 0); KApplication app; StoreDropTest* window = new StoreDropTest( 0 ); diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp index 27e914260..dc8ab1b4e 100644 --- a/tools/converter/koconverter.cpp +++ b/tools/converter/koconverter.cpp @@ -78,8 +78,8 @@ int main( int argc, char **argv ) I18N_NOOP("(c) 2001-2004 KOffice developers") ); aboutData.addAuthor("David Faure",0, "faure@kde.org"); aboutData.addAuthor("Nicolas Goutte",0, "goutte@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; @@ -89,7 +89,7 @@ int main( int argc, char **argv ) KImageIO::registerFormats(); // Get the command line arguments which we have to parse - KCmdLineArgs *args= KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args= TDECmdLineArgs::parsedArgs(); if ( args->count() == 2 ) { KURL uIn = args->url( 0 ); @@ -155,7 +155,7 @@ int main( int argc, char **argv ) } } - KCmdLineArgs::usage(i18n("Two arguments required")); + TDECmdLineArgs::usage(i18n("Two arguments required")); return 3; } diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc index bc1f4c06f..968afd57f 100644 --- a/tools/kthesaurus/main.cc +++ b/tools/kthesaurus/main.cc @@ -39,8 +39,8 @@ extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv) I18N_NOOP( "KThesaurus - List synonyms" ), KAboutData::License_GPL, I18N_NOOP( "(c) 2001 Daniel Naber" ) ); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication a; // KDataTool needs an instance // TODO: take term from command line! @@ -67,7 +67,7 @@ extern "C" KOFFICETOOLS_EXPORT int kdemain(int argc, char **argv) } */ TQString text = ""; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() > 0 ) { text = args->arg(0); }