AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QCommandLineParser: improve implementation

Browse Source 
Based on feedback from Thiago.

Change-Id: I9a3ce0b90b5d1d680c66351d421874effbd426f8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
David Faure 2013-08-31 00:32:37 +02:00 committed by The Qt Project
parent be3ff4176f
commit 3bd73dd91f
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/corelib/tools/qcommandlineoption.cpp
View File

@ -195,16 +195,19 @@ void QCommandLineOptionPrivate::setNames(const QStringList &nameList)
if (nameList.isEmpty()) if (nameList.isEmpty())
qWarning("QCommandLineOption: Options must have at least one name"); qWarning("QCommandLineOption: Options must have at least one name");
foreach (const QString &name, nameList) { foreach (const QString &name, nameList) {
if (name.isEmpty()) if (name.isEmpty()) {
qWarning("QCommandLineOption: Option names cannot be empty"); qWarning("QCommandLineOption: Option names cannot be empty");
else if (name.startsWith(QLatin1Char('-'))) } else {
qWarning("QCommandLineOption: Option names cannot start with a '-'"); const QChar c = name.at(0);
else if (name.startsWith(QLatin1Char('/'))) if (c == QLatin1Char('-'))
qWarning("QCommandLineOption: Option names cannot start with a '/'"); qWarning("QCommandLineOption: Option names cannot start with a '-'");
else if (name.contains(QLatin1Char('='))) else if (c == QLatin1Char('/'))
qWarning("QCommandLineOption: Option names cannot contain a '='"); qWarning("QCommandLineOption: Option names cannot start with a '/'");
else else if (name.contains(QLatin1Char('=')))
names.append(name); qWarning("QCommandLineOption: Option names cannot contain a '='");
else
names.append(name);
}
} }
} }

20
src/corelib/tools/qcommandlineparser.cpp
View File

@ -52,9 +52,6 @@ QT_BEGIN_NAMESPACE
typedef QHash<QString, int> NameHash_t; 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 class QCommandLineParserPrivate
{ {
public: public:
@ -122,12 +119,12 @@ public:
QStringList QCommandLineParserPrivate::aliases(const QString &optionName) const QStringList QCommandLineParserPrivate::aliases(const QString &optionName) const
{ {
const NameHash_t::mapped_type optionOffset = nameHash.value(optionName, optionNotFound); const NameHash_t::const_iterator it = nameHash.find(optionName);
if (optionOffset == optionNotFound) { if (it == nameHash.end()) {
qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName)); qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName));
return QStringList(); 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)) { if (!d->parse(arguments)) {
fprintf(stderr, "%s\n", qPrintable(errorText())); fprintf(stderr, "%s\n", qPrintable(errorText()));
::exit(1); ::exit(EXIT_FAILURE);
} }
if (d->builtinVersionOption && isSet(QStringLiteral("version"))) { if (d->builtinVersionOption && isSet(QStringLiteral("version"))) {
printf("%s %s\n", qPrintable(QCoreApplication::applicationName()), qPrintable(QCoreApplication::applicationVersion())); printf("%s %s\n", qPrintable(QCoreApplication::applicationName()), qPrintable(QCoreApplication::applicationVersion()));
::exit(0); ::exit(EXIT_SUCCESS);
} }
if (d->builtinHelpOption && isSet(QStringLiteral("help"))) 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 QStringList QCommandLineParser::values(const QString &optionName) const
{ {
d->checkParsed("values"); d->checkParsed("values");
const NameHash_t::mapped_type optionOffset = d->nameHash.value(optionName, optionNotFound); const NameHash_t::const_iterator it = d->nameHash.find(optionName);
if (optionOffset != optionNotFound) { if (it != d->nameHash.end()) {
const int optionOffset = *it;
QStringList values = d->optionValuesHash.value(optionOffset); QStringList values = d->optionValuesHash.value(optionOffset);
if (values.isEmpty()) if (values.isEmpty())
values = d->commandLineOptionList.at(optionOffset).defaultValues(); values = d->commandLineOptionList.at(optionOffset).defaultValues();