diff options
-rw-r--r-- | src/corelib/tools/qcommandlineoption.cpp | 21 | ||||
-rw-r--r-- | src/corelib/tools/qcommandlineparser.cpp | 20 |
2 files changed, 21 insertions, 20 deletions
diff --git a/src/corelib/tools/qcommandlineoption.cpp b/src/corelib/tools/qcommandlineoption.cpp index 3c857c8def..b30f7d25b4 100644 --- a/src/corelib/tools/qcommandlineoption.cpp +++ b/src/corelib/tools/qcommandlineoption.cpp @@ -195,16 +195,19 @@ void QCommandLineOptionPrivate::setNames(const QStringList &nameList) if (nameList.isEmpty()) qWarning("QCommandLineOption: Options must have at least one name"); foreach (const QString &name, nameList) { - if (name.isEmpty()) + if (name.isEmpty()) { qWarning("QCommandLineOption: Option names cannot be empty"); - else if (name.startsWith(QLatin1Char('-'))) - qWarning("QCommandLineOption: Option names cannot start with a '-'"); - else if (name.startsWith(QLatin1Char('/'))) - qWarning("QCommandLineOption: Option names cannot start with a '/'"); - else if (name.contains(QLatin1Char('='))) - qWarning("QCommandLineOption: Option names cannot contain a '='"); - else - names.append(name); + } else { + const QChar c = name.at(0); + if (c == QLatin1Char('-')) + qWarning("QCommandLineOption: Option names cannot start with a '-'"); + else if (c == QLatin1Char('/')) + qWarning("QCommandLineOption: Option names cannot start with a '/'"); + else if (name.contains(QLatin1Char('='))) + qWarning("QCommandLineOption: Option names cannot contain a '='"); + else + names.append(name); + } } } diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp index 282004384a..e2e410c059 100644 --- a/src/corelib/tools/qcommandlineparser.cpp +++ b/src/corelib/tools/qcommandlineparser.cpp @@ -52,9 +52,6 @@ QT_BEGIN_NAMESPACE typedef QHash<QString, int> NameHash_t; -// Special value for "not found" when doing hash lookups. -static const NameHash_t::mapped_type optionNotFound = ~0; - class QCommandLineParserPrivate { public: @@ -122,12 +119,12 @@ public: QStringList QCommandLineParserPrivate::aliases(const QString &optionName) const { - const NameHash_t::mapped_type optionOffset = nameHash.value(optionName, optionNotFound); - if (optionOffset == optionNotFound) { + const NameHash_t::const_iterator it = nameHash.find(optionName); + if (it == nameHash.end()) { qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName)); return QStringList(); } - return commandLineOptionList.at(optionOffset).names(); + return commandLineOptionList.at(*it).names(); } /*! @@ -423,16 +420,16 @@ void QCommandLineParser::process(const QStringList &arguments) { if (!d->parse(arguments)) { fprintf(stderr, "%s\n", qPrintable(errorText())); - ::exit(1); + ::exit(EXIT_FAILURE); } if (d->builtinVersionOption && isSet(QStringLiteral("version"))) { printf("%s %s\n", qPrintable(QCoreApplication::applicationName()), qPrintable(QCoreApplication::applicationVersion())); - ::exit(0); + ::exit(EXIT_SUCCESS); } if (d->builtinHelpOption && isSet(QStringLiteral("help"))) - showHelp(0); + showHelp(EXIT_SUCCESS); } /*! @@ -697,8 +694,9 @@ QString QCommandLineParser::value(const QString &optionName) const QStringList QCommandLineParser::values(const QString &optionName) const { d->checkParsed("values"); - const NameHash_t::mapped_type optionOffset = d->nameHash.value(optionName, optionNotFound); - if (optionOffset != optionNotFound) { + const NameHash_t::const_iterator it = d->nameHash.find(optionName); + if (it != d->nameHash.end()) { + const int optionOffset = *it; QStringList values = d->optionValuesHash.value(optionOffset); if (values.isEmpty()) values = d->commandLineOptionList.at(optionOffset).defaultValues(); |