From 5466d52073af147d100482cbf633087bb9fb631b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:46:01 -0600 Subject: [PATCH] Rename KCmd to avoid conflicts with KDE4 --- arts/kde/kconverttest.cc | 4 +-- arts/kde/kiotest.cc | 4 +-- arts/kde/kiotestslow.cc | 4 +-- arts/message/artsmessage.cc | 4 +-- kabc/tdeab2tdeabc.cpp | 4 +-- kabc/tests/testaddressee.cpp | 4 +-- kabc/tests/testaddresseelist.cpp | 4 +-- kabc/tests/testaddressfmt.cpp | 4 +-- kabc/tests/testdistlist.cpp | 4 +-- kabc/tests/testkabcdlg.cpp | 4 +-- kabc/tests/testlock.cpp | 4 +-- kabc/vcardparser/testread.cpp | 4 +-- kate/part/test_regression.cpp | 4 +-- kded/kded.cpp | 4 +-- kded/khostname.cpp | 4 +-- kded/tde-menu.cpp | 4 +-- kded/tdebuildsycoca.cpp | 4 +-- kdewidgets/makekdewidgets.cpp | 4 +-- kdoctools/meinproc.cpp | 4 +-- kinit/tdelauncher_main.cpp | 4 +-- knewstuff/tdehotnewstuff.cpp | 4 +-- libtdescreensaver/main.cpp | 4 +-- tdecmshell/main.cpp | 4 +-- tdeconf_update/tdeconf_update.cpp | 4 +-- tdecore/kapplication.cpp | 8 ++--- tdecore/kcmdlineargs.cpp | 36 +++++++++---------- tdecore/kcmdlineargs.h | 36 +++++++++---------- tdecore/kdetcompmgr.cpp | 4 +-- tdecore/kuniqueapplication.cpp | 4 +-- tdecore/tde-config.cpp.cmake | 2 +- tdecore/tde-config.cpp.in | 2 +- .../tdeconfig_compiler/tdeconfig_compiler.cpp | 4 +-- tdecore/tests/kcalendartest.cpp | 2 +- tdecore/tests/kcmdlineargstest.cpp | 4 +-- tdecore/tests/kmdcodectest.cpp | 4 +-- tdecore/tests/testqtargs.cpp | 6 ++-- tdehtml/java/tests/testkjavaappletserver.cpp | 4 +-- tdehtml/test_regression.cpp | 4 +-- tdehtml/testtdehtml.cpp | 2 +- tdeio/misc/tdefile/fileprops.cpp | 4 +-- tdeio/misc/tdemailservice.cpp | 4 +-- tdeio/misc/tdesendbugmail/main.cpp | 4 +-- tdeio/misc/tdetelnetservice.cpp | 4 +-- tdeio/tdeioexec/main.cpp | 4 +-- tdeio/tests/kdirwatchtest.cpp | 4 +-- tdeio/tests/kionetrctest.cpp | 4 +-- tdeio/tests/kmimefromext.cpp | 4 +-- tdeio/tests/kpropsdlgtest.cpp | 4 +-- tdeio/tests/kurifiltertest.cpp | 4 +-- tdeio/tests/metatest.cpp | 4 +-- tdeio/tests/speed.cpp | 4 +-- tdeio/tests/tdeioslavetest.cpp | 4 +-- tdeio/tests/tdetradertest.cpp | 4 +-- tdeioslave/http/http_cache_cleaner.cpp | 4 +-- tdeioslave/http/kcookiejar/main.cpp | 4 +-- .../http/kcookiejar/tests/kcookiejartest.cpp | 4 +-- tdeparts/tests/ghostview.cpp | 4 +-- tdeprint/cups/cupsdconf2/main.cpp | 4 +-- tdeprint/management/kaddprinterwizard.cpp | 4 +-- .../tests/kpixmapregionselectordialogtest.cpp | 4 +-- tdeunittest/modrunner.cpp | 4 +-- tdeunittest/tester.h | 2 +- 62 files changed, 154 insertions(+), 154 deletions(-) diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc index 63f5ae536..42fd98072 100644 --- a/arts/kde/kconverttest.cc +++ b/arts/kde/kconverttest.cc @@ -18,10 +18,10 @@ using namespace std; using namespace Arts; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP("URL to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; KConvertTest::KConvertTest() diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc index f838c4f77..cb26a649f 100644 --- a/arts/kde/kiotest.cc +++ b/arts/kde/kiotest.cc @@ -12,10 +12,10 @@ using namespace std; using namespace Arts; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP("URL to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc index ffb71d8b1..ffeceafd5 100644 --- a/arts/kde/kiotestslow.cc +++ b/arts/kde/kiotestslow.cc @@ -78,10 +78,10 @@ public: REGISTER_IMPLEMENTATION(KIOTestSlow_impl); }; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP("URL to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; #undef USE_FILEINPUTSTREAM diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc index 77f2a6185..389d09bf9 100644 --- a/arts/message/artsmessage.cc +++ b/arts/message/artsmessage.cc @@ -39,7 +39,7 @@ Gnome, etc. and used instead. #include // command line options -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "e", 0,0 }, { "error", I18N_NOOP("Display error message (default)"), 0 }, @@ -48,7 +48,7 @@ static KCmdLineOptions options[] = { "i", 0, 0 }, { "info", I18N_NOOP("Display informational message"), 0 }, { "+message", I18N_NOOP("Message string to be displayed"), 0 }, - KCmdLineLastOption // End of options. + TDECmdLineLastOption // End of options. }; TDEAboutData aboutData("artsmessage", I18N_NOOP("artsmessage"), "0.1", diff --git a/kabc/tdeab2tdeabc.cpp b/kabc/tdeab2tdeabc.cpp index 6ee33b895..5472f3bc2 100644 --- a/kabc/tdeab2tdeabc.cpp +++ b/kabc/tdeab2tdeabc.cpp @@ -37,13 +37,13 @@ using namespace KABC; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "disable-autostart", I18N_NOOP( "Disable automatic startup on login" ), 0 }, { "quiet", "", 0 }, { "o", 0, 0 }, { "override", I18N_NOOP( "Override existing entries" ), "1" }, - KCmdLineLastOption + TDECmdLineLastOption }; void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab ) diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp index 9b4993dcc..956af2b75 100644 --- a/kabc/tests/testaddressee.cpp +++ b/kabc/tests/testaddressee.cpp @@ -13,11 +13,11 @@ using namespace KABC; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "save", "", 0 }, { "number", "", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc,char **argv) diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp index 98e5be506..be14da540 100644 --- a/kabc/tests/testaddresseelist.cpp +++ b/kabc/tests/testaddresseelist.cpp @@ -10,11 +10,11 @@ using namespace KABC; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "save", "", 0 }, { "number", "", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int /*argc*/,char /* **argv*/) diff --git a/kabc/tests/testaddressfmt.cpp b/kabc/tests/testaddressfmt.cpp index b66c7ad01..0c4ae1439 100644 --- a/kabc/tests/testaddressfmt.cpp +++ b/kabc/tests/testaddressfmt.cpp @@ -10,11 +10,11 @@ using namespace KABC; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "save", "", 0 }, { "number", "", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc,char **argv) diff --git a/kabc/tests/testdistlist.cpp b/kabc/tests/testdistlist.cpp index e46d90d78..18e223e9a 100644 --- a/kabc/tests/testdistlist.cpp +++ b/kabc/tests/testdistlist.cpp @@ -13,10 +13,10 @@ using namespace KABC; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { {"list ", I18N_NOOP("Show distribution list with name "), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/kabc/tests/testkabcdlg.cpp b/kabc/tests/testkabcdlg.cpp index 1d328f239..183c6a19d 100644 --- a/kabc/tests/testkabcdlg.cpp +++ b/kabc/tests/testkabcdlg.cpp @@ -10,10 +10,10 @@ using namespace KABC; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { {"multiple", I18N_NOOP("Allow selection of multiple addressees"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc,char **argv) diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp index 701b94481..389819ea7 100644 --- a/kabc/tests/testlock.cpp +++ b/kabc/tests/testlock.cpp @@ -153,14 +153,14 @@ void LockWidget::unlock() } -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "a", 0, 0 }, { "addressbook", "Standard address book", 0 }, { "d", 0, 0 }, { "diraddressbook", "Standard address book directory resource", 0 }, { "+identifier", "Identifier of resource to be locked, e.g. filename", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc,char **argv) diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp index 50ff8b09b..ebe5f14b2 100644 --- a/kabc/vcardparser/testread.cpp +++ b/kabc/vcardparser/testread.cpp @@ -33,11 +33,11 @@ #include "vcardconverter.h" #include "vcard.h" -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { {"vcard21", I18N_NOOP("vCard 2.1"), 0}, {"+inputfile", I18N_NOOP("Input file"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char **argv ) diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index 8dabeb2f6..5c10143ea 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -371,7 +371,7 @@ static TQString findMostRecentFailureSnapshot() { return dir[0].mid(sizeof failureSnapshotPrefix - 1); } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "b", 0, 0 }, { "base ", "Directory containing tests, basedir and output directories.", 0}, @@ -390,7 +390,7 @@ static KCmdLineOptions options[] = { "output ", "Put output in instead of /output", 0 } , { "+[base_dir]", "Directory containing tests,basedir and output directories. Only regarded if -b is not specified.", 0 } , { "+[testcases]", "Relative path to testcase, or directory of testcases to be run (equivalent to -t).", 0 } , - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/kded/kded.cpp b/kded/kded.cpp index f54c4730c..774712e0e 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -730,11 +730,11 @@ void KHostnameD::checkHostname() } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "check", I18N_NOOP("Check Sycoca database only once"), 0 }, { "new-startup", "Internal", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; class KDEDQtDCOPObject : public DCOPObject diff --git a/kded/khostname.cpp b/kded/khostname.cpp index 7bdc12858..227106eea 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -37,10 +37,10 @@ #include #include -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "+old", I18N_NOOP("Old hostname"), 0 }, { "+new", I18N_NOOP("New hostname"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static const char appName[] = "kdontchangethehostname"; diff --git a/kded/tde-menu.cpp b/kded/tde-menu.cpp index e1f79f77c..fa2d220af 100644 --- a/kded/tde-menu.cpp +++ b/kded/tde-menu.cpp @@ -32,14 +32,14 @@ #include "kservicegroup.h" #include "kstandarddirs.h" -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "utf8", I18N_NOOP("Output data in UTF-8 instead of local encoding"), 0 }, { "print-menu-id", I18N_NOOP("Print menu-id of the menu that contains\nthe application"), 0 }, { "print-menu-name", I18N_NOOP("Print menu name (caption) of the menu that\ncontains the application"), 0 }, { "highlight", I18N_NOOP("Highlight the entry in the menu"), 0 }, { "nocache-update", I18N_NOOP("Do not check if sycoca database is up to date"), 0 }, { "+", I18N_NOOP("The id of the menu entry to locate"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static const char appName[] = "tde-menu"; diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp index 87fdc0ba7..74eba4a1b 100644 --- a/kded/tdebuildsycoca.cpp +++ b/kded/tdebuildsycoca.cpp @@ -691,7 +691,7 @@ TQStringList KBuildSycoca::existingResourceDirs() return *dirs; } -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "nosignal", I18N_NOOP("Do not signal applications to update"), 0 }, { "noincremental", I18N_NOOP("Disable incremental update, re-read everything"), 0 }, { "checkstamps", I18N_NOOP("Check file timestamps"), 0 }, @@ -703,7 +703,7 @@ static KCmdLineOptions options[] = { { "silent", I18N_NOOP("Silent - work without windows and stderr"), 0 }, { "showprogress", I18N_NOOP("Show progress information (even if 'silent' mode is on)"), 0 }, #endif - KCmdLineLastOption + TDECmdLineLastOption }; static const char appName[] = "tdebuildsycoca"; diff --git a/kdewidgets/makekdewidgets.cpp b/kdewidgets/makekdewidgets.cpp index ea84c61b7..e6208de0f 100644 --- a/kdewidgets/makekdewidgets.cpp +++ b/kdewidgets/makekdewidgets.cpp @@ -107,14 +107,14 @@ static const char endCreate[] = " return 0;\n" "KDE_Q_EXPORT_PLUGIN(%PluginName)\n"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+file", I18N_NOOP( "Input file" ), 0 }, { "o ", I18N_NOOP( "Output file" ), 0 }, { "n ", I18N_NOOP( "Name of the plugin class to generate" ), "WidgetsPlugin" }, { "g ", I18N_NOOP( "Default widget group name to display in designer" ), "Custom" }, { "p ", I18N_NOOP( "Embed pixmaps from a source directory" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group ); diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp index 91d973c0b..730dd38d0 100644 --- a/kdoctools/meinproc.cpp +++ b/kdoctools/meinproc.cpp @@ -69,7 +69,7 @@ void parseEntry(PairList &list, xmlNodePtr cur, int base) } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "stylesheet ", I18N_NOOP( "Stylesheet to use" ), 0 }, { "stdout", I18N_NOOP( "Output whole document to stdout" ), 0 }, @@ -81,7 +81,7 @@ static KCmdLineOptions options[] = { "srcdir ", I18N_NOOP( "Set the srcdir, for tdelibs" ), 0}, { "param =", I18N_NOOP( "Parameters to pass to the stylesheet" ), 0}, { "+xml", I18N_NOOP("The file to transform"), 0}, - KCmdLineLastOption // End of options. + TDECmdLineLastOption // End of options. }; diff --git a/kinit/tdelauncher_main.cpp b/kinit/tdelauncher_main.cpp index b4e26eded..3ceadf84c 100644 --- a/kinit/tdelauncher_main.cpp +++ b/kinit/tdelauncher_main.cpp @@ -44,10 +44,10 @@ static void sig_handler(int sig_num) TDELauncher::destruct(255); } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "new-startup", "Internal", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain( int argc, char**argv ) diff --git a/knewstuff/tdehotnewstuff.cpp b/knewstuff/tdehotnewstuff.cpp index 7b8ceae9c..5a496328b 100644 --- a/knewstuff/tdehotnewstuff.cpp +++ b/knewstuff/tdehotnewstuff.cpp @@ -26,11 +26,11 @@ #include "downloaddialog.h" -static const KCmdLineOptions op[] = +static const TDECmdLineOptions op[] = { {"type ", I18N_NOOP("Display only media of this type"), 0}, {"+[providerlist]", I18N_NOOP("Provider list to use"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/libtdescreensaver/main.cpp b/libtdescreensaver/main.cpp index 50a61f938..aa4fa8395 100644 --- a/libtdescreensaver/main.cpp +++ b/libtdescreensaver/main.cpp @@ -43,13 +43,13 @@ extern "C" TQDialog *kss_setup(); } -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "setup", I18N_NOOP("Setup screen saver"), 0 }, { "window-id wid", I18N_NOOP("Run in the specified XWindow"), 0 }, { "root", I18N_NOOP("Run in the root XWindow"), 0 }, { "demo", I18N_NOOP("Start screen saver in demo mode"), "default"}, - KCmdLineLastOption + TDECmdLineLastOption }; static void crashHandler( int ) diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp index 3415565a8..2174dfc36 100644 --- a/tdecmshell/main.cpp +++ b/tdecmshell/main.cpp @@ -51,7 +51,7 @@ using namespace std; KService::List m_modules; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "list", I18N_NOOP("List all possible modules"), 0}, { "+module", I18N_NOOP("Configuration module to open"), 0 }, @@ -59,7 +59,7 @@ static KCmdLineOptions options[] = { "embed ", I18N_NOOP("Embeds the module with buttons in window with id "), 0 }, { "embed-proxy ", I18N_NOOP("Embeds the module without buttons in window with id "), 0 }, { "silent", I18N_NOOP("Do not display main window"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static void listModules(const TQString &baseGroup) diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp index 206711274..208faa503 100644 --- a/tdeconf_update/tdeconf_update.cpp +++ b/tdeconf_update/tdeconf_update.cpp @@ -38,12 +38,12 @@ #include #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "debug", I18N_NOOP("Keep output results from scripts"), 0 }, { "check ", I18N_NOOP("Check whether config file itself requires updating"), 0 }, { "+[file]", I18N_NOOP("File to read update instructions from"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; class KonfUpdate diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index 25dc61e15..15c8a132b 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -1505,7 +1505,7 @@ void TDEApplication::dcopFailure(const TQString &msg) } } -static const KCmdLineOptions qt_options[] = +static const TDECmdLineOptions qt_options[] = { //FIXME: Check if other options are specific to Qt/X11 #ifdef Q_WS_X11 @@ -1539,10 +1539,10 @@ static const KCmdLineOptions qt_options[] = { "qws", I18N_NOOP("forces the application to run as QWS Server"), 0}, #endif { "reverse", I18N_NOOP("mirrors the whole layout of widgets"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; -static const KCmdLineOptions kde_options[] = +static const TDECmdLineOptions kde_options[] = { { "caption ", I18N_NOOP("Use 'caption' as name in the titlebar"), 0}, { "icon ", I18N_NOOP("Use 'icon' as the application icon"), 0}, @@ -1556,7 +1556,7 @@ static const KCmdLineOptions kde_options[] = { "smkey ", 0, 0}, // this option is obsolete and exists only to allow smooth upgrades from sessions // saved under Qt 3.0.x -- Qt 3.1.x includes the session key now automatically in // the session id (Simon) - KCmdLineLastOption + TDECmdLineLastOption }; void diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp index b5af05f20..9617125a5 100644 --- a/tdecore/kcmdlineargs.cpp +++ b/tdecore/kcmdlineargs.cpp @@ -56,14 +56,14 @@ template class TQAsciiDict; template class TQPtrList; -class KCmdLineParsedOptions : public TQAsciiDict +class TDECmdLineParsedOptions : public TQAsciiDict { public: - KCmdLineParsedOptions() + TDECmdLineParsedOptions() : TQAsciiDict( 7 ) { } // WABA: Huh? - // The compiler doesn't find KCmdLineParsedOptions::write(s) by itself ??? + // The compiler doesn't find TDECmdLineParsedOptions::write(s) by itself ??? // WABA: No, because there is another write function that hides the // write function in the base class even though this function has a // different signature. (obscure C++ feature) @@ -91,10 +91,10 @@ protected: }; -class KCmdLineParsedArgs : public TQStrList +class TDECmdLineParsedArgs : public TQStrList { public: - KCmdLineParsedArgs() + TDECmdLineParsedArgs() : TQStrList( true ) { } TQDataStream& save( TQDataStream &s) const { return TQGList::write(s); } @@ -203,7 +203,7 @@ const char * TDECmdLineArgs::appName() } void -TDECmdLineArgs::addCmdLineOptions( const KCmdLineOptions *options, const char *name, +TDECmdLineArgs::addCmdLineOptions( const TDECmdLineOptions *options, const char *name, const char *id, const char *afterId) { if (!argsList) @@ -352,7 +352,7 @@ void TDECmdLineArgs::removeArgs(const char *id) * +4 - no more options follow // !fork */ static int -findOption(const KCmdLineOptions *options, TQCString &opt, +findOption(const TDECmdLineOptions *options, TQCString &opt, const char *&opt_name, const char *&def, bool &enabled) { int result; @@ -549,7 +549,7 @@ TDECmdLineArgs::parseAllArgs() TDECmdLineArgs *appOptions = argsList->last(); if (!appOptions->id) { - const KCmdLineOptions *option = appOptions->options; + const TDECmdLineOptions *option = appOptions->options; while(option && option->name) { if (option->name[0] == '+') @@ -801,7 +801,7 @@ TDECmdLineArgs::usage(const char *id) TDECmdLineArgs *appOptions = argsList->last(); if (!appOptions->id) { - const KCmdLineOptions *option = appOptions->options; + const TDECmdLineOptions *option = appOptions->options; while(option && option->name) { if (option->name[0] == '+') @@ -864,7 +864,7 @@ TDECmdLineArgs::usage(const char *id) while (args) { - const KCmdLineOptions *option = args->options; + const TDECmdLineOptions *option = args->options; TQCString opt = ""; // while(option && option->name) @@ -986,7 +986,7 @@ TDECmdLineArgs::usage(const char *id) * * The given arguments are assumed to be constants. */ -TDECmdLineArgs::TDECmdLineArgs( const KCmdLineOptions *_options, +TDECmdLineArgs::TDECmdLineArgs( const TDECmdLineOptions *_options, const char *_name, const char *_id) : options(_options), name(_name), id(_id) { @@ -1045,8 +1045,8 @@ TDECmdLineArgs::save( TQDataStream &ds) const void TDECmdLineArgs::load( TQDataStream &ds) { - if (!parsedOptionList) parsedOptionList = new KCmdLineParsedOptions; - if (!parsedArgList) parsedArgList = new KCmdLineParsedArgs; + if (!parsedOptionList) parsedOptionList = new TDECmdLineParsedOptions; + if (!parsedArgList) parsedArgList = new TDECmdLineParsedArgs; parsedOptionList->load( ds ); parsedArgList->load( ds ); @@ -1076,7 +1076,7 @@ TDECmdLineArgs::setOption(const TQCString &opt, bool enabled) addArgument(arg); } if (!parsedOptionList) { - parsedOptionList = new KCmdLineParsedOptions; + parsedOptionList = new TDECmdLineParsedOptions; parsedOptionList->setAutoDelete(true); } @@ -1106,7 +1106,7 @@ TDECmdLineArgs::setOption(const TQCString &opt, const char *value) #endif } if (!parsedOptionList) { - parsedOptionList = new KCmdLineParsedOptions; + parsedOptionList = new TDECmdLineParsedOptions; parsedOptionList->setAutoDelete(true); } @@ -1272,15 +1272,15 @@ void TDECmdLineArgs::addArgument(const char *argument) { if (!parsedArgList) - parsedArgList = new KCmdLineParsedArgs; + parsedArgList = new TDECmdLineParsedArgs; parsedArgList->append(argument); } -static const KCmdLineOptions kde_tempfile_option[] = +static const TDECmdLineOptions kde_tempfile_option[] = { { "tempfile", I18N_NOOP("The files/URLs opened by the application will be deleted after use"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; void diff --git a/tdecore/kcmdlineargs.h b/tdecore/kcmdlineargs.h index 09a6a6558..9b7dc0f4f 100644 --- a/tdecore/kcmdlineargs.h +++ b/tdecore/kcmdlineargs.h @@ -37,7 +37,7 @@ typedef TQValueList QCStringList; * * @see TDECmdLineArgs for additional usage information */ -struct TDECORE_EXPORT KCmdLineOptions +struct TDECORE_EXPORT TDECmdLineOptions { /** * The name of the argument as it should be called on the command line and @@ -65,13 +65,13 @@ struct TDECORE_EXPORT KCmdLineOptions const char *def; // Default }; -#define KCmdLineLastOption { 0, 0, 0 } +#define TDECmdLineLastOption { 0, 0, 0 } class TDECmdLineArgsList; class TDEApplication; class KUniqueApplication; -class KCmdLineParsedOptions; -class KCmdLineParsedArgs; +class TDECmdLineParsedOptions; +class TDECmdLineParsedArgs; class TDEAboutData; class TDECmdLineArgsPrivate; @@ -136,10 +136,10 @@ class TDECmdLineArgsPrivate; * \endcode * * The options that an application supports are configured using the - * KCmdLineOptions class. An example is shown below: + * TDECmdLineOptions class. An example is shown below: * * \code - * static const KCmdLineOptions options[] = + * static const TDECmdLineOptions options[] = * { * { "a", I18N_NOOP("A short binary option"), 0 }, * { "b \", I18N_NOOP("A short option which takes an argument"), 0 }, @@ -160,7 +160,7 @@ class TDECmdLineArgsPrivate; * { "+[arg1]", I18N_NOOP("An optional argument 'arg1'"), 0 }, * { "!+command", I18N_NOOP("A required argument 'command', that can contain multiple words, even starting with '-'"), 0 }, * { "", I18N_NOOP("Additional help text not associated with any particular option") 0 }, - * KCmdLineLastOption // End of options. + * TDECmdLineLastOption // End of options. * }; * \endcode * @@ -299,13 +299,13 @@ public: * The list of options should look like this: * * \code - * static KCmdLineOptions options[] = + * static TDECmdLineOptions options[] = * { * { "option1 \", I18N_NOOP("Description 1"), "my_extra_arg" }, * { "o", 0, 0 }, * { "option2", I18N_NOOP("Description 2"), 0 }, * { "nooption3", I18N_NOOP("Description 3"), 0 }, - * KCmdLineLastOption + * TDECmdLineLastOption * } * \endcode * @@ -354,7 +354,7 @@ public: * @param id A name with which these options can be identified, can be 0. * @param afterId The options are inserted after this set of options, can be 0. */ - static void addCmdLineOptions( const KCmdLineOptions *options, + static void addCmdLineOptions( const TDECmdLineOptions *options, const char *name=0, const char *id = 0, const char *afterId=0); @@ -415,7 +415,7 @@ public: /** * Read out a string option. * - * The option must have a corresponding KCmdLineOptions entry + * The option must have a corresponding TDECmdLineOptions entry * of the form: * \code * { "option \", I18N_NOOP("Description"), "default" } @@ -435,7 +435,7 @@ public: /** * Read out all occurrences of a string option. * - * The option must have a corresponding KCmdLineOptions entry + * The option must have a corresponding TDECmdLineOptions entry * of the form: * \code * { "option \", I18N_NOOP("Description"), "default" } @@ -457,11 +457,11 @@ public: * * @return The value of the option. It will be true if the option * was specifically turned on in the command line, or if the option - * is turned on by default (in the KCmdLineOptions list) and was + * is turned on by default (in the TDECmdLineOptions list) and was * not specifically turned off in the command line. Equivalently, * it will be false if the option was specifically turned off in * the command line, or if the option is turned off by default (in - * the KCmdLineOptions list) and was not specifically turned on in + * the TDECmdLineOptions list) and was not specifically turned on in * the command line. */ bool isSet(const char *option) const; @@ -553,7 +553,7 @@ protected: * @internal * Constructor. */ - TDECmdLineArgs( const KCmdLineOptions *_options, const char *_name, + TDECmdLineArgs( const TDECmdLineOptions *_options, const char *_name, const char *_id); /** @@ -666,11 +666,11 @@ private: static void printQ(const TQString &msg); - const KCmdLineOptions *options; + const TDECmdLineOptions *options; const char *name; const char *id; - KCmdLineParsedOptions *parsedOptionList; - KCmdLineParsedArgs *parsedArgList; + TDECmdLineParsedOptions *parsedOptionList; + TDECmdLineParsedArgs *parsedArgList; bool isQt; static TDECmdLineArgsList *argsList; // All options. diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp index e34554073..1c7a6f1c3 100644 --- a/tdecore/kdetcompmgr.cpp +++ b/tdecore/kdetcompmgr.cpp @@ -36,9 +36,9 @@ static const char description[] = static const char version[] = "0.1"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp index ce2b6d47d..fb8cda9fd 100644 --- a/tdecore/kuniqueapplication.cpp +++ b/tdecore/kuniqueapplication.cpp @@ -64,10 +64,10 @@ bool KUniqueApplication::s_multipleInstances = false; bool KUniqueApplication::s_uniqueTestDone = false; bool KUniqueApplication::s_handleAutoStarted = false; -static KCmdLineOptions kunique_options[] = +static TDECmdLineOptions kunique_options[] = { { "nofork", "Don't run in the background.", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; struct DCOPRequest { diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index b633aa2d4..e235c4f8c 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -13,7 +13,7 @@ static const char *description = I18N_NOOP("A little program to output installation paths"); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "expandvars", I18N_NOOP("expand ${prefix} and ${exec_prefix} in output"), 0 }, { "prefix", I18N_NOOP("Compiled in prefix for TDE libraries"), 0 }, diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in index fdcc5ba74..d44ccd6b5 100644 --- a/tdecore/tde-config.cpp.in +++ b/tdecore/tde-config.cpp.in @@ -13,7 +13,7 @@ static const char *description = I18N_NOOP("A little program to output installation paths"); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "expandvars", I18N_NOOP("expand ${prefix} and ${exec_prefix} in output"), 0 }, { "prefix", I18N_NOOP("Compiled in prefix for TDE libraries"), 0 }, diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp index 4069561bb..4a8f52712 100644 --- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp +++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp @@ -39,13 +39,13 @@ #include -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "d", 0, 0 }, { "directory ", I18N_NOOP("Directory to generate files in"), "." }, { "+file.kcfg", I18N_NOOP("Input kcfg XML file"), 0 }, { "+file.kcfgc", I18N_NOOP("Code generation options file"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp index 53ba63615..7856c0430 100644 --- a/tdecore/tests/kcalendartest.cpp +++ b/tdecore/tests/kcalendartest.cpp @@ -20,7 +20,7 @@ void test(TQDate & date); static const char description[] = "KCalendarTest"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "help", I18N_NOOP("Prints this help"), 0 }, { "type hijri|gregorian|jalali|hebrew", I18N_NOOP("Supported calendar types"), 0 }, diff --git a/tdecore/tests/kcmdlineargstest.cpp b/tdecore/tests/kcmdlineargstest.cpp index 940a45153..f05168e1a 100644 --- a/tdecore/tests/kcmdlineargstest.cpp +++ b/tdecore/tests/kcmdlineargstest.cpp @@ -11,13 +11,13 @@ static const char version[] = "v0.0.2 1999 (c) Waldo Bastian"; static const char description[] = I18N_NOP("This is a test program."); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "test", I18N_NOP("do a short test only, note that\n" "this is rather long comment"), 0 }, { "baud ", I18N_NOP("set baudrate"), "9600" }, { "+file(s)", I18N_NOP("Files to load"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; #if 1 diff --git a/tdecore/tests/kmdcodectest.cpp b/tdecore/tests/kmdcodectest.cpp index 87af50f00..5cdf4ac3e 100644 --- a/tdecore/tests/kmdcodectest.cpp +++ b/tdecore/tests/kmdcodectest.cpp @@ -316,7 +316,7 @@ int main (int argc, char *argv[]) { const char *version = "1.0"; const char *description = "Unit test for md5, base64 encode/decode and uuencode/decode facilities"; - KCmdLineOptions options[] = + TDECmdLineOptions options[] = { { "c ", "compare with the calculated digest for a string or file.", 0 }, { "d", "decode the given string or file using base64", 0 }, @@ -331,7 +331,7 @@ int main (int argc, char *argv[]) { "x", "uudecode the given string or file", 0 }, { "z", "run a preset message-digest test", 0 }, { "+command", "[input1, input2,...]", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; TDECmdLineArgs::init( argc, argv, "kmdcodectest", description, version ); diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp index fd73923f2..a27073468 100644 --- a/tdecore/tests/testqtargs.cpp +++ b/tdecore/tests/testqtargs.cpp @@ -28,7 +28,7 @@ --bg is aliased to --background but If you try it with --background or -background, you get the same thing. - in tdecore/kapplication.cpp, KCmdLineOption qt_options is defined and used + in tdecore/kapplication.cpp, TDECmdLineOption qt_options is defined and used by the static method Kapplication::addCmdLineOptions to add the Qt options but its' entries look like this: @@ -48,10 +48,10 @@ application palette (light and dark shades are\ncalculated)."), 0}, #include #include -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "hello ", I18N_NOOP("Says hello"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/tdehtml/java/tests/testkjavaappletserver.cpp b/tdehtml/java/tests/testkjavaappletserver.cpp index ea8a7656b..d0af25127 100644 --- a/tdehtml/java/tests/testkjavaappletserver.cpp +++ b/tdehtml/java/tests/testkjavaappletserver.cpp @@ -9,10 +9,10 @@ #include "java/kjavaapplet.h" #include "java/kjavaappletwidget.h" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[tdelibs_path]", "path to tdelibs directory", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp index 3e1e14d8c..a127bb709 100644 --- a/tdehtml/test_regression.cpp +++ b/tdehtml/test_regression.cpp @@ -400,7 +400,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List // ------------------------------------------------------------------------- -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "b", 0, 0 }, { "base ", "Directory containing tests, basedir and output directories.", 0}, @@ -419,7 +419,7 @@ static KCmdLineOptions options[] = { "output ", "Put output in instead of /output", 0 } , { "+[base_dir]", "Directory containing tests,basedir and output directories. Only regarded if -b is not specified.", 0 } , { "+[testcases]", "Relative path to testcase, or directory of testcases to be run (equivalent to -t).", 0 } , - KCmdLineLastOption + TDECmdLineLastOption }; static bool existsDir(TQCString dir) diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp index 78ae83203..91eb19eee 100644 --- a/tdehtml/testtdehtml.cpp +++ b/tdehtml/testtdehtml.cpp @@ -32,7 +32,7 @@ #include "domtreeview.h" #include -static KCmdLineOptions options[] = { { "+file", "url to open", 0 } , KCmdLineLastOption }; +static TDECmdLineOptions options[] = { { "+file", "url to open", 0 } , TDECmdLineLastOption }; int main(int argc, char *argv[]) { diff --git a/tdeio/misc/tdefile/fileprops.cpp b/tdeio/misc/tdefile/fileprops.cpp index 21f50cbcd..854aeffc5 100644 --- a/tdeio/misc/tdefile/fileprops.cpp +++ b/tdeio/misc/tdefile/fileprops.cpp @@ -194,7 +194,7 @@ TQStringList FileProps::createKeyValueList( const KFileMetaInfoGroup& g, // tdefile --mimetype --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...] // "key" may be a list of keys, separated by commas -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "m", 0, 0 }, // short option for --mimetype { "nomimetype", I18N_NOOP("Do not print the mimetype of the given file(s)"), 0 }, @@ -253,7 +253,7 @@ static KCmdLineOptions options[] = { "+[files]", I18N_NOOP("The file (or a number of files) to operate on."), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/tdeio/misc/tdemailservice.cpp b/tdeio/misc/tdemailservice.cpp index d1d6bb939..c59067610 100644 --- a/tdeio/misc/tdemailservice.cpp +++ b/tdeio/misc/tdemailservice.cpp @@ -20,10 +20,10 @@ #include #include -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "+url", 0, 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char **argv ) diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp index 7df3a344a..9b44a18b2 100644 --- a/tdeio/misc/tdesendbugmail/main.cpp +++ b/tdeio/misc/tdesendbugmail/main.cpp @@ -18,10 +18,10 @@ #include "smtp.h" -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "subject ", I18N_NOOP("Subject line"), 0 }, { "recipient ", I18N_NOOP("Recipient"), "submit@bugs.kde.org" }, - KCmdLineLastOption + TDECmdLineLastOption }; void BugMailer::slotError(int errornum) { diff --git a/tdeio/misc/tdetelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp index a814b8e52..d3788e5d2 100644 --- a/tdeio/misc/tdetelnetservice.cpp +++ b/tdeio/misc/tdetelnetservice.cpp @@ -29,10 +29,10 @@ #include #include -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { {"+url", 0, 0}, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp index 3ae7b592b..0276008a4 100644 --- a/tdeio/tdeioexec/main.cpp +++ b/tdeio/tdeioexec/main.cpp @@ -49,13 +49,13 @@ static const char description[] = I18N_NOOP("KIO Exec - Opens remote files, watches modifications, asks for upload"); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "tempfiles", I18N_NOOP("Treat URLs as local files and delete them afterwards"), 0 }, { "suggestedfilename ", I18N_NOOP("Suggested file name for the downloaded file"), 0 }, { "+command", I18N_NOOP("Command to execute"), 0 }, { "+[URLs]", I18N_NOOP("URL(s) or local file(s) used for 'command'"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/tdeio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp index c741b20f0..0ca853f1a 100644 --- a/tdeio/tests/kdirwatchtest.cpp +++ b/tdeio/tests/kdirwatchtest.cpp @@ -16,10 +16,10 @@ #include "kdirwatchtest.h" -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { {"+[directory ...]", "Directory(ies) to watch", 0}, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/tdeio/tests/kionetrctest.cpp b/tdeio/tests/kionetrctest.cpp index 2d96c8495..4c05f77e1 100644 --- a/tdeio/tests/kionetrctest.cpp +++ b/tdeio/tests/kionetrctest.cpp @@ -38,10 +38,10 @@ int main(int argc, char **argv) { const char *version = "0.5"; const char *description = "Unit test for .netrc and kionetrc parser."; - KCmdLineOptions options[] = + TDECmdLineOptions options[] = { { "+command", "[url1,url2 ,...]", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; TDECmdLineArgs::init( argc, argv, "kionetrctest", description, version ); diff --git a/tdeio/tests/kmimefromext.cpp b/tdeio/tests/kmimefromext.cpp index 026d4173b..9b3f9dd54 100644 --- a/tdeio/tests/kmimefromext.cpp +++ b/tdeio/tests/kmimefromext.cpp @@ -23,10 +23,10 @@ #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+filename", "the filename to test", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/tdeio/tests/kpropsdlgtest.cpp b/tdeio/tests/kpropsdlgtest.cpp index 811f03923..c09ff622c 100644 --- a/tdeio/tests/kpropsdlgtest.cpp +++ b/tdeio/tests/kpropsdlgtest.cpp @@ -5,10 +5,10 @@ #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+url", "the path or url to the file/dir for which to show properties", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main ( int argc, char** argv ) diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp index 414b5ebf1..67f27645d 100644 --- a/tdeio/tests/kurifiltertest.cpp +++ b/tdeio/tests/kurifiltertest.cpp @@ -145,10 +145,10 @@ static const char programName[] = I18N_NOOP("kurifiltertest"); static const char description[] = I18N_NOOP("Unit test for the URI filter plugin framework."); static const char version[] = "1.5"; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "s", I18N_NOOP("Use space as keyword delimeter for web shortcuts"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/tdeio/tests/metatest.cpp b/tdeio/tests/metatest.cpp index ee1d38201..9890bb711 100644 --- a/tdeio/tests/metatest.cpp +++ b/tdeio/tests/metatest.cpp @@ -9,7 +9,7 @@ #define I18N_NOOP - static KCmdLineOptions options[] = + static TDECmdLineOptions options[] = { { "+file", "File name", 0 }, { "addgroup ", "Add a group to a file", 0}, @@ -23,7 +23,7 @@ { "set ", "Set the value of --item in --group", 0}, { "groups", "list the groups of this file", 0 }, { "mimetypeinfo ", "the mimetype info for a mimetype", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; void printKeyValues(KFileMetaInfo& info) diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp index 978845669..8256fa04f 100644 --- a/tdeio/tests/speed.cpp +++ b/tdeio/tests/speed.cpp @@ -57,10 +57,10 @@ void SpeedTest::finished(Job*) { kapp->quit(); } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", "the URL to list", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) { diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp index 26534b840..aee514f54 100644 --- a/tdeio/tests/tdeioslavetest.cpp +++ b/tdeio/tests/tdeioslavetest.cpp @@ -480,7 +480,7 @@ void KioslaveTest::stopJob() { static const char version[] = "v0.0.0 0000"; // :-) static const char description[] = "Test for tdeioslaves"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "s", 0, 0 }, { "src ", "Source URL", "" }, @@ -490,7 +490,7 @@ static KCmdLineOptions options[] = { "operation ", "Operation (list,listrecursive,stat,get,put,copy,move,del,shred,mkdir)", "copy" }, { "p", 0, 0 }, { "progress ", "Progress Type (none,default,status)", "default" }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) { diff --git a/tdeio/tests/tdetradertest.cpp b/tdeio/tests/tdetradertest.cpp index 9ce82c49f..7a4b258dc 100644 --- a/tdeio/tests/tdetradertest.cpp +++ b/tdeio/tests/tdetradertest.cpp @@ -22,13 +22,13 @@ #include #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+query", "the query", 0 }, { "+[genericServiceType]", "Application (default), or KParts/ReadOnlyPart", 0 }, { "+[constraint]", "constraint", 0 }, { "+[preference]", "preference", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char **argv ) diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp index 991dbc0aa..c9f4e4678 100644 --- a/tdeioslave/http/http_cache_cleaner.cpp +++ b/tdeioslave/http/http_cache_cleaner.cpp @@ -54,10 +54,10 @@ static const char description[] = I18N_NOOP("TDE HTTP cache maintenance tool"); static const char version[] = "1.0.0"; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { {"clear-all", I18N_NOOP("Empty the cache"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; struct FileInfo { diff --git a/tdeioslave/http/kcookiejar/main.cpp b/tdeioslave/http/kcookiejar/main.cpp index 6542dc5af..976b6b87c 100644 --- a/tdeioslave/http/kcookiejar/main.cpp +++ b/tdeioslave/http/kcookiejar/main.cpp @@ -31,13 +31,13 @@ static const char description[] = static const char version[] = "1.0"; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "shutdown", I18N_NOOP("Shut down cookie jar"), 0 }, { "remove ", I18N_NOOP("Remove cookies for domain"), 0 }, { "remove-all", I18N_NOOP("Remove all cookies"), 0 }, { "reload-config", I18N_NOOP("Reload configuration file"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) diff --git a/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp index 236e2406b..51e61a332 100644 --- a/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp +++ b/tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp @@ -39,10 +39,10 @@ static TQCString *nextYear; static TDEConfig *config = 0; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+testfile", "Regression test to run", 0}, - KCmdLineLastOption + TDECmdLineLastOption }; static void FAIL(const TQString &msg) diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp index 66d6f786a..24d70a14d 100644 --- a/tdeparts/tests/ghostview.cpp +++ b/tdeparts/tests/ghostview.cpp @@ -91,10 +91,10 @@ void Shell::slotFileOpen() openURL( url ); } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+file(s)", "Files to load", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static const char version[] = "v0.0.1 2000 (c) David Faure"; static const char description[] = "This is a test shell for the kghostview part."; diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp index aba9b3905..5febb18a1 100644 --- a/tdeprint/cups/cupsdconf2/main.cpp +++ b/tdeprint/cups/cupsdconf2/main.cpp @@ -24,10 +24,10 @@ #include #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[file]", I18N_NOOP("Configuration file to load"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp index b60be8510..99da2a9b7 100644 --- a/tdeprint/management/kaddprinterwizard.cpp +++ b/tdeprint/management/kaddprinterwizard.cpp @@ -5,11 +5,11 @@ #include #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "tdeconfig", I18N_NOOP("Configure TDE Print"), 0 }, { "serverconfig", I18N_NOOP("Configure print server"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) diff --git a/tdeui/tests/kpixmapregionselectordialogtest.cpp b/tdeui/tests/kpixmapregionselectordialogtest.cpp index 84cc7ae65..8c5cb545e 100644 --- a/tdeui/tests/kpixmapregionselectordialogtest.cpp +++ b/tdeui/tests/kpixmapregionselectordialogtest.cpp @@ -5,10 +5,10 @@ #include #include -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "+file", "The image file to open", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char**argv) diff --git a/tdeunittest/modrunner.cpp b/tdeunittest/modrunner.cpp index 45129ddee..f5e29efa1 100644 --- a/tdeunittest/modrunner.cpp +++ b/tdeunittest/modrunner.cpp @@ -37,12 +37,12 @@ static const char description[] = static const char version[] = "0.1"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { {"query [regexp]", I18N_NOOP("Only run modules whose filenames match the regexp."), "^tdeunittest_.*\\.la$"}, {"folder [folder]", I18N_NOOP("Only run tests modules which are found in the folder. Use the query option to select modules."), "."}, { "enable-dbgcap", I18N_NOOP("Disables debug capturing. You typically use this option when you use the GUI."), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/tdeunittest/tester.h b/tdeunittest/tester.h index 61794f229..c193cc158 100644 --- a/tdeunittest/tester.h +++ b/tdeunittest/tester.h @@ -143,7 +143,7 @@ SampleTest - 1 test passed, 1 test failed * * static const char description[] = I18N_NOOP("SampleTests"); * static const char version[] = "0.1"; - * static KCmdLineOptions options[] = { KCmdLineLastOption }; + * static TDECmdLineOptions options[] = { TDECmdLineLastOption }; * * int main( int argc, char** argv ) * {