summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/common/cli/cli_main.cpp16
-rw-r--r--src/common/cli/cli_main.h4
-rw-r--r--src/common/global/about.cpp8
-rw-r--r--src/common/global/about.h10
-rw-r--r--src/common/nokde/nokde_kcmdlineargs.cpp36
-rw-r--r--src/common/nokde/nokde_kcmdlineargs.h36
-rw-r--r--src/piklab-coff/main.cpp8
-rw-r--r--src/piklab-hex/main.cpp8
-rw-r--r--src/piklab-prog/cmdline.cpp4
-rw-r--r--src/piklab-test/base/device_test.cpp2
-rw-r--r--src/piklab/main.cpp2
11 files changed, 67 insertions, 67 deletions
diff --git a/src/common/cli/cli_main.cpp b/src/common/cli/cli_main.cpp
index 3adb61d..633d700 100644
--- a/src/common/cli/cli_main.cpp
+++ b/src/common/cli/cli_main.cpp
@@ -46,7 +46,7 @@ bool CLI::isProperty(const TQString &s)
}
//-----------------------------------------------------------------------------
-const KCmdLineOptions STANDARD_OPTIONS[] = {
+const TDECmdLineOptions STANDARD_OPTIONS[] = {
{ "c", 0, 0 },
{ "command <name>", I18N_NOOP("Perform the requested command."), 0 },
{ "command-list", I18N_NOOP("Return the list of recognized commands."), 0 },
@@ -55,19 +55,19 @@ const KCmdLineOptions STANDARD_OPTIONS[] = {
{ "max-debug", I18N_NOOP("Display all debug messages."), 0 },
{ "lowlevel-debug", I18N_NOOP("Display low level debug messages."), 0 },
{ "quiet", I18N_NOOP("Do not display messages."), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
-const KCmdLineOptions FORCE_OPTIONS[] = {
+const TDECmdLineOptions FORCE_OPTIONS[] = {
{ "f", 0, 0 },
{ "force", I18N_NOOP("Overwrite files and answer \"yes\" to questions."), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
-const KCmdLineOptions INTERACTIVE_OPTIONS[] = {
+const TDECmdLineOptions INTERACTIVE_OPTIONS[] = {
{ "i", 0, 0 },
{ "cli", I18N_NOOP("Interactive mode"), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
CLI::OptionList::OptionList(Properties properties)
@@ -75,7 +75,7 @@ CLI::OptionList::OptionList(Properties properties)
init(properties);
}
-CLI::OptionList::OptionList(Properties properties, const KCmdLineOptions *options)
+CLI::OptionList::OptionList(Properties properties, const TDECmdLineOptions *options)
{
init(properties);
for (uint i=0; options[i].name; i++) append(options[i]);
@@ -131,7 +131,7 @@ void CLI::MainBase::init()
CLI::OptionList CLI::MainBase::optionList(const char *fileDescription) const
{
OptionList list(_properties, OPTIONS);
- KCmdLineOptions opt;
+ TDECmdLineOptions opt;
for (uint i=0; PROPERTY_DATA[i].name; i++) {
opt.description = 0;
opt.def = 0;
diff --git a/src/common/cli/cli_main.h b/src/common/cli/cli_main.h
index 19852c3..1b33c06 100644
--- a/src/common/cli/cli_main.h
+++ b/src/common/cli/cli_main.h
@@ -20,7 +20,7 @@ enum Property { NoProperty = 0, HasForce = 1, HasInteractiveMode = 2 };
TQ_DECLARE_FLAGS(Properties, Property)
TQ_DECLARE_OPERATORS_FOR_FLAGS(Properties)
-extern const KCmdLineOptions OPTIONS[];
+extern const TDECmdLineOptions OPTIONS[];
//-----------------------------------------------------------------------------
struct CommandData {
const char *name;
@@ -48,7 +48,7 @@ class OptionList : public Piklab::OptionList
{
public:
OptionList(Properties properties);
- OptionList(Properties properties, const KCmdLineOptions *options);
+ OptionList(Properties properties, const TDECmdLineOptions *options);
private:
void init(Properties properties);
diff --git a/src/common/global/about.cpp b/src/common/global/about.cpp
index e895f60..e0567dc 100644
--- a/src/common/global/about.cpp
+++ b/src/common/global/about.cpp
@@ -22,16 +22,16 @@ const char * const Piklab::URLS[Nb_UrlTypes] = {
};
//-----------------------------------------------------------------------------
-Piklab::OptionList::OptionList(const KCmdLineOptions *options)
+Piklab::OptionList::OptionList(const TDECmdLineOptions *options)
: _options(0)
{
for (uint i=0; options[i].name; i++) append(options[i]);
}
-const KCmdLineOptions *Piklab::OptionList::ptr() const
+const TDECmdLineOptions *Piklab::OptionList::ptr() const
{
delete[] _options;
- _options = new KCmdLineOptions[count()+1];
+ _options = new TDECmdLineOptions[count()+1];
for (uint i=0; i<uint(count()); i++) {
_options[i] = *at(i);
Q_ASSERT( _options[i].name );
@@ -41,7 +41,7 @@ const KCmdLineOptions *Piklab::OptionList::ptr() const
}
//-----------------------------------------------------------------------------
-void Piklab::init(TDEAboutData *about, int argc, char **argv, bool gui, const KCmdLineOptions *options)
+void Piklab::init(TDEAboutData *about, int argc, char **argv, bool gui, const TDECmdLineOptions *options)
{
Q_ASSERT(about);
#if defined(NO_KDE)
diff --git a/src/common/global/about.h b/src/common/global/about.h
index adfa86b..920eabc 100644
--- a/src/common/global/about.h
+++ b/src/common/global/about.h
@@ -14,22 +14,22 @@
namespace Piklab
{
//-----------------------------------------------------------------------------
-class OptionList : public TQValueList<KCmdLineOptions>
+class OptionList : public TQValueList<TDECmdLineOptions>
{
public:
OptionList() : _options(0) {}
- OptionList(const KCmdLineOptions *options);
+ OptionList(const TDECmdLineOptions *options);
virtual ~OptionList() { delete[] _options; }
- const KCmdLineOptions *ptr() const;
+ const TDECmdLineOptions *ptr() const;
private:
- mutable KCmdLineOptions *_options;
+ mutable TDECmdLineOptions *_options;
};
//---------------------------------------------------------------------------
enum UrlType { Homepage = 0, Support, BugReport, Nb_UrlTypes };
extern const char * const URLS[Nb_UrlTypes];
-extern void init(TDEAboutData *about, int argc, char **argv, bool gui, const KCmdLineOptions *options);
+extern void init(TDEAboutData *about, int argc, char **argv, bool gui, const TDECmdLineOptions *options);
//---------------------------------------------------------------------------
class AboutData : public TDEAboutData
diff --git a/src/common/nokde/nokde_kcmdlineargs.cpp b/src/common/nokde/nokde_kcmdlineargs.cpp
index 6f45ef0..481f0b6 100644
--- a/src/common/nokde/nokde_kcmdlineargs.cpp
+++ b/src/common/nokde/nokde_kcmdlineargs.cpp
@@ -73,14 +73,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)
@@ -108,10 +108,10 @@ protected:
};
-class KCmdLineParsedArgs : public TQStrList
+class TDECmdLineParsedArgs : public TQStrList
{
public:
- KCmdLineParsedArgs()
+ TDECmdLineParsedArgs()
: TQStrList( true ) { }
TQDataStream& save( TQDataStream &s) const
{ return TQGList::write(s); }
@@ -220,7 +220,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)
@@ -367,7 +367,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;
@@ -574,7 +574,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] == '+')
@@ -823,7 +823,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] == '+')
@@ -886,7 +886,7 @@ TDECmdLineArgs::usage(const char *id)
while (args)
{
- const KCmdLineOptions *option = args->options;
+ const TDECmdLineOptions *option = args->options;
TQCString opt = "";
//
while(option && option->name)
@@ -1012,7 +1012,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)
{
@@ -1071,8 +1071,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 );
@@ -1102,7 +1102,7 @@ TDECmdLineArgs::setOption(const TQCString &opt, bool enabled)
addArgument(arg);
}
if (!parsedOptionList) {
- parsedOptionList = new KCmdLineParsedOptions;
+ parsedOptionList = new TDECmdLineParsedOptions;
parsedOptionList->setAutoDelete(true);
}
@@ -1132,7 +1132,7 @@ TDECmdLineArgs::setOption(const TQCString &opt, const char *value)
#endif
}
if (!parsedOptionList) {
- parsedOptionList = new KCmdLineParsedOptions;
+ parsedOptionList = new TDECmdLineParsedOptions;
parsedOptionList->setAutoDelete(true);
}
@@ -1303,15 +1303,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/src/common/nokde/nokde_kcmdlineargs.h b/src/common/nokde/nokde_kcmdlineargs.h
index 8622f10..58931a6 100644
--- a/src/common/nokde/nokde_kcmdlineargs.h
+++ b/src/common/nokde/nokde_kcmdlineargs.h
@@ -48,7 +48,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
@@ -76,13 +76,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;
@@ -147,10 +147,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 },
@@ -171,7 +171,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
*
@@ -310,13 +310,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
*
@@ -365,7 +365,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);
@@ -426,7 +426,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" }
@@ -446,7 +446,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" }
@@ -468,11 +468,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;
@@ -564,7 +564,7 @@ protected:
* @internal
* Constructor.
*/
- TDECmdLineArgs( const KCmdLineOptions *_options, const char *_name,
+ TDECmdLineArgs( const TDECmdLineOptions *_options, const char *_name,
const char *_id);
/**
@@ -677,11 +677,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 isTQt;
static TDECmdLineArgsList *argsList; // All options.
diff --git a/src/piklab-coff/main.cpp b/src/piklab-coff/main.cpp
index dff1b68..3d88eba 100644
--- a/src/piklab-coff/main.cpp
+++ b/src/piklab-coff/main.cpp
@@ -17,8 +17,8 @@
#include "coff/base/coff_archive.h"
//-----------------------------------------------------------------------------
-const KCmdLineOptions OPTIONS[] = {
- KCmdLineLastOption
+const TDECmdLineOptions OPTIONS[] = {
+ TDECmdLineLastOption
};
const CLI::CommandData CLI::NORMAL_COMMAND_DATA[] = {
@@ -39,8 +39,8 @@ const CLI::PropertyData CLI::PROPERTY_DATA[] = {
{ 0, 0, 0, 0, 0, 0 }
};
-const KCmdLineOptions CLI::OPTIONS[] = {
- KCmdLineLastOption
+const TDECmdLineOptions CLI::OPTIONS[] = {
+ TDECmdLineLastOption
};
//-----------------------------------------------------------------------------
diff --git a/src/piklab-hex/main.cpp b/src/piklab-hex/main.cpp
index 70796bb..7be9fa7 100644
--- a/src/piklab-hex/main.cpp
+++ b/src/piklab-hex/main.cpp
@@ -17,8 +17,8 @@
#include "common/global/about.h"
//-----------------------------------------------------------------------------
-const KCmdLineOptions OPTIONS[] = {
- KCmdLineLastOption
+const TDECmdLineOptions OPTIONS[] = {
+ TDECmdLineLastOption
};
const CLI::CommandData CLI::NORMAL_COMMAND_DATA[] = {
@@ -40,8 +40,8 @@ const CLI::PropertyData CLI::PROPERTY_DATA[] = {
{ 0, 0, 0, 0, 0, 0 }
};
-const KCmdLineOptions CLI::OPTIONS[] = {
- KCmdLineLastOption
+const TDECmdLineOptions CLI::OPTIONS[] = {
+ TDECmdLineLastOption
};
const CLI::FillOptions CLI::FILL_OPTIONS[] = {
diff --git a/src/piklab-prog/cmdline.cpp b/src/piklab-prog/cmdline.cpp
index 2f206a2..13ac144 100644
--- a/src/piklab-prog/cmdline.cpp
+++ b/src/piklab-prog/cmdline.cpp
@@ -52,11 +52,11 @@ const CLI::CommandData CLI::NORMAL_COMMAND_DATA[] = {
{ 0, NoCommandProperty, 0 }
};
-const KCmdLineOptions CLI::OPTIONS[] = {
+const TDECmdLineOptions CLI::OPTIONS[] = {
{ "r", 0, 0 },
{ "range <name>", I18N_NOOP("Memory range to operate on."), 0 },
{ "range-list", I18N_NOOP("Return the list of memory ranges."), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
//-----------------------------------------------------------------------------
diff --git a/src/piklab-test/base/device_test.cpp b/src/piklab-test/base/device_test.cpp
index ef5cef6..785de39 100644
--- a/src/piklab-test/base/device_test.cpp
+++ b/src/piklab-test/base/device_test.cpp
@@ -48,7 +48,7 @@ bool DeviceTest::execute()
Piklab::OptionList DeviceTest::optionList() const
{
Piklab::OptionList optionList;
- const KCmdLineOptions OPTION = { "+[device]", "Only check the specified device", 0 };
+ const TDECmdLineOptions OPTION = { "+[device]", "Only check the specified device", 0 };
optionList.append(OPTION);
return optionList;
}
diff --git a/src/piklab/main.cpp b/src/piklab/main.cpp
index 409be80..dccdfba 100644
--- a/src/piklab/main.cpp
+++ b/src/piklab/main.cpp
@@ -11,7 +11,7 @@
#include "common/global/about.h"
#include "libgui/likeback.h"
-const KCmdLineOptions OPTIONS[] = {
+const TDECmdLineOptions OPTIONS[] = {
{ "+[file]", I18N_NOOP("Optional filenames to be opened upon startup."), 0 },
{ 0, 0, 0}
};
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 17:16:57 +0000