diff options
author | David Faure <david.faure@kdab.com> | 2013-08-31 00:32:37 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 19:07:18 +0200 |
commit | 3bd73dd91f4579cad50a04600a18d242a534900e (patch) | |
tree | 4b010cb6dc11fecde7f46302564de75ddf1d4c51 /src/corelib/tools/qcommandlineparser.cpp | |
parent | be3ff4176f125b35f3d4b4a8dc3b0ff65562e852 (diff) |
QCommandLineParser: improve implementation
Based on feedback from Thiago.
Change-Id: I9a3ce0b90b5d1d680c66351d421874effbd426f8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qcommandlineparser.cpp')
-rw-r--r-- | src/corelib/tools/qcommandlineparser.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
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(); |