diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2025-01-16 17:09:56 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2025-01-17 17:02:52 +0100 |
| commit | 9a1a828ae535645f98d0ba9fc7c0c429097a2ac4 (patch) | |
| tree | 368ba5ee4d5907f0f6040b20517078faf730920b /src/corelib/tools/qcommandlineparser.cpp | |
| parent | 40f7454c919501f3c984c8fe4eeb379b360d4789 (diff) | |
QCommandLineParser: convert MessageType to enum class
Amends bad618606d64e943e3fa78e7d1dbc8e1fab55480.
Found in Qt 6.9 API review.
Pick-to: 6.9
Change-Id: I424fc1f80e36343f1aef4b05c551579ec0f04eba
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qcommandlineparser.cpp')
| -rw-r--r-- | src/corelib/tools/qcommandlineparser.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp index 01d93bc941f..470b77354b0 100644 --- a/src/corelib/tools/qcommandlineparser.cpp +++ b/src/corelib/tools/qcommandlineparser.cpp @@ -537,9 +537,9 @@ static inline bool displayMessageBox() The enum is used to specify the type of the message and how it will be shown to the users. - \value InformationMessage Used to show information messages. The message + \value Information Used to show information messages. The message will be printed to \c {stdout}. - \value ErrorMessage Used to show error messages. The message will be printed + \value Error Used to show error messages. The message will be printed to \c {stderr}. \sa showMessageAndExit() @@ -567,7 +567,7 @@ static inline bool displayMessageBox() #if defined(Q_OS_WIN) && !defined(QT_BOOTSTRAPPED) if (displayMessageBox()) { const UINT flags = MB_OK | MB_TOPMOST | MB_SETFOREGROUND - | (type == InformationMessage ? MB_ICONINFORMATION : MB_ICONERROR); + | (type == MessageType::Information ? MB_ICONINFORMATION : MB_ICONERROR); QString title; if (QCoreApplication::instance()) title = QCoreApplication::instance()->property("applicationDisplayName").toString(); @@ -579,7 +579,7 @@ static inline bool displayMessageBox() ::exit(exitCode); } #endif // Q_OS_WIN && !QT_BOOTSTRAPPED - fputs(qPrintable(message), type == InformationMessage ? stdout : stderr); + fputs(qPrintable(message), type == MessageType::Information ? stdout : stderr); qt_call_post_routines(); ::exit(exitCode); } @@ -601,7 +601,7 @@ static inline bool displayMessageBox() void QCommandLineParser::process(const QStringList &arguments) { if (!d->parse(arguments)) { - showMessageAndExit(ErrorMessage, + showMessageAndExit(MessageType::Error, QCoreApplication::applicationName() + ": "_L1 + errorText() + u'\n', EXIT_FAILURE); } @@ -1036,7 +1036,7 @@ QStringList QCommandLineParser::unknownOptionNames() const */ Q_NORETURN void QCommandLineParser::showVersion() { - showMessageAndExit(InformationMessage, + showMessageAndExit(MessageType::Information, QCoreApplication::applicationName() + u' ' + QCoreApplication::applicationVersion() + u'\n', EXIT_SUCCESS); @@ -1060,7 +1060,7 @@ Q_NORETURN void QCommandLineParser::showHelp(int exitCode) Q_NORETURN void QCommandLineParserPrivate::showHelp(int exitCode, bool includeQtOptions) { - QCommandLineParser::showMessageAndExit(QCommandLineParser::InformationMessage, + QCommandLineParser::showMessageAndExit(QCommandLineParser::MessageType::Information, helpText(includeQtOptions), exitCode); } |