diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-21 16:25:00 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-08-28 21:26:21 +0200 |
| commit | 86ebe46f591d33dc76e2f764524c988dd72f4437 (patch) | |
| tree | d111b4f65b0c93368951de0a04a73b12798be5d1 /src/corelib/kernel/qtranslator.h | |
| parent | a144820ae775c630bc9aed40c35af3f93518187c (diff) | |
Make QTranslator::load() insist that its return value be checked
Add Q_REQUIRED_RESULT to force callers to check the return; the
QTranslator object is unusable if load() fails.
Check the result in QTranslator's own test.
Task-number: QTBUG-85700
Change-Id: I07509c76470cc87626190670665cd3162bfb17e7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel/qtranslator.h')
| -rw-r--r-- | src/corelib/kernel/qtranslator.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h index 61a39c4089..4f4493ba44 100644 --- a/src/corelib/kernel/qtranslator.h +++ b/src/corelib/kernel/qtranslator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -66,16 +66,17 @@ public: QString language() const; QString filePath() const; - bool load(const QString & filename, - const QString & directory = QString(), - const QString & search_delimiters = QString(), - const QString & suffix = QString()); - bool load(const QLocale & locale, - const QString & filename, - const QString & prefix = QString(), - const QString & directory = QString(), - const QString & suffix = QString()); - bool load(const uchar *data, int len, const QString &directory = QString()); + Q_REQUIRED_RESULT bool load(const QString & filename, + const QString & directory = QString(), + const QString & search_delimiters = QString(), + const QString & suffix = QString()); + Q_REQUIRED_RESULT bool load(const QLocale & locale, + const QString & filename, + const QString & prefix = QString(), + const QString & directory = QString(), + const QString & suffix = QString()); + Q_REQUIRED_RESULT bool load(const uchar *data, int len, + const QString &directory = QString()); private: Q_DISABLE_COPY(QTranslator) |