From 32fa8ab70471a6fdaba53d3241688364baef5ce2 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 31 Aug 2013 00:32:30 +0200 Subject: [PATCH] QCommandLineOption: improve runtime warnings Change-Id: I48a278acf3a8eb0cfa829deb65cf65dfd8ec23af Reviewed-by: Thiago Macieira --- src/corelib/tools/qcommandlineoption.cpp | 10 +++++----- .../qcommandlineparser/tst_qcommandlineparser.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/tools/qcommandlineoption.cpp b/src/corelib/tools/qcommandlineoption.cpp index 4f9e166587..3c857c8def 100644 --- a/src/corelib/tools/qcommandlineoption.cpp +++ b/src/corelib/tools/qcommandlineoption.cpp @@ -193,16 +193,16 @@ void QCommandLineOptionPrivate::setNames(const QStringList &nameList) { names.clear(); if (nameList.isEmpty()) - qWarning("Options must have at least one name"); + qWarning("QCommandLineOption: Options must have at least one name"); foreach (const QString &name, nameList) { if (name.isEmpty()) - qWarning("Option names cannot be empty"); + qWarning("QCommandLineOption: Option names cannot be empty"); else if (name.startsWith(QLatin1Char('-'))) - qWarning("Option names cannot start with a '-'"); + qWarning("QCommandLineOption: Option names cannot start with a '-'"); else if (name.startsWith(QLatin1Char('/'))) - qWarning("Option names cannot start with a '/'"); + qWarning("QCommandLineOption: Option names cannot start with a '/'"); else if (name.contains(QLatin1Char('='))) - qWarning("Option names cannot contain a '='"); + qWarning("QCommandLineOption: Option names cannot contain a '='"); else names.append(name); } diff --git a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp index bf9c8a6464..9219ff72df 100644 --- a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp +++ b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp @@ -98,7 +98,7 @@ void tst_QCommandLineParser::testInvalidOptions() { QCoreApplication app(empty_argc, empty_argv); QCommandLineParser parser; - QTest::ignoreMessage(QtWarningMsg, "Option names cannot start with a '-'"); + QTest::ignoreMessage(QtWarningMsg, "QCommandLineOption: Option names cannot start with a '-'"); parser.addOption(QCommandLineOption(QStringLiteral("-v"), QStringLiteral("Displays version information."))); }