summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kapplication.cpp8
-rw-r--r--tdecore/kcmdlineargs.cpp36
-rw-r--r--tdecore/kcmdlineargs.h36
-rw-r--r--tdecore/kdetcompmgr.cpp4
-rw-r--r--tdecore/kuniqueapplication.cpp4
-rw-r--r--tdecore/tde-config.cpp.cmake2
-rw-r--r--tdecore/tde-config.cpp.in2
-rw-r--r--tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp4
-rw-r--r--tdecore/tests/kcalendartest.cpp2
-rw-r--r--tdecore/tests/kcmdlineargstest.cpp4
-rw-r--r--tdecore/tests/kmdcodectest.cpp4
-rw-r--r--tdecore/tests/testqtargs.cpp6
12 files changed, 56 insertions, 56 deletions
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 <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
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<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
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<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.
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 <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
};
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 <baudrate>", 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 <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 );
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 <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[])
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 10:19:41 +0000