From d41050ea3f6904e5156d35f664346b816b9e4d12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:43 -0600 Subject: [PATCH] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- drkonqi/crashtest.cpp | 8 ++++---- drkonqi/krashconf.cpp | 2 +- drkonqi/main.cpp | 4 ++-- kappfinder/main.cpp | 6 +++--- kate/app/kateapp.cpp | 4 ++-- kate/app/kateapp.h | 6 +++--- kate/app/katemain.cpp | 10 +++++----- kate/app/kwritemain.cpp | 6 +++--- kcminit/main.cpp | 8 ++++---- kcminit/main.h | 4 ++-- kcontrol/access/main.cpp | 2 +- kcontrol/filetypes/keditfiletype.cpp | 8 ++++---- kcontrol/kcontrol/main.cpp | 2 +- kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 4 ++-- kcontrol/kfontinst/viewpart/FontViewerApp.cpp | 6 +++--- kcontrol/randr/main.cpp | 4 ++-- kdcop/kdcop.cpp | 4 ++-- kdebugdialog/main.cpp | 6 +++--- kdepasswd/kdepasswd.cpp | 6 +++--- kdesktop/kwebdesktop/kwebdesktop.cpp | 6 +++--- kdesktop/kxdglauncher.cpp | 6 +++--- kdesktop/lock/main.cc | 6 +++--- kdesktop/main.cc | 8 ++++---- kdialog/kdialog.cpp | 12 ++++++------ kfind/main.cpp | 6 +++--- khelpcenter/application.cpp | 6 +++--- khelpcenter/htmlsearch/index.cpp | 6 +++--- khelpcenter/khc_indexbuilder.cpp | 6 +++--- khelpcenter/testmetainfo.cpp | 2 +- khotkeys/app/app.cpp | 2 +- khotkeys/update/update.cpp | 6 +++--- kicker/extensions/kasbar/kasbarapp.cpp | 6 +++--- kicker/kicker/core/main.cpp | 2 +- kicker/kicker/kicker-3.4-reverseLayout.cpp | 2 +- kicker/proxy/appletproxy.cpp | 8 ++++---- kicker/proxy/extensiondebugger.cpp | 8 ++++---- kicker/proxy/extensionproxy.cpp | 8 ++++---- kioslave/home/kio_home.cpp | 6 +++--- kioslave/home/testhome.cpp | 2 +- kioslave/media/kio_media.cpp | 6 +++--- .../media/mounthelper/kio_media_mounthelper.cpp | 8 ++++---- kioslave/media/testmedia.cpp | 2 +- kioslave/remote/kio_remote.cpp | 6 +++--- kioslave/remote/testremote.cpp | 2 +- kioslave/system/kio_system.cpp | 6 +++--- kioslave/system/testsystem.cpp | 2 +- kioslave/trash/kio_trash.cpp | 6 +++--- kioslave/trash/ktrash.cpp | 6 +++--- kioslave/trash/testtrash.cpp | 2 +- klipper/main.cpp | 2 +- kmenuedit/kcontrol_main.cpp | 2 +- kmenuedit/main.cpp | 6 +++--- knetattach/main.cpp | 2 +- konqueror/client/kfmclient.cc | 14 +++++++------- konqueror/keditbookmarks/kbookmarkmerger.cpp | 6 +++--- konqueror/keditbookmarks/main.cpp | 10 +++++----- konqueror/konq_main.cc | 10 +++++----- konsole/konsole/main.cpp | 12 ++++++------ kpager/main.cpp | 6 +++--- kpersonalizer/main.cpp | 6 +++--- kreadconfig/kreadconfig.cpp | 8 ++++---- kreadconfig/kwriteconfig.cpp | 8 ++++---- krootbacking/main.cpp | 6 +++--- kscreensaver/random.cpp | 6 +++--- ksmserver/main.cpp | 6 +++--- ksmserver/test.cpp | 2 +- ksplashml/main.cpp | 6 +++--- ksplashml/themeengine/objkstheme.cpp | 4 ++-- ksplashml/themeengine/objkstheme.h | 2 +- ksplashml/themeengine/themeengine.cpp | 2 +- ksplashml/wndmain.cpp | 4 ++-- kstart/kstart.cpp | 8 ++++---- ksysguard/gui/ksysguard.cc | 6 +++--- ksystraycmd/main.cpp | 8 ++++---- ktip/ktipwindow.cpp | 2 +- kxkb/kxkb.cpp | 2 +- libkonq/tests/konqdragtest.cpp | 2 +- nsplugins/pluginscan.cpp | 6 +++--- nsplugins/test/testnsplugin.cpp | 2 +- tdeinit/displayconfig.cpp | 4 ++-- tdeinit/phase1.cpp | 4 ++-- tdeprint/kjobviewer/kjobviewer.cpp | 2 +- tdeprint/kjobviewer/main.cpp | 4 ++-- tdeprint/kprinter/main.cpp | 4 ++-- tdeprint/kprinter/printwrapper.cpp | 2 +- tdeprint/slave/kio_print.cpp | 2 +- tdeprint/tdeprintfax/main.cpp | 6 +++--- tdesu/tdesu/tdesu.cpp | 10 +++++----- tdesu/tdesud/tdesud.cpp | 2 +- tdm/kfrontend/kgapp.cpp | 2 +- tdm/kfrontend/krootimage.cpp | 6 +++--- twin/clients/kwmtheme/cli_installer/main.cpp | 6 +++--- twin/kcmtwin/twinrules/main.cpp | 8 ++++---- twin/killer/killer.cpp | 8 ++++---- twin/main.cpp | 6 +++--- twin/resumer/resumer.cpp | 6 +++--- twin/tools/decobenchmark/main.cpp | 10 +++++----- 97 files changed, 259 insertions(+), 259 deletions(-) diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp index a00fae6b0..c83014415 100644 --- a/drkonqi/crashtest.cpp +++ b/drkonqi/crashtest.cpp @@ -16,7 +16,7 @@ enum CrashType { Crash, Malloc, Div0, Assert }; void do_crash() { - KCmdLineArgs *args = 0; + TDECmdLineArgs *args = 0; TQCString type = args->arg(0); printf("result = %s\n", type.data()); } @@ -74,11 +74,11 @@ int main(int argc, char *argv[]) KAboutData::License_GPL, "(c) 2000-2002 David Faure, Waldo Bastian"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app(false, false); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQCString type = args->count() ? args->arg(0) : ""; int crashtype = Crash; if (type == "malloc") diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 7dc8b6f26..1e22bbbd9 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -60,7 +60,7 @@ void KrashConfig :: acceptDebuggingApp() void KrashConfig :: readConfig() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); m_signalnum = args->getOption( "signal" ).toInt(); m_pid = args->getOption( "pid" ).toInt(); m_startedByKdeinit = args->isSet("tdeinit"); diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp index b6fb5c982..5de09ed8b 100644 --- a/drkonqi/main.cpp +++ b/drkonqi/main.cpp @@ -77,8 +77,8 @@ int main( int argc, char* argv[] ) aboutData.addAuthor("Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor("Hans Petter Bieker", 0, "bieker@kde.org"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication::disableAutoDcopRegistration(); diff --git a/kappfinder/main.cpp b/kappfinder/main.cpp index 1642ce144..c5f1f57a3 100644 --- a/kappfinder/main.cpp +++ b/kappfinder/main.cpp @@ -39,9 +39,9 @@ int main( int argc, char *argv[] ) aboutData.addAuthor( "Matthias Hoelzer-Kluepfel", 0, "hoelzer@kde.org" ); aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); - 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/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index f57bd2254..2553000a1 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -51,7 +51,7 @@ #include #include -KateApp::KateApp (KCmdLineArgs *args) +KateApp::KateApp (TDECmdLineArgs *args) : KApplication () , m_args (args) , m_shouldExit (false) @@ -192,7 +192,7 @@ bool KateApp::startupKate () TQTextCodec *codec = m_args->isSet("encoding") ? TQTextCodec::codecForName(m_args->getOption("encoding")) : 0; - bool tempfileSet = KCmdLineArgs::isTempFileSet(); + bool tempfileSet = TDECmdLineArgs::isTempFileSet(); Kate::Document::setOpenErrorDialogsActivated (false); uint id = 0; diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h index b67901cd9..ffbd56e3e 100644 --- a/kate/app/kateapp.h +++ b/kate/app/kateapp.h @@ -33,7 +33,7 @@ namespace Kate { class Application; } -class KCmdLineArgs; +class TDECmdLineArgs; /** * Kate Application @@ -51,7 +51,7 @@ class KDE_EXPORT KateApp : public KApplication * application constructor * @param args parsed command line args */ - KateApp (KCmdLineArgs *args); + KateApp (TDECmdLineArgs *args); /** * application destructor @@ -202,7 +202,7 @@ class KDE_EXPORT KateApp : public KApplication /** * kate's command line args */ - KCmdLineArgs *m_args; + TDECmdLineArgs *m_args; /** * plugin interface diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index 9dbcc3d43..28f293509 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -99,13 +99,13 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) aboutData.setTranslator(I18N_NOOP2("NAME OF TRANSLATORS","Your names"), I18N_NOOP2("EMAIL OF TRANSLATORS","Your emails")); // command line args init and co - KCmdLineArgs::init (argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions (options); - KCmdLineArgs::addTempFileOption(); + TDECmdLineArgs::init (argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions (options); + TDECmdLineArgs::addTempFileOption(); KateApp::addCmdLineOptions (); // get our command line args ;) - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); // now, first try to contact running kate instance if needed if ( args->isSet("use") || (::getenv("KATE_PID")!=0) ) @@ -172,7 +172,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) TQString enc = args->isSet("encoding") ? args->getOption("encoding") : TQCString(""); - bool tempfileSet = KCmdLineArgs::isTempFileSet(); + bool tempfileSet = TDECmdLineArgs::isTempFileSet(); for (int z=0; zcount(); z++) kRef.call( "openURL", args->url(z), enc, tempfileSet ); diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index ca54ec29f..dd2768b1a 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -588,8 +588,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) aboutData.setTranslator(I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"), I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails")); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication a; @@ -602,7 +602,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) client->registerAs("kwrite"); } - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (kapp->isRestored()) { diff --git a/kcminit/main.cpp b/kcminit/main.cpp index b1fa455c9..93eb84a9e 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -126,7 +126,7 @@ void KCMInit::runModules( int phase ) } } -KCMInit::KCMInit( KCmdLineArgs* args ) +KCMInit::KCMInit( TDECmdLineArgs* args ) : DCOPObject( "kcminit" ) { TQCString arg; @@ -238,13 +238,13 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) "", I18N_NOOP("KCMInit - runs startups initialization for Control Modules.")); - 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; app.dcopClient()->registerAs( "kcminit", false ); KLocale::setMainCatalogue(0); - KCMInit kcminit( KCmdLineArgs::parsedArgs()); + KCMInit kcminit( TDECmdLineArgs::parsedArgs()); return 0; } diff --git a/kcminit/main.h b/kcminit/main.h index 0efa0c10c..9651a8516 100644 --- a/kcminit/main.h +++ b/kcminit/main.h @@ -23,7 +23,7 @@ #include #include -class KCmdLineArgs; +class TDECmdLineArgs; class KCMInit : public TQObject, public DCOPObject { @@ -33,7 +33,7 @@ class KCMInit : public TQObject, public DCOPObject void runPhase1(); void runPhase2(); public: - KCMInit( KCmdLineArgs* args ); + KCMInit( TDECmdLineArgs* args ); virtual ~KCMInit(); private: bool runModule(const TQString &libName, KService::Ptr service); diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp index aac6189a7..d57b8228b 100644 --- a/kcontrol/access/main.cpp +++ b/kcontrol/access/main.cpp @@ -12,7 +12,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] ) about.addAuthor("Matthias Hoelzer-Kluepfel", I18N_NOOP("Author") , "hoelzer@kde.org"); - KCmdLineArgs::init( argc, argv, &about ); + TDECmdLineArgs::init( argc, argv, &about ); if (!KAccessApp::start()) return 0; diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp index 0d74d9499..40013c166 100644 --- a/kcontrol/filetypes/keditfiletype.cpp +++ b/kcontrol/filetypes/keditfiletype.cpp @@ -118,13 +118,13 @@ int main(int argc, char ** argv) aboutData.addAuthor("Preston Brown",0, "pbrown@kde.org"); aboutData.addAuthor("David Faure",0, "faure@kde.org"); - 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; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() == 0) - KCmdLineArgs::usage(); + TDECmdLineArgs::usage(); TQString arg = args->arg(0); diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index ded07b006..e80f0603f 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -134,7 +134,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) aboutData->addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); aboutData->addAuthor("Waldo Bastian",0, "bastian@kde.org"); - KCmdLineArgs::init( argc, argv, aboutData ); + TDECmdLineArgs::init( argc, argv, aboutData ); KUniqueApplication::addCmdLineOptions(); KCGlobal::init(); diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index c60934624..c225187fd 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -93,10 +93,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) about->addAuthor("Craig Drummond", I18N_NOOP("Developer and maintainer"), "craig@kde.org"); setAboutData(about); - const char *appName=KCmdLineArgs::appName(); + const char *appName=TDECmdLineArgs::appName(); itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) && - KCmdLineArgs::parsedArgs()->isSet("embed")); + TDECmdLineArgs::parsedArgs()->isSet("embed")); itsStatusLabel = new TQLabel(this); itsStatusLabel->setFrameShape(TQFrame::Panel); diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index 09617ade8..acfd96178 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -54,7 +54,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart"); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL openURL; if(args->count() > 0) @@ -118,8 +118,8 @@ static KAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP( int main(int argc, char **argv) { - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KFI::CFontViewerApp::addCmdLineOptions(); KFI::CFontViewerApp app; diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp index b48232d2c..39903351b 100644 --- a/kcontrol/randr/main.cpp +++ b/kcontrol/randr/main.cpp @@ -42,8 +42,8 @@ int main(int argc, char **argv) aboutData.setProductName("krandr/krandrtray"); KGlobal::locale()->setMainCatalogue("krandr"); - KCmdLineArgs::init(argc,argv,&aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication::addCmdLineOptions(); KRandRApp app; diff --git a/kdcop/kdcop.cpp b/kdcop/kdcop.cpp index 41d7c3dd0..0db66161f 100644 --- a/kdcop/kdcop.cpp +++ b/kdcop/kdcop.cpp @@ -24,8 +24,8 @@ int main( int argc, char ** argv ) aboutData.addAuthor("Matthias Kalle Dalheimer",0, "kalle@kde.org"); aboutData.addAuthor("Rik Hemsley",0, "rik@kde.org"); aboutData.addAuthor("Ian Reinhart Geiser",0,"geiseri@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication a; diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp index 61d977ee8..fb19097dc 100644 --- a/kdebugdialog/main.cpp +++ b/kdebugdialog/main.cpp @@ -82,11 +82,11 @@ int main(int argc, char ** argv) KAboutData::License_GPL, "(c) 2009,2010, Timothy Pearson "); data.addAuthor("Timothy Pearson", I18N_NOOP("Maintainer"), "kb9vqf@pearsoncomputing.net"); data.addAuthor("David Faure", I18N_NOOP("Original maintainer/developer"), "faure@kde.org"); - KCmdLineArgs::init( argc, argv, &data ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &data ); + TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); KUniqueApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQStringList areaList ( readAreaList() ); KAbstractDebugDialog * dialog; diff --git a/kdepasswd/kdepasswd.cpp b/kdepasswd/kdepasswd.cpp index 6855b245d..19e583659 100644 --- a/kdepasswd/kdepasswd.cpp +++ b/kdepasswd/kdepasswd.cpp @@ -34,8 +34,8 @@ int main(int argc, char **argv) aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"), "jansen@kde.org", "http://www.stack.nl/~geertj/"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KUniqueApplication::addCmdLineOptions(); @@ -49,7 +49,7 @@ int main(int argc, char **argv) KUser ku; TQCString user; bool bRoot = ku.isSuperUser(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count()) user = args->arg(0); diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index 020ac0ebf..111af852d 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -93,13 +93,13 @@ int main( int argc, char **argv ) "(c) 2000, David Faure " ); data.addAuthor( "David Faure", I18N_NOOP("developer and maintainer"), "faure@kde.org" ); - KCmdLineArgs::init( argc, argv, &data ); + TDECmdLineArgs::init( argc, argv, &data ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 3 && args->count() != 4 ) { args->usage(); diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index 631843dec..68d1c1943 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -90,9 +90,9 @@ static KCmdLineOptions options[] = int main( int argc, char **argv) { - KCmdLineArgs::init( argc, argv, "kxdglauncher", I18N_NOOP("TDE XDG File Browser Launcher and Prompter"), I18N_NOOP("Prompts if directory does not exist, otherwise launches"), "1.0" ); - KCmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init( argc, argv, "kxdglauncher", I18N_NOOP("TDE XDG File Browser Launcher and Prompter"), I18N_NOOP("Prompts if directory does not exist, otherwise launches"), "1.0" ); + TDECmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KApplication app; app.disableSessionManagement(); diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 5ac0a588a..88c28d11b 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -207,9 +207,9 @@ int main( int argc, char **argv ) { KLocale::setMainCatalogue("kdesktop"); - KCmdLineArgs::init( argc, argv, "kdesktop_lock", I18N_NOOP("KDesktop Locker"), I18N_NOOP("Session Locker for KDesktop"), "2.1" ); - KCmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init( argc, argv, "kdesktop_lock", I18N_NOOP("KDesktop Locker"), I18N_NOOP("Session Locker for KDesktop"), "2.1" ); + TDECmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); putenv(strdup("SESSION_MANAGER=")); diff --git a/kdesktop/main.cc b/kdesktop/main.cc index a4a972065..51eb7b2a3 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -181,8 +181,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) aboutData.addAuthor("Torben Weis", 0, "weis@kde.org"); aboutData.addAuthor("Matthias Ettrich", 0, "ettrich@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); if (!KUniqueApplication::start()) { fprintf(stderr, "kdesktop is already running!\n"); @@ -195,11 +195,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) r.send( "suspendStartup", TQCString( "kdesktop" )); delete cl; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); #ifdef COMPOSITE - KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt"); + TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt"); if ( args->isSet("bg-transparency")) { char *display = 0; diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index a46e100f5..9f7b70ebd 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -152,7 +152,7 @@ static void outputStringList(TQStringList list, bool separateOutput) } } -static int directCommand(KCmdLineArgs *args) +static int directCommand(TDECmdLineArgs *args) { TQString title; bool separateOutput = FALSE; @@ -161,7 +161,7 @@ static int directCommand(KCmdLineArgs *args) TQString defaultEntry; // --title text - KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt"); // --title is a qt option + TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt"); // --title is a qt option if(qtargs->isSet("title")) { title = TQFile::decodeName(qtargs->getOption("title")); } @@ -669,7 +669,7 @@ static int directCommand(KCmdLineArgs *args) return Widgets::progressBar(0, title, text, totalsteps) ? 1 : 0; } - KCmdLineArgs::usage(); + TDECmdLineArgs::usage(); return -2; // NOTREACHED } @@ -688,12 +688,12 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Richard Moore",0,"rich@kde.org"); aboutData.addAuthor("Dawit Alemayehu",0,"adawit@kde.org"); - 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; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // execute direct kdialog command return directCommand(args); diff --git a/kfind/main.cpp b/kfind/main.cpp index d568dc3ce..448f98218 100644 --- a/kfind/main.cpp +++ b/kfind/main.cpp @@ -42,12 +42,12 @@ int main( int argc, char ** argv ) aboutData.addAuthor("Alexander Neundorf", 0, "neundorf@kde.org"); aboutData.addAuthor("Clarence Dang", 0, "dang@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs *args= KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args= TDECmdLineArgs::parsedArgs(); KURL url; if (args->count() > 0) diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index a15f77cd6..89a664d1c 100644 --- a/khelpcenter/application.cpp +++ b/khelpcenter/application.cpp @@ -35,7 +35,7 @@ int Application::newInstance() { if (restoringSession()) return 0; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL url; if ( args->count() ) @@ -74,8 +74,8 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) aboutData.addAuthor( "Wojciech Smigaj", I18N_NOOP("Info page support"), "achu@klub.chip.pl" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication::addCmdLineOptions(); KHC::Application app; diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp index 4b1642fa5..77bf2d62d 100644 --- a/khelpcenter/htmlsearch/index.cpp +++ b/khelpcenter/htmlsearch/index.cpp @@ -19,13 +19,13 @@ int main(int argc, char *argv[]) "", I18N_NOOP("TDE Index generator for help files.")); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KGlobal::locale()->setMainCatalogue("htmlsearch"); KApplication app; HTMLSearch search; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); search.generateIndex(args->getOption("lang")); } diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index 63231fe9f..ca12b5b91 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/khelpcenter/khc_indexbuilder.cpp @@ -179,13 +179,13 @@ int main( int argc, char **argv ) aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 2 ) { kdDebug(1402) << "Wrong number of arguments." << endl; diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp index 5e0a4e208..13b0e1800 100644 --- a/khelpcenter/testmetainfo.cpp +++ b/khelpcenter/testmetainfo.cpp @@ -89,7 +89,7 @@ class AsyncTraverser : public DocEntryTraverser int main(int argc,char **argv) { KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1"); - KCmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::init(argc,argv,&aboutData); KApplication app; diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp index c95043c9e..670b39b1b 100644 --- a/khotkeys/app/app.cpp +++ b/khotkeys/app/app.cpp @@ -144,7 +144,7 @@ int KDE_EXPORT kdemain( int argc, char** argv ) appname.sprintf("khotkeys-screen-%d", khotkeys_screen_number); // no need to i18n these, no GUI - KCmdLineArgs::init( argc, argv, appname, I18N_NOOP( "KHotKeys" ), + TDECmdLineArgs::init( argc, argv, appname, I18N_NOOP( "KHotKeys" ), I18N_NOOP( "KHotKeys daemon" ), KHOTKEYS_VERSION ); KUniqueApplication::addCmdLineOptions(); if( !KHotKeysApp::start()) // already running diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp index 91456ed70..5387382fa 100644 --- a/khotkeys/update/update.cpp +++ b/khotkeys/update/update.cpp @@ -34,11 +34,11 @@ static const KCmdLineOptions options[] = int main( int argc, char* argv[] ) { - KCmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update", + TDECmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update", "KHotKeys update utility", "1.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/ - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TQCString id = args->getOption( "id" ); TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" ); if( file.isEmpty()) diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 8ceceaf37..34341cbfe 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -75,11 +75,11 @@ static KCmdLineOptions options[] = int main( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING ); + TDECmdLineArgs::addCmdLineOptions( options ); KGlobal::locale()->setMainCatalogue( "kasbarextension" ); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); kdDebug(1345) << "Kasbar starting..." << endl; diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index 9bcf455be..4dc4c9864 100644 --- a/kicker/kicker/core/main.cpp +++ b/kicker/kicker/core/main.cpp @@ -125,7 +125,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) aboutData.addCredit("Jessica Hall", /* I18N_NOOP("KConfigXT") */ 0, "jes.hall@kdemail.net"); aboutData.addCredit("Stefan Nikolaus", /* I18N_NOOP("Bug fixes") */ 0, "stefan.nikolaus@kdemail.net"); aboutData.addCredit("Benoît Minisini", /* I18N_NOOP("Bug fixes") */ 0, "gambas@users.sourceforge.net"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); if (!Kicker::start()) { kdError() << "kicker is already running!" << endl; diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index 97a35aff6..110e1692f 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -22,7 +22,7 @@ typedef TQMap AppletInfoMap; int main(int argc, char** argv) { // We must disguise as Kicker in order to obtain the correct reverseLayout setting. - KCmdLineArgs::init(argc, argv, "kicker", "", "", "", false); + TDECmdLineArgs::init(argc, argv, "kicker", "", "", "", false); KApplication app(false, false); TQStringList stretchableApplets; diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index e427cbe74..04e81612e 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -75,11 +75,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) ,I18N_NOOP("Panel applet proxy.") , KAboutData::License_BSD , "(c) 2000, The KDE Developers"); - KCmdLineArgs::init(argc, argv, &aboutData ); + TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "elter@kde.org"); aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); KApplication::addCmdLineOptions(); - KCmdLineArgs::addCmdLineOptions(options); // Add our own options. + TDECmdLineArgs::addCmdLineOptions(options); // Add our own options. KApplication a; a.disableSessionManagement(); @@ -91,10 +91,10 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) AppletProxy proxy(0, "appletproxywidget"); // parse cmdline args - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() == 0 ) - KCmdLineArgs::usage(i18n("No desktop file specified") ); + TDECmdLineArgs::usage(i18n("No desktop file specified") ); // Perhaps we should use a konsole-like solution here (shell, list of args...) TQString desktopfile( args->arg(0) ); diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 796f10c93..4fa1d8332 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -79,11 +79,11 @@ int main( int argc, char ** argv ) ,I18N_NOOP("Panel extension proxy.") , KAboutData::License_BSD , "(c) 2000, The KDE Developers"); - KCmdLineArgs::init(argc, argv, &aboutData ); + TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "elter@kde.org"); aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); KApplication::addCmdLineOptions(); - KCmdLineArgs::addCmdLineOptions(options); // Add our own options. + TDECmdLineArgs::addCmdLineOptions(options); // Add our own options. KApplication a; a.disableSessionManagement(); @@ -94,11 +94,11 @@ int main( int argc, char ** argv ) TQString df; // parse cmdline args - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // sanity check if ( args->count() == 0 ) - KCmdLineArgs::usage(i18n("No desktop file specified") ); + TDECmdLineArgs::usage(i18n("No desktop file specified") ); TQCString desktopFile = TQCString( args->arg(0) ); diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 0bce08e91..eab6f4bb4 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -61,11 +61,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) ,I18N_NOOP("Panel extension proxy") , KAboutData::License_BSD , "(c) 2000, The KDE Developers"); - KCmdLineArgs::init(argc, argv, &aboutData ); + TDECmdLineArgs::init(argc, argv, &aboutData ); aboutData.addAuthor("Matthias Elter",0, "elter@kde.org"); aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); KApplication::addCmdLineOptions(); - KCmdLineArgs::addCmdLineOptions(options); // Add our own options. + TDECmdLineArgs::addCmdLineOptions(options); // Add our own options. KApplication a; a.disableSessionManagement(); @@ -77,11 +77,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) ExtensionProxy proxy(0, "extensionproxywidget"); // parse cmdline args - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // sanity check if ( args->count() == 0 ) - KCmdLineArgs::usage(i18n("No desktop file specified") ); + TDECmdLineArgs::usage(i18n("No desktop file specified") ); // do we have a callback id? if (args->getOption("callbackid").isNull()) { diff --git a/kioslave/home/kio_home.cpp b/kioslave/home/kio_home.cpp index c8a77acc5..eb9acd15a 100644 --- a/kioslave/home/kio_home.cpp +++ b/kioslave/home/kio_home.cpp @@ -42,13 +42,13 @@ extern "C" { { // KApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); - KCmdLineArgs::init(argc, argv, "kio_home", 0, 0, 0, 0); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, "kio_home", 0, 0, 0, 0); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app( false, false ); // We want to be anonymous even if we use DCOP app.dcopClient()->attach(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); HomeProtocol slave( args->arg(0), args->arg(1), args->arg(2) ); slave.dispatchLoop(); return 0; diff --git a/kioslave/home/testhome.cpp b/kioslave/home/testhome.cpp index 61e7d9fa6..e35b443c7 100644 --- a/kioslave/home/testhome.cpp +++ b/kioslave/home/testhome.cpp @@ -47,7 +47,7 @@ static bool check(const TQString& txt, TQString a, TQString b) int main(int argc, char *argv[]) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"testhome", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"testhome", 0, 0, 0, 0); KApplication app; TestHome test; diff --git a/kioslave/media/kio_media.cpp b/kioslave/media/kio_media.cpp index 7f42ff637..dc9542cd1 100644 --- a/kioslave/media/kio_media.cpp +++ b/kioslave/media/kio_media.cpp @@ -44,13 +44,13 @@ extern "C" { { // KApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); - KCmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app( false, false ); // We want to be anonymous even if we use DCOP app.dcopClient()->attach(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); MediaProtocol slave( args->arg(0), args->arg(1), args->arg(2) ); slave.dispatchLoop(); return 0; diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp index f184a9ad5..6289a85fc 100644 --- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp +++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp @@ -63,7 +63,7 @@ const Medium MountHelper::findMedium(const KURL &url) MountHelper::MountHelper() : KApplication() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); m_errorStr = TQString::null; @@ -263,15 +263,15 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KCmdLineArgs::init(argc, argv, "kio_media_mounthelper", + TDECmdLineArgs::init(argc, argv, "kio_media_mounthelper", "kio_media_mounthelper", "kio_media_mounthelper", "0.1"); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KGlobal::locale()->setMainCatalogue("kio_media"); KApplication::addCmdLineOptions(); - if (KCmdLineArgs::parsedArgs()->count()==0) KCmdLineArgs::usage(); + if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage(); KApplication *app = new MountHelper(); KStartupInfo::appStarted(); diff --git a/kioslave/media/testmedia.cpp b/kioslave/media/testmedia.cpp index 89ced4ba1..9bc8ac071 100644 --- a/kioslave/media/testmedia.cpp +++ b/kioslave/media/testmedia.cpp @@ -47,7 +47,7 @@ static bool check(const TQString& txt, TQString a, TQString b) int main(int argc, char *argv[]) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"testmedia", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"testmedia", 0, 0, 0, 0); KApplication app; TestMedia test; diff --git a/kioslave/remote/kio_remote.cpp b/kioslave/remote/kio_remote.cpp index 646a99d30..985593bb0 100644 --- a/kioslave/remote/kio_remote.cpp +++ b/kioslave/remote/kio_remote.cpp @@ -42,13 +42,13 @@ extern "C" { { // KApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); - KCmdLineArgs::init(argc, argv, "kio_remote", 0, 0, 0, 0); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, "kio_remote", 0, 0, 0, 0); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app( false, false ); // We want to be anonymous even if we use DCOP app.dcopClient()->attach(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); RemoteProtocol slave( args->arg(0), args->arg(1), args->arg(2) ); slave.dispatchLoop(); return 0; diff --git a/kioslave/remote/testremote.cpp b/kioslave/remote/testremote.cpp index 3c76b6f22..f493da2f4 100644 --- a/kioslave/remote/testremote.cpp +++ b/kioslave/remote/testremote.cpp @@ -47,7 +47,7 @@ static bool check(const TQString& txt, TQString a, TQString b) int main(int argc, char *argv[]) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"testremote", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"testremote", 0, 0, 0, 0); KApplication app; TestRemote test; diff --git a/kioslave/system/kio_system.cpp b/kioslave/system/kio_system.cpp index 1f86a90d1..c9815ff7b 100644 --- a/kioslave/system/kio_system.cpp +++ b/kioslave/system/kio_system.cpp @@ -43,13 +43,13 @@ extern "C" { { // KApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); - KCmdLineArgs::init(argc, argv, "kio_system", 0, 0, 0, 0); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, "kio_system", 0, 0, 0, 0); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app( false, false ); // We want to be anonymous even if we use DCOP app.dcopClient()->attach(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); SystemProtocol slave( args->arg(0), args->arg(1), args->arg(2) ); slave.dispatchLoop(); return 0; diff --git a/kioslave/system/testsystem.cpp b/kioslave/system/testsystem.cpp index d9ad43e50..c3cc84c6e 100644 --- a/kioslave/system/testsystem.cpp +++ b/kioslave/system/testsystem.cpp @@ -47,7 +47,7 @@ static bool check(const TQString& txt, TQString a, TQString b) int main(int argc, char *argv[]) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"testsystem", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"testsystem", 0, 0, 0, 0); KApplication app; TestSystem test; diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp index 344f31f74..e8bd00792 100644 --- a/kioslave/trash/kio_trash.cpp +++ b/kioslave/trash/kio_trash.cpp @@ -56,11 +56,11 @@ extern "C" { // KApplication is necessary to use kio_file putenv(strdup("SESSION_MANAGER=")); KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app( false, false ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TrashProtocol slave( args->arg(0), args->arg(1), args->arg(2) ); slave.dispatchLoop(); return 0; diff --git a/kioslave/trash/ktrash.cpp b/kioslave/trash/ktrash.cpp index b84f69355..41980b060 100644 --- a/kioslave/trash/ktrash.cpp +++ b/kioslave/trash/ktrash.cpp @@ -38,15 +38,15 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init( argc, argv, "ktrash", + TDECmdLineArgs::init( argc, argv, "ktrash", I18N_NOOP( "ktrash" ), I18N_NOOP( "Helper program to handle the TDE trash can\n" "Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' trash:/\"" ), TDE_VERSION_STRING ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if ( args->isSet( "empty" ) ) { // We use a kio job instead of linking to TrashImpl, for a smaller binary // (and the possibility of a central service at some point) diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp index c5c25d872..4819d8d55 100644 --- a/kioslave/trash/testtrash.cpp +++ b/kioslave/trash/testtrash.cpp @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) setenv( "TDE_FORK_SLAVES", "yes", true ); KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"testtrash", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"testtrash", 0, 0, 0, 0); KApplication app; TestTrash test; diff --git a/klipper/main.cpp b/klipper/main.cpp index 2f87c7043..f458f50c2 100644 --- a/klipper/main.cpp +++ b/klipper/main.cpp @@ -38,7 +38,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) { Klipper::createAboutData(); - KCmdLineArgs::init( argc, argv, Klipper::aboutData()); + TDECmdLineArgs::init( argc, argv, Klipper::aboutData()); KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) { diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp index 6d9322ca6..3555937b5 100644 --- a/kmenuedit/kcontrol_main.cpp +++ b/kmenuedit/kcontrol_main.cpp @@ -42,7 +42,7 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) aboutData.addAuthor("Raffaele Sandrini", I18N_NOOP("Previous Maintainer"), "sandrini@kde.org"); aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp index 8e644dd54..e2f70b62d 100644 --- a/kmenuedit/main.cpp +++ b/kmenuedit/main.cpp @@ -48,7 +48,7 @@ public: virtual int newInstance() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() > 0) { menuEdit->selectMenu(TQString::fromLocal8Bit(args->arg(0))); @@ -71,9 +71,9 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) aboutData.addAuthor("Raffaele Sandrini", I18N_NOOP("Previous Maintainer"), "sandrini@kde.org"); aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KUniqueApplication::addCmdLineOptions(); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); if (!KUniqueApplication::start()) return 1; diff --git a/knetattach/main.cpp b/knetattach/main.cpp index 99c700291..6d3f65b9d 100644 --- a/knetattach/main.cpp +++ b/knetattach/main.cpp @@ -34,7 +34,7 @@ int main(int argc, char **argv) { about.addAuthor("George Staikos", I18N_NOOP("Primary author and maintainer"), "staikos@kde.org"); - KCmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::init(argc, argv, &about); KApplication a; KNetAttach na; diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index f8533ef17..dd7e385e3 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -70,16 +70,16 @@ static const KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init(argc, argv, appName, programName, description, version, false); + TDECmdLineArgs::init(argc, argv, appName, programName, description, version, false); - KCmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs::addTempFileOption(); + TDECmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addTempFileOption(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->isSet("commands") ) { - KCmdLineArgs::enable_i18n(); + TDECmdLineArgs::enable_i18n(); puts(i18n("\nSyntax:\n").local8Bit()); puts(i18n(" kfmclient openURL 'url' ['mimetype']\n" " # Opens a window showing 'url'.\n" @@ -445,7 +445,7 @@ static void checkArgumentCount(int count, int min, int max) bool clientApp::doIt() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); int argc = args->count(); checkArgumentCount(argc, 1, 0); @@ -466,7 +466,7 @@ bool clientApp::doIt() KApplication::dcopClient()->attach(); } checkArgumentCount(argc, 1, 3); - bool tempFile = KCmdLineArgs::isTempFileSet(); + bool tempFile = TDECmdLineArgs::isTempFileSet(); if ( argc == 1 ) { KURL url; diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index d34794fdc..bea3c0e26 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -66,8 +66,8 @@ int main( int argc, char**argv ) aboutData.addAuthor( "Frerich Raabe", I18N_NOOP( "Original author" ), "raabe@kde.org" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( cmdLineOptions ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( cmdLineOptions ); if ( !kdeRunning ) { KApplication::disableAutoDcopRegistration(); @@ -75,7 +75,7 @@ int main( int argc, char**argv ) KApplication app( false, false ); app.disableSessionManagement(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 1 ) { kdError() << "No directory to scan for bookmarks specified." << endl; return 1; diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 5b238302f..b99313159 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -121,11 +121,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { aboutData.addAuthor("David Faure", I18N_NOOP("Initial author"), "faure@kde.org"); aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "lypanov@kde.org"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KApplication::addCmdLineOptions(); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool isGui = !(args->isSet("exportmoz") || args->isSet("exportns") || args->isSet("exporthtml") || args->isSet("exportie") || args->isSet("exportopera") || args->isSet("importmoz") || args->isSet("importns") @@ -160,12 +160,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { Q_ASSERT(arg2); // TODO - maybe an xbel export??? if (got > 1) // got == 0 isn't possible as !isGui is dependant on "export.*" - KCmdLineArgs::usage(I18N_NOOP("You may only specify a single --export option.")); + TDECmdLineArgs::usage(I18N_NOOP("You may only specify a single --export option.")); TQString path = TQString::fromLocal8Bit(args->getOption(arg2)); CurrentMgr::self()->doExport(exportType, path); } else if (importType) { if (got > 1) // got == 0 isn't possible as !isGui is dependant on "import.*" - KCmdLineArgs::usage(I18N_NOOP("You may only specify a single --import option.")); + TDECmdLineArgs::usage(I18N_NOOP("You may only specify a single --import option.")); TQString path = TQString::fromLocal8Bit(args->getOption(arg2)); ImportCommand *importer = ImportCommand::importerFactory(importType); importer->import(path, true); diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 6e98bf104..7e7a11ae4 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -50,10 +50,10 @@ static const KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, KonqFactory::aboutData() ); + TDECmdLineArgs::init( argc, argv, KonqFactory::aboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KCmdLineArgs::addTempFileOption(); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::addTempFileOption(); KonquerorApplication app; @@ -65,7 +65,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) KGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq KImageIO::registerFormats(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KTempFile crashlog_file(locateLocal("tmp", "konqueror-crash-"), ".log"); KonqMainWindow::s_crashlog_file = crashlog_file.file(); @@ -191,7 +191,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) urlToOpen.setFileName(""); } } - const bool tempFile = KCmdLineArgs::isTempFileSet(); + const bool tempFile = TDECmdLineArgs::isTempFileSet(); mainwin = KonqMisc::createNewWindow( urlToOpen, urlargs, false, filesToSelect, tempFile ); } else urlList += urlToOpen; diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 0a43d1c06..d82942ee7 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -228,11 +228,11 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) "The above list only reflects the contributors\n" "I managed to keep track of.")); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. //1.53 sec - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt"); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); + TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt"); has_noxft = !args->isSet("xft"); TEWidget::setAntialias( !has_noxft ); TEWidget::setStandalone( true ); @@ -281,7 +281,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) if (!args->getOption("e").isEmpty()) { if (args->isSet("ls")) - KCmdLineArgs::usage(i18n("You can't use BOTH -ls and -e.\n")); + TDECmdLineArgs::usage(i18n("You can't use BOTH -ls and -e.\n")); shell = strdup(args->getOption("e")); eargs.append(shell); for(int i=0; i < args->count(); i++) @@ -408,7 +408,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) } else { - KCmdLineArgs::usage(i18n("expected --vt_sz <#columns>x<#lines> e.g. 80x40\n")); + TDECmdLineArgs::usage(i18n("expected --vt_sz <#columns>x<#lines> e.g. 80x40\n")); } } diff --git a/kpager/main.cpp b/kpager/main.cpp index 9f2282b59..685e1375b 100644 --- a/kpager/main.cpp +++ b/kpager/main.cpp @@ -77,8 +77,8 @@ int main(int argc, char **argv) aboutdata->addAuthor("Matthias Ettrich", I18N_NOOP("Developer"),"ettrich@kde.org", ""); - KCmdLineArgs::init(argc, argv, aboutdata); - KCmdLineArgs::addCmdLineOptions(pagerOpts); + TDECmdLineArgs::init(argc, argv, aboutdata); + TDECmdLineArgs::addCmdLineOptions(pagerOpts); KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) @@ -89,7 +89,7 @@ int main(int argc, char **argv) KApplication * app = new KPagerApplication; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KPagerMainWindow *kpager = new KPagerMainWindow(0,"KPager"); kpager->setPlainCaption( i18n("Desktop Pager") ); diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp index b1707dfb6..41df7d3c2 100644 --- a/kpersonalizer/main.cpp +++ b/kpersonalizer/main.cpp @@ -42,8 +42,8 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Carsten Wolff",0, "wolff@kde.org"); aboutData.addAuthor("qwertz",0, "kraftw@gmx.de"); aboutData.addAuthor("Bernhard Rosenkraenzer", 0, "bero@redhat.com"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KLocale::setMainCatalogue("kpersonalizer"); @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("before-session")) KPersonalizer::setBeforeSession(); diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp index d08894658..1748b6549 100644 --- a/kreadconfig/kreadconfig.cpp +++ b/kreadconfig/kreadconfig.cpp @@ -49,9 +49,9 @@ int main(int argc, char **argv) KAboutData::License_GPL, "(c) 2001 Red Hat, Inc."); aboutData.addAuthor("Bernhard Rosenkraenzer", 0, "bero@redhat.com"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args=KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs *args=TDECmdLineArgs::parsedArgs(); TQString group=TQString::fromLocal8Bit(args->getOption("group")); TQString key=TQString::fromLocal8Bit(args->getOption("key")); @@ -60,7 +60,7 @@ int main(int argc, char **argv) TQCString type=args->getOption("type").lower(); if (key.isNull()) { - KCmdLineArgs::usage(); + TDECmdLineArgs::usage(); return 1; } diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp index 0d1d7fc92..b216a14df 100644 --- a/kreadconfig/kwriteconfig.cpp +++ b/kreadconfig/kwriteconfig.cpp @@ -32,9 +32,9 @@ int main(int argc, char **argv) "(c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho"); aboutData.addAuthor("Lu�s Pedro Coelho", 0, "luis_pedro@netcabo.pt"); aboutData.addAuthor("Bernhard Rosenkraenzer", "Wrote kreadconfig on which this is based", "bero@redhat.com"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args=KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs *args=TDECmdLineArgs::parsedArgs(); TQString group=TQString::fromLocal8Bit(args->getOption("group")); TQString key=TQString::fromLocal8Bit(args->getOption("key")); @@ -43,7 +43,7 @@ int main(int argc, char **argv) if (key.isNull() || !args->count()) { - KCmdLineArgs::usage(); + TDECmdLineArgs::usage(); return 1; } TQCString value = args->arg( 0 ); diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp index dd4761973..1b6f82011 100644 --- a/krootbacking/main.cpp +++ b/krootbacking/main.cpp @@ -49,13 +49,13 @@ int main(int argc, char **argv) KAboutData about("krootbacking", I18N_NOOP("krootbacking"), version, description, KAboutData::License_GPL, "(C) 2011 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net"); about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; // no session.. just start up normally - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); /// @todo do something with the command line args here args->clear(); diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp index 6ce3c975f..13749dafd 100644 --- a/kscreensaver/random.cpp +++ b/kscreensaver/random.cpp @@ -101,15 +101,15 @@ bool hasDirectRendering () { int main(int argc, char *argv[]) { KLocale::setMainCatalogue("kscreensaver"); - KCmdLineArgs::init(argc, argv, appName, I18N_NOOP("Random screen saver"), description, version); + TDECmdLineArgs::init(argc, argv, appName, I18N_NOOP("Random screen saver"), description, version); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; Window windowId = 0; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("setup")) { diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 5108716f3..65c43253a 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -186,15 +186,15 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); aboutData.addAuthor("Luboš Luňák", I18N_NOOP( "Maintainer" ), "l.lunak@kde.org" ); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); putenv((char*)"SESSION_MANAGER="); KApplication a(KApplication::openX11RGBADisplay(), false); // Disable styles until we need them. fcntl(ConnectionNumber(tqt_xdisplay()), F_SETFD, 1); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); kapp->dcopClient()->registerAs("ksmserver", false); if (!kapp->dcopClient()->isRegistered()) diff --git a/ksmserver/test.cpp b/ksmserver/test.cpp index 8f248725f..5a5e114c4 100644 --- a/ksmserver/test.cpp +++ b/ksmserver/test.cpp @@ -8,7 +8,7 @@ int main(int argc, char *argv[]) { KAboutData about("kapptest", "kapptest", "version"); - KCmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::init(argc, argv, &about); KApplication a; a.iconLoader()->addAppDir("ksmserver"); diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp index 995cf8a2a..daa07bd1a 100644 --- a/ksplashml/main.cpp +++ b/ksplashml/main.cpp @@ -50,9 +50,9 @@ int main( int argc, char **argv ) about.addAuthor( "Ravikiran Rajagopal", I18N_NOOP("Author and maintainer"), "ravi@ee.eng.ohio-state.edu" ); about.addAuthor( "Brian Ledbetter", I18N_NOOP("Original author"), "brian@shadowcom.net" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *arg = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs *arg = TDECmdLineArgs::parsedArgs(); if ( !( arg->isSet( "dcop" ) ) ) KApplication::disableAutoDcopRegistration(); diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index 9aa6d2b26..533697dc4 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -50,7 +50,7 @@ ObjKsTheme::ObjKsTheme( const TQString& theme ) if( !loadLocalConfig( mActiveTheme, false ) ) if( !loadThemeRc( "Default", false ) ) loadLocalConfig( "Default", true ); //force: we need some defaults - loadCmdLineArgs(KCmdLineArgs::parsedArgs()); + loadCmdLineArgs(TDECmdLineArgs::parsedArgs()); mThemePrefix += ( mActiveTheme + "/" ); } @@ -141,7 +141,7 @@ bool ObjKsTheme::loadKConfig( KConfig *cfg, const TQString& activeTheme, bool fo * ObjKsTheme::loadCmdLineArgs(): Handle any overrides which the user might have * specified. */ -void ObjKsTheme::loadCmdLineArgs( KCmdLineArgs *args ) +void ObjKsTheme::loadCmdLineArgs( TDECmdLineArgs *args ) { mManagedMode = args->isSet( "managed" ); diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h index 090b39220..4d88276ba 100644 --- a/ksplashml/themeengine/objkstheme.h +++ b/ksplashml/themeengine/objkstheme.h @@ -33,7 +33,7 @@ public: explicit ObjKsTheme( const TQString& ); virtual ~ObjKsTheme(); - void loadCmdLineArgs( KCmdLineArgs * ); + void loadCmdLineArgs( TDECmdLineArgs * ); TQString theme() const { return( mActiveTheme ); } TQString themeEngine() const { return( mThemeEngine ); } diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index cb3566588..b9a7c208f 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -59,7 +59,7 @@ ThemeEngine::ThemeEngine( TQWidget *, const char *, const TQStringList& args ) if (args.first() == "Unified") { mUseWM = true; } - mTheme->loadCmdLineArgs( KCmdLineArgs::parsedArgs() ); + mTheme->loadCmdLineArgs( TDECmdLineArgs::parsedArgs() ); } ThemeEngine::~ThemeEngine() diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp index 39a786b5d..2efe5bb83 100644 --- a/ksplashml/wndmain.cpp +++ b/ksplashml/wndmain.cpp @@ -90,7 +90,7 @@ KSplash::~KSplash() void KSplash::slotReadProperties( KConfig *config ) { - KCmdLineArgs *arg = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *arg = TDECmdLineArgs::parsedArgs(); mTheme = arg->getOption("theme"); if (mTheme.isEmpty()) { @@ -357,7 +357,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri TQString libName; TQString objName; // Replace this test by a "nodcop" command line option. - if ( /*!mKsTheme->managedMode() ||*/ !KCmdLineArgs::parsedArgs()->isSet( "dcop" ) ) + if ( /*!mKsTheme->managedMode() ||*/ !TDECmdLineArgs::parsedArgs()->isSet( "dcop" ) ) { libName = TQString("ksplash%1").arg(pluginName.lower()); objName = TQString("Theme%1").arg(pluginName); diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index 16fc0bd96..5a4bf2225 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -298,16 +298,16 @@ int main( int argc, char *argv[] ) aboutData.addAuthor( "David Faure", 0, "faure@kde.org" ); aboutData.addAuthor( "Richard J. Moore", 0, "rich@kde.org" ); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() == 0 ) - KCmdLineArgs::usage(i18n("No command specified")); + TDECmdLineArgs::usage(i18n("No command specified")); for(int i=0; i < args->count(); i++) proc << args->arg(i); diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 6b6a36a39..8a137d9b4 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -568,8 +568,8 @@ int main( int argc, char** argv ) "module of William LeFebvre's \"top\" utility." ), "tk@Genetik.Uni-Bielefeld.DE" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication::disableAutoDcopRegistration(); // initialize KDE application @@ -578,7 +578,7 @@ int main( int argc, char** argv ) KSGRD::SensorMgr = new KSGRD::SensorManager(); KSGRD::Style = new KSGRD::StyleEngine(); - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); int result = 0; diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp index eef6c541e..588cf25b1 100644 --- a/ksystraycmd/main.cpp +++ b/ksystraycmd/main.cpp @@ -55,15 +55,15 @@ int main( int argc, char *argv[] ) "(C) 2001-2002 Richard Moore (rich@kde.org)" ); aboutData.addAuthor( "Richard Moore", 0, "rich@kde.org" ); - 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; // // Setup the tray icon from the arguments. // - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KSysTrayCmd cmd; // Read the window id @@ -90,7 +90,7 @@ int main( int argc, char *argv[] ) cmd.setPattern( title ); if ( !title && !wid && (args->count() == 0) ) - KCmdLineArgs::usage(i18n("No command or window specified")); + TDECmdLineArgs::usage(i18n("No command or window specified")); // Read the command TQString command; diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp index 3ddbba05a..25633881e 100644 --- a/ktip/ktipwindow.cpp +++ b/ktip/ktipwindow.cpp @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) KAboutData aboutData("ktip", I18N_NOOP("KTip"), "0.3", description, KAboutData::License_GPL, "(c) 1998-2002, KDE Developers"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 629ff5982..d564241d4 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -377,7 +377,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) KAboutData about("kxkb", I18N_NOOP("TDE Keyboard Tool"), "1.0", DESCRIPTION, KAboutData::License_LGPL, "Copyright (C) 2001, S.R.Haque\n(C) 2002-2003, 2006 Andriy Rysin"); - KCmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::init(argc, argv, &about); KXKBApp::addCmdLineOptions(); if (!KXKBApp::start()) diff --git a/libkonq/tests/konqdragtest.cpp b/libkonq/tests/konqdragtest.cpp index 43d1a28df..347bee3ae 100644 --- a/libkonq/tests/konqdragtest.cpp +++ b/libkonq/tests/konqdragtest.cpp @@ -54,7 +54,7 @@ void testKonqIconDrag2() int main(int argc, char *argv[]) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 ); + TDECmdLineArgs::init( argc, argv, "kurltest", 0, 0, 0, 0 ); KApplication app; // GUI needed for QPixmaps testKonqIconDrag2(); diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index 6570c3912..5f3db42f4 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -530,9 +530,9 @@ int main( int argc, char **argv ) "(c) 2000,2001 by Stefan Schimanski" ); KLocale::setMainCatalogue("nsplugin"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); showProgress = args->isSet("verbose"); if (showProgress) { diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp index 0d9eadf29..93ebaccde 100644 --- a/nsplugins/test/testnsplugin.cpp +++ b/nsplugins/test/testnsplugin.cpp @@ -124,7 +124,7 @@ int main(int argc, char *argv[]) { kdDebug() << "main" << endl; setvbuf( stderr, NULL, _IONBF, 0 ); - KCmdLineArgs::init(argc, argv, "nsplugin", "A Netscape Plugin test program", "0.1"); + TDECmdLineArgs::init(argc, argv, "nsplugin", "A Netscape Plugin test program", "0.1"); KApplication app("nsplugin"); diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp index 4150300fa..b09608afb 100644 --- a/tdeinit/displayconfig.cpp +++ b/tdeinit/displayconfig.cpp @@ -54,8 +54,8 @@ int main(int argc, char **argv) KAboutData about("tdeinit_displayconfig", I18N_NOOP("tdeinit_displayconfig"), version, description, KAboutData::License_GPL, "(C) 2013 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net"); about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication::disableAutoDcopRegistration(); KApplication app; diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp index 32f5249ac..7eb8add78 100644 --- a/tdeinit/phase1.cpp +++ b/tdeinit/phase1.cpp @@ -50,8 +50,8 @@ int main(int argc, char **argv) KAboutData about("tdeinit_phase1", I18N_NOOP("tdeinit_phase1"), version, description, KAboutData::License_GPL, "(C) 2012 Timothy Pearson", 0, 0, "kb9vqf@pearsoncomputing.net"); about.addAuthor( "Timothy Pearson", 0, "kb9vqf@pearsoncomputing.net" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication::disableAutoDcopRegistration(); KApplication app; diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index 7d72dbd5b..bd104c72f 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -108,7 +108,7 @@ int KJobViewerApp::newInstance() void KJobViewerApp::initialize() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool showIt = args->isSet("show"); bool all = args->isSet("all"); QString prname = args->getOption("d"); diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp index e75a00e13..417929339 100644 --- a/tdeprint/kjobviewer/main.cpp +++ b/tdeprint/kjobviewer/main.cpp @@ -37,8 +37,8 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) { KAboutData aboutData("kjobviewer",I18N_NOOP("KJobViewer"),"0.1",I18N_NOOP("A print job viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org"); aboutData.addAuthor("Michael Goffioul",0,"tdeprint@swing.be"); - KCmdLineArgs::init(argc,argv,&aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KJobViewerApp::addCmdLineOptions(); if (!KJobViewerApp::start()) diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp index 7505127ec..8a36512c9 100644 --- a/tdeprint/kprinter/main.cpp +++ b/tdeprint/kprinter/main.cpp @@ -44,8 +44,8 @@ static KCmdLineOptions options[] = extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) { - KCmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("KPrinter"),I18N_NOOP("A printer tool for TDE" ),"0.0.1"); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc,argv,"kprinter",I18N_NOOP("KPrinter"),I18N_NOOP("A printer tool for TDE" ),"0.0.1"); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; PrintWrapper *wrap = new PrintWrapper; app.setMainWidget(wrap); diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp index e0862271c..97e2cad8f 100644 --- a/tdeprint/kprinter/printwrapper.cpp +++ b/tdeprint/kprinter/printwrapper.cpp @@ -135,7 +135,7 @@ PrintWrapper::PrintWrapper() void PrintWrapper::slotPrint() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) struct sigaction action; diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp index 89d784434..d337b11a6 100644 --- a/tdeprint/slave/kio_print.cpp +++ b/tdeprint/slave/kio_print.cpp @@ -147,7 +147,7 @@ int kdemain(int argc, char **argv) /* create fake KApplicatiom object, needed for job stuffs */ KAboutData about( "kio_print", "kio_print", "fake_version", "TDEPrint IO slave", KAboutData::License_GPL, "(c) 2003, Michael Goffioul" ); - KCmdLineArgs::init( &about ); + TDECmdLineArgs::init( &about ); KApplication app; KIO_Print slave(argv[2], argv[3]); diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp index 4fe22a3b6..0732505b4 100644 --- a/tdeprint/tdeprintfax/main.cpp +++ b/tdeprint/tdeprintfax/main.cpp @@ -51,12 +51,12 @@ int main(int argc, char *argv[]) "1.0", description, KAboutData::License_GPL, "(c), 2001 Michael Goffioul", 0, "http://printing.kde.org"); aboutData.addAuthor("Michael Goffioul",0, "tdeprint@swing.be"); - 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::addCmdLineOptions(); KApplication a; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KdeprintFax *w = new KdeprintFax; a.setMainWidget(w); diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index 8ea82fbbd..97fb0fbfa 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -106,8 +106,8 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Pietro Iglio", I18N_NOOP("Original author"), "iglio@fub.it"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication::disableAutoDcopRegistration(); // tdesu doesn't process SM events, so don't even connect to ksmserver TQCString session_manager = getenv( "SESSION_MANAGER" ); @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) static int startApp() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // Stop daemon and exit? if (args->isSet("s")) { @@ -205,7 +205,7 @@ static int startApp() int priority = tmp.toInt(&ok); if (!ok || (priority < 0) || (priority > 100)) { - KCmdLineArgs::usage(i18n("Illegal priority: %1").arg(static_cast(tmp))); + TDECmdLineArgs::usage(i18n("Illegal priority: %1").arg(static_cast(tmp))); exit(1); } int scheduler = SuProcess::SchedNormal; @@ -233,7 +233,7 @@ static int startApp() { if( args->count() == 0 ) { - KCmdLineArgs::usage(i18n("No command specified.")); + TDECmdLineArgs::usage(i18n("No command specified.")); exit(1); } command = args->arg(0); diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp index 596e2e842..7d425e971 100644 --- a/tdesu/tdesud/tdesud.cpp +++ b/tdesu/tdesud/tdesud.cpp @@ -257,7 +257,7 @@ int main(int argc, char *argv[]) "Copyright (c) 1999,2000 Geert Jansen"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Author"), "jansen@kde.org", "http://www.stack.nl/~geertj/"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KInstance instance(&aboutData); // Set core dump size to 0 diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index bd96766b9..707cdd372 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -195,7 +195,7 @@ void kg_main( const char *argv0 ) { static char *argv[] = { (char *)"tdmgreet", 0 }; - KCmdLineArgs::init( 1, argv, *argv, 0, 0, 0, true ); + TDECmdLineArgs::init( 1, argv, *argv, 0, 0, 0, true ); kdDebug() << timestamp() << "start" << endl; kde_have_kipc = false; diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 8fac7d76a..69faf2d7c 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -118,10 +118,10 @@ main( int argc, char *argv[] ) KApplication::disableAutoDcopRegistration(); KLocale::setMainCatalogue( "kdesktop" ); - KCmdLineArgs::init( argc, argv, "krootimage", I18N_NOOP( "KRootImage" ), description, version ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, "krootimage", I18N_NOOP( "KRootImage" ), description, version ); + TDECmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (!args->count()) args->usage(); MyApplication app( args->arg( 0 ) ); diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp index c67a2d227..c9bb6133c 100644 --- a/twin/clients/kwmtheme/cli_installer/main.cpp +++ b/twin/clients/kwmtheme/cli_installer/main.cpp @@ -39,10 +39,10 @@ void copy(const TQString &src, const TQString &dest) int main(int argc, char **argv) { - KCmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1"); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1"); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app(argc, argv); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if(!args->count()){ kdWarning() << "You need to specify the path to a theme config file!" << endl; return(1); diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp index 30cce3ffa..c29dacdaa 100644 --- a/twin/kcmtwin/twinrules/main.cpp +++ b/twin/kcmtwin/twinrules/main.cpp @@ -276,18 +276,18 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) { KLocale::setMainCatalogue( "kcmtwinrules" ); - KCmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ), + TDECmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "TWin" ), I18N_NOOP( "TWin helper utility" ), "1.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); bool id_ok = false; Window id = args->getOption( "wid" ).toULong( &id_ok ); bool whole_app = args->isSet( "whole-app" ); args->clear(); if( !id_ok || id == None ) { - KCmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." )); + TDECmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." )); return 1; } return KWinInternal::edit( id, whole_app ); diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp index 18fbac02b..46969da7f 100644 --- a/twin/killer/killer.cpp +++ b/twin/killer/killer.cpp @@ -46,11 +46,11 @@ static const KCmdLineOptions options[] = int main( int argc, char* argv[] ) { KLocale::setMainCatalogue( "twin" ); // the messages are in twin's .po file - KCmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "TWin" ), + TDECmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "TWin" ), I18N_NOOP( "TWin helper utility" ), "1.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TQCString hostname = args->getOption( "hostname" ); bool pid_ok = false; pid_t pid = args->getOption( "pid" ).toULong( &pid_ok ); @@ -64,7 +64,7 @@ int main( int argc, char* argv[] ) if( !pid_ok || pid == 0 || !id_ok || id == None || !time_ok || timestamp == CurrentTime || hostname.isEmpty() || caption.isEmpty() || appname.isEmpty()) { - KCmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." )); + TDECmdLineArgs::usage( i18n( "This helper utility is not supposed to be called directly." )); return 1; } TQString question = i18n( diff --git a/twin/main.cpp b/twin/main.cpp index 316892257..df2470c3e 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -88,7 +88,7 @@ Application::Application( ) // I'm special... setQuitOnLastWindowClosed(false); #endif // USE_QT4 - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if (!config()->isImmutable() && args->isSet("lock")) { config()->setReadOnly(true); @@ -317,8 +317,8 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) aboutData.addAuthor("Daniel M. Duley",0, "mosfet@kde.org"); aboutData.addAuthor("Luboš Luňák", I18N_NOOP( "Maintainer" ), "l.lunak@kde.org"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( args ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( args ); if (signal(SIGTERM, KWinInternal::sighandler) == SIG_IGN) signal(SIGTERM, SIG_IGN); diff --git a/twin/resumer/resumer.cpp b/twin/resumer/resumer.cpp index e2ee0d55b..0b9c199cd 100644 --- a/twin/resumer/resumer.cpp +++ b/twin/resumer/resumer.cpp @@ -45,11 +45,11 @@ static const KCmdLineOptions options[] = int main( int argc, char* argv[] ) { KLocale::setMainCatalogue( "twin" ); // the messages are in twin's .po file - KCmdLineArgs::init( argc, argv, "twin_resume_helper", I18N_NOOP( "TWin" ), + TDECmdLineArgs::init( argc, argv, "twin_resume_helper", I18N_NOOP( "TWin" ), I18N_NOOP( "TWin helper utility" ), "1.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TQCString hostname = args->getOption( "hostname" ); bool pid_ok = false; pid_t pid = args->getOption( "pid" ).toULong( &pid_ok ); diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp index d89f773d0..2537d9f6b 100644 --- a/twin/tools/decobenchmark/main.cpp +++ b/twin/tools/decobenchmark/main.cpp @@ -102,13 +102,13 @@ int main(int argc, char** argv) TQString style = "keramik"; // KApplication app(argc, argv); KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() != 3) - KCmdLineArgs::usage("Wrong number of arguments!"); + TDECmdLineArgs::usage("Wrong number of arguments!"); TQString library = TQString(args->arg(0) ); TQString t = TQString(args->arg(1) ); @@ -126,7 +126,7 @@ int main(int argc, char** argv) else if (t == "recreation") test = RecreationTest; else - KCmdLineArgs::usage("Specify a valid test!"); + TDECmdLineArgs::usage("Specify a valid test!"); DecoBenchApplication app(library, test, count);