From 86ebe46f591d33dc76e2f764524c988dd72f4437 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 21 Jul 2020 16:25:00 +0200 Subject: 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 --- src/corelib/kernel/qtranslator.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/corelib/kernel/qtranslator.h') 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) -- cgit v1.2.3