From 5075b3a008195981bf4bea3e3e54df524883f06d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:38:52 -0600 Subject: Rename KCmd to avoid conflicts with KDE4 --- src/common/cli/cli_main.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/common/cli/cli_main.cpp') 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 ", 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; -- cgit v1.2.3