Browse Source

Rename KCmd to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
5466d52073
62 changed files with 154 additions and 154 deletions
  1. +2
    -2
      arts/kde/kconverttest.cc
  2. +2
    -2
      arts/kde/kiotest.cc
  3. +2
    -2
      arts/kde/kiotestslow.cc
  4. +2
    -2
      arts/message/artsmessage.cc
  5. +2
    -2
      kabc/tdeab2tdeabc.cpp
  6. +2
    -2
      kabc/tests/testaddressee.cpp
  7. +2
    -2
      kabc/tests/testaddresseelist.cpp
  8. +2
    -2
      kabc/tests/testaddressfmt.cpp
  9. +2
    -2
      kabc/tests/testdistlist.cpp
  10. +2
    -2
      kabc/tests/testkabcdlg.cpp
  11. +2
    -2
      kabc/tests/testlock.cpp
  12. +2
    -2
      kabc/vcardparser/testread.cpp
  13. +2
    -2
      kate/part/test_regression.cpp
  14. +2
    -2
      kded/kded.cpp
  15. +2
    -2
      kded/khostname.cpp
  16. +2
    -2
      kded/tde-menu.cpp
  17. +2
    -2
      kded/tdebuildsycoca.cpp
  18. +2
    -2
      kdewidgets/makekdewidgets.cpp
  19. +2
    -2
      kdoctools/meinproc.cpp
  20. +2
    -2
      kinit/tdelauncher_main.cpp
  21. +2
    -2
      knewstuff/tdehotnewstuff.cpp
  22. +2
    -2
      libtdescreensaver/main.cpp
  23. +2
    -2
      tdecmshell/main.cpp
  24. +2
    -2
      tdeconf_update/tdeconf_update.cpp
  25. +4
    -4
      tdecore/kapplication.cpp
  26. +18
    -18
      tdecore/kcmdlineargs.cpp
  27. +18
    -18
      tdecore/kcmdlineargs.h
  28. +2
    -2
      tdecore/kdetcompmgr.cpp
  29. +2
    -2
      tdecore/kuniqueapplication.cpp
  30. +1
    -1
      tdecore/tde-config.cpp.cmake
  31. +1
    -1
      tdecore/tde-config.cpp.in
  32. +2
    -2
      tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
  33. +1
    -1
      tdecore/tests/kcalendartest.cpp
  34. +2
    -2
      tdecore/tests/kcmdlineargstest.cpp
  35. +2
    -2
      tdecore/tests/kmdcodectest.cpp
  36. +3
    -3
      tdecore/tests/testqtargs.cpp
  37. +2
    -2
      tdehtml/java/tests/testkjavaappletserver.cpp
  38. +2
    -2
      tdehtml/test_regression.cpp
  39. +1
    -1
      tdehtml/testtdehtml.cpp
  40. +2
    -2
      tdeio/misc/tdefile/fileprops.cpp
  41. +2
    -2
      tdeio/misc/tdemailservice.cpp
  42. +2
    -2
      tdeio/misc/tdesendbugmail/main.cpp
  43. +2
    -2
      tdeio/misc/tdetelnetservice.cpp
  44. +2
    -2
      tdeio/tdeioexec/main.cpp
  45. +2
    -2
      tdeio/tests/kdirwatchtest.cpp
  46. +2
    -2
      tdeio/tests/kionetrctest.cpp
  47. +2
    -2
      tdeio/tests/kmimefromext.cpp
  48. +2
    -2
      tdeio/tests/kpropsdlgtest.cpp
  49. +2
    -2
      tdeio/tests/kurifiltertest.cpp
  50. +2
    -2
      tdeio/tests/metatest.cpp
  51. +2
    -2
      tdeio/tests/speed.cpp
  52. +2
    -2
      tdeio/tests/tdeioslavetest.cpp
  53. +2
    -2
      tdeio/tests/tdetradertest.cpp
  54. +2
    -2
      tdeioslave/http/http_cache_cleaner.cpp
  55. +2
    -2
      tdeioslave/http/kcookiejar/main.cpp
  56. +2
    -2
      tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp
  57. +2
    -2
      tdeparts/tests/ghostview.cpp
  58. +2
    -2
      tdeprint/cups/cupsdconf2/main.cpp
  59. +2
    -2
      tdeprint/management/kaddprinterwizard.cpp
  60. +2
    -2
      tdeui/tests/kpixmapregionselectordialogtest.cpp
  61. +2
    -2
      tdeunittest/modrunner.cpp
  62. +1
    -1
      tdeunittest/tester.h

+ 2
- 2
arts/kde/kconverttest.cc View File

@@ -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()


+ 2
- 2
arts/kde/kiotest.cc View File

@@ -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)


+ 2
- 2
arts/kde/kiotestslow.cc View File

@@ -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


+ 2
- 2
arts/message/artsmessage.cc View File

@@ -39,7 +39,7 @@ Gnome, etc. and used instead.
#include <kcmdlineargs.h>

// 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",


+ 2
- 2
kabc/tdeab2tdeabc.cpp View File

@@ -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 )


+ 2
- 2
kabc/tests/testaddressee.cpp View File

@@ -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)


+ 2
- 2
kabc/tests/testaddresseelist.cpp View File

@@ -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*/)


+ 2
- 2
kabc/tests/testaddressfmt.cpp View File

@@ -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)


+ 2
- 2
kabc/tests/testdistlist.cpp View File

@@ -13,10 +13,10 @@

using namespace KABC;

static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"list <listname>", I18N_NOOP("Show distribution list with name <listname>"), 0},
KCmdLineLastOption
TDECmdLineLastOption
};




+ 2
- 2
kabc/tests/testkabcdlg.cpp View File

@@ -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)


+ 2
- 2
kabc/tests/testlock.cpp View File

@@ -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)


+ 2
- 2
kabc/vcardparser/testread.cpp View File

@@ -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 )


+ 2
- 2
kate/part/test_regression.cpp View File

@@ -371,7 +371,7 @@ static TQString findMostRecentFailureSnapshot() {
return dir[0].mid(sizeof failureSnapshotPrefix - 1);
}

static KCmdLineOptions options[] =
static TDECmdLineOptions options[] =
{
{ "b", 0, 0 },
{ "base <base_dir>", "Directory containing tests, basedir and output directories.", 0},
@@ -390,7 +390,7 @@ static KCmdLineOptions options[] =
{ "output <directory>", "Put output in <directory> instead of <base_dir>/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[])


+ 2
- 2
kded/kded.cpp View File

@@ -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


+ 2
- 2
kded/khostname.cpp View File

@@ -37,10 +37,10 @@
#include <kprocess.h>
#include <kde_file.h>

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";


+ 2
- 2
kded/tde-menu.cpp View File

@@ -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 },
{ "+<application-id>", I18N_NOOP("The id of the menu entry to locate"), 0 },
KCmdLineLastOption
TDECmdLineLastOption
};

static const char appName[] = "tde-menu";


+ 2
- 2
kded/tdebuildsycoca.cpp View File

@@ -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";


+ 2
- 2
kdewidgets/makekdewidgets.cpp View File

@@ -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 <file>", I18N_NOOP( "Output file" ), 0 },
{ "n <plugin name>", I18N_NOOP( "Name of the plugin class to generate" ), "WidgetsPlugin" },
{ "g <group>", I18N_NOOP( "Default widget group name to display in designer" ), "Custom" },
{ "p <pixmap dir>", I18N_NOOP( "Embed pixmaps from a source directory" ), 0 },
KCmdLineLastOption
TDECmdLineLastOption
};

static TQString buildWidgetDef( const TQString &name, TDEConfig &input, const TQString &group );


+ 2
- 2
kdoctools/meinproc.cpp View File

@@ -69,7 +69,7 @@ void parseEntry(PairList &list, xmlNodePtr cur, int base)

}

static KCmdLineOptions options[] =
static TDECmdLineOptions options[] =
{
{ "stylesheet <xsl>", I18N_NOOP( "Stylesheet to use" ), 0 },
{ "stdout", I18N_NOOP( "Output whole document to stdout" ), 0 },
@@ -81,7 +81,7 @@ static KCmdLineOptions options[] =
{ "srcdir <dir>", I18N_NOOP( "Set the srcdir, for tdelibs" ), 0},
{ "param <key>=<value>", 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.
};




+ 2
- 2
kinit/tdelauncher_main.cpp View File

@@ -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 )


+ 2
- 2
knewstuff/tdehotnewstuff.cpp View File

@@ -26,11 +26,11 @@

#include "downloaddialog.h"

static const KCmdLineOptions op[] =
static const TDECmdLineOptions op[] =
{
{"type <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)


+ 2
- 2
libtdescreensaver/main.cpp View File

@@ -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 )


+ 2
- 2
tdecmshell/main.cpp View File

@@ -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 <id>", I18N_NOOP("Embeds the module with buttons in window with id <id>"), 0 },
{ "embed-proxy <id>", I18N_NOOP("Embeds the module without buttons in window with id <id>"), 0 },
{ "silent", I18N_NOOP("Do not display main window"), 0 },
KCmdLineLastOption
TDECmdLineLastOption
};

static void listModules(const TQString &baseGroup)


+ 2
- 2
tdeconf_update/tdeconf_update.cpp View File

@@ -38,12 +38,12 @@
#include <kinstance.h>
#include <ktempfile.h>

static KCmdLineOptions options[] =
static TDECmdLineOptions options[] =
{
{ "debug", I18N_NOOP("Keep output results from scripts"), 0 },
{ "check <update-file>", I18N_NOOP("Check whether config file itself requires updating"), 0 },
{ "+[file]", I18N_NOOP("File to read update instructions from"), 0 },
KCmdLineLastOption
TDECmdLineLastOption
};

class KonfUpdate


+ 4
- 4
tdecore/kapplication.cpp View File

@@ -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 <caption>", I18N_NOOP("Use 'caption' as name in the titlebar"), 0},
{ "icon <icon>", I18N_NOOP("Use 'icon' as the application icon"), 0},
@@ -1556,7 +1556,7 @@ static const KCmdLineOptions kde_options[] =
{ "smkey <sessionKey>", 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


+ 18
- 18
tdecore/kcmdlineargs.cpp View File

@@ -56,14 +56,14 @@
template class TQAsciiDict<TQCString>;
template class TQPtrList<TDECmdLineArgs>;

class KCmdLineParsedOptions : public TQAsciiDict<TQCString>
class TDECmdLineParsedOptions : public TQAsciiDict<TQCString>
{
public:
KCmdLineParsedOptions()
TDECmdLineParsedOptions()
: TQAsciiDict<TQCString>( 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


+ 18
- 18
tdecore/kcmdlineargs.h View File

@@ -37,7 +37,7 @@ typedef TQValueList<TQCString> 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 \<file>", 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 \<argument>", 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 \<argument>", 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 \<argument>", 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.


+ 2
- 2
tdecore/kdetcompmgr.cpp View File

@@ -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)


+ 2
- 2
tdecore/kuniqueapplication.cpp View File

@@ -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 {


+ 1
- 1
tdecore/tde-config.cpp.cmake View File

@@ -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 },


+ 1
- 1
tdecore/tde-config.cpp.in View File

@@ -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 },


+ 2
- 2
tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp View File

@@ -39,13 +39,13 @@

#include <iostream>

static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{ "d", 0, 0 },
{ "directory <dir>", 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
};




+ 1
- 1
tdecore/tests/kcalendartest.cpp View File

@@ -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 },


+ 2
- 2
tdecore/tests/kcmdlineargstest.cpp View File

@@ -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 <baudrate>", I18N_NOP("set baudrate"), "9600" },
{ "+file(s)", I18N_NOP("Files to load"), 0 },
KCmdLineLastOption
TDECmdLineLastOption
};

#if 1


+ 2
- 2
tdecore/tests/kmdcodectest.cpp View File

@@ -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 <digest>", "compare <digest> 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 );


+ 3
- 3
tdecore/tests/testqtargs.cpp View File

@@ -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 <kaboutdata.h>
#include <klocale.h>

static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{ "hello ", I18N_NOOP("Says hello"), 0 },
KCmdLineLastOption
TDECmdLineLastOption
};

int main(int argc, char *argv[])


+ 2
- 2
tdehtml/java/tests/testkjavaappletserver.cpp View File

@@ -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)


+ 2
- 2
tdehtml/test_regression.cpp View File

@@ -400,7 +400,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List

// -------------------------------------------------------------------------

static KCmdLineOptions options[] =
static TDECmdLineOptions options[] =
{
{ "b", 0, 0 },
{ "base <base_dir>", "Directory containing tests, basedir and output directories.", 0},
@@ -419,7 +419,7 @@ static KCmdLineOptions options[] =
{ "output <directory>", "Put output in <directory> instead of <base_dir>/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)


+ 1
- 1
tdehtml/testtdehtml.cpp View File

@@ -32,7 +32,7 @@
#include "domtreeview.h"
#include <tdefiledialog.h>

static KCmdLineOptions options[] = { { "+file", "url to open", 0 } , KCmdLineLastOption };
static TDECmdLineOptions options[] = { { "+file", "url to open", 0 } , TDECmdLineLastOption };

int main(int argc, char *argv[])
{


+ 2
- 2
tdeio/misc/tdefile/fileprops.cpp View File

@@ -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
};




+ 2
- 2
tdeio/misc/tdemailservice.cpp View File

@@ -20,10 +20,10 @@
#include <klocale.h>
#include <kcmdlineargs.h>

static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{ "+url", 0, 0 },
KCmdLineLastOption
TDECmdLineLastOption
};

int main( int argc, char **argv )


+ 2
- 2
tdeio/misc/tdesendbugmail/main.cpp View File

@@ -18,10 +18,10 @@

#include "smtp.h"

static KCmdLineOptions options[] = {
static TDECmdLineOptions options[] = {
{ "subject <argument>", I18N_NOOP("Subject line"), 0 },
{ "recipient <argument>", I18N_NOOP("Recipient"), "submit@bugs.kde.org" },
KCmdLineLastOption
TDECmdLineLastOption
};

void BugMailer::slotError(int errornum) {


+ 2
- 2
tdeio/misc/tdetelnetservice.cpp View File

@@ -29,10 +29,10 @@
#include <kprocess.h>
#include <ksimpleconfig.h>

static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"+url", 0, 0},
KCmdLineLastOption
TDECmdLineLastOption
};

int main(int argc, char **argv)


+ 2
- 2
tdeio/tdeioexec/main.cpp View File

@@ -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 <file name>", 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
};




+ 2
- 2
tdeio/tests/kdirwatchtest.cpp View File

@@ -16,10 +16,10 @@

#include "kdirwatchtest.h"

static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{"+[directory ...]", "Directory(ies) to watch", 0},
KCmdLineLastOption
TDECmdLineLastOption
};




+ 2
- 2
tdeio/tests/kionetrctest.cpp View File

@@ -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 );


+ 2
- 2
tdeio/tests/kmimefromext.cpp View File

@@ -23,10 +23,10 @@

#include <stdio.h>

static KCmdLineOptions options[] =
static TDECmdLineOptions options[] =
{
{ "+filename", "the filename to test", 0 },
KCmdLineLastOption
TDECmdLineLastOption
};

int main(int argc, char *argv[])


+ 2
- 2
tdeio/tests/kpropsdlgtest.cpp View File

@@ -5,10 +5,10 @@
#include <kcmdlineargs.h>


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 )


+ 2
- 2
tdeio/tests/kurifiltertest.cpp View File

@@ -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)


+ 2
- 2
tdeio/tests/metatest.cpp View File

@@ -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)


+ 2
- 2
tdeio/tests/speed.cpp View File

@@ -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) {


+ 2
- 2
tdeio/tests/tdeioslavetest.cpp View File

@@ -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 <src>", "Source URL", "" },
@@ -490,7 +490,7 @@ static KCmdLineOptions options[] =
{ "operation <operation>", "Operation (list,listrecursive,stat,get,put,copy,move,del,shred,mkdir)", "copy" },
{ "p", 0, 0 },
{ "progress <progress>", "Progress Type (none,default,status)", "default" },
KCmdLineLastOption
TDECmdLineLastOption
};

int main(int argc, char **argv) {


+ 2
- 2
tdeio/tests/tdetradertest.cpp View File

@@ -22,13 +22,13 @@
#include <kapplication.h>
#include <stdio.h>

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 )


+ 2
- 2
tdeioslave/http/http_cache_cleaner.cpp View File

@@ -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 {


+ 2
- 2
tdeioslave/http/kcookiejar/main.cpp View File

@@ -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 <domain>", 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[])


+ 2
- 2
tdeioslave/http/kcookiejar/tests/kcookiejartest.cpp View File

@@ -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)


+ 2
- 2
tdeparts/tests/ghostview.cpp View File

@@ -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.";


+ 2
- 2
tdeprint/cups/cupsdconf2/main.cpp View File

@@ -24,10 +24,10 @@
#include <kcmdlineargs.h>
#include <kapplication.h>

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[])


+ 2
- 2
tdeprint/management/kaddprinterwizard.cpp View File

@@ -5,11 +5,11 @@
#include <klocale.h>
#include <kglobal.h>

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[])


+ 2
- 2
tdeui/tests/kpixmapregionselectordialogtest.cpp View File

@@ -5,10 +5,10 @@
#include <kcmdlineargs.h>
#include <iostream>

static const KCmdLineOptions options[] =
static const TDECmdLineOptions options[] =
{
{ "+file", "The image file to open", 0 },
KCmdLineLastOption
TDECmdLineLastOption
};

int main(int argc, char**argv)


+ 2
- 2
tdeunittest/modrunner.cpp View File

@@ -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
};




+ 1
- 1
tdeunittest/tester.h View File

@@ -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 )
* {


Loading…
Cancel
Save