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/qcommandlineoption.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/qcommandlineoption.cpp')
-rw-r--r-- | src/corelib/tools/qcommandlineoption.cpp | 21 |
1 files changed, 12 insertions, 9 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); + } } } |