diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qtestsupport_core.h | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qtranslator.h | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/corelib/kernel/qtestsupport_core.h b/src/corelib/kernel/qtestsupport_core.h index 01b3fda7d9..7043ffcf0f 100644 --- a/src/corelib/kernel/qtestsupport_core.h +++ b/src/corelib/kernel/qtestsupport_core.h @@ -51,7 +51,7 @@ namespace QTest { Q_CORE_EXPORT void qSleep(int ms); template <typename Functor> -Q_REQUIRED_RESULT static bool qWaitFor(Functor predicate, int timeout = 5000) +[[nodiscard]] static bool qWaitFor(Functor predicate, int timeout = 5000) { // We should not spin the event loop in case the predicate is already true, // otherwise we might send new events that invalidate the predicate. diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h index 4f4493ba44..1296186134 100644 --- a/src/corelib/kernel/qtranslator.h +++ b/src/corelib/kernel/qtranslator.h @@ -66,17 +66,17 @@ public: QString language() const; QString filePath() const; - 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()); + [[nodiscard]] bool load(const QString & filename, + const QString & directory = QString(), + const QString & search_delimiters = QString(), + const QString & suffix = QString()); + [[nodiscard]] bool load(const QLocale & locale, + const QString & filename, + const QString & prefix = QString(), + const QString & directory = QString(), + const QString & suffix = QString()); + [[nodiscard]] bool load(const uchar *data, int len, + const QString &directory = QString()); private: Q_DISABLE_COPY(QTranslator) |