From c27d4981e9c7ea441729cf7a955c0d44efa9aac3 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 30 Jun 2015 22:14:24 +0200 Subject: Fix nullptr literal 0s which would look odd as nullptr These all invoke the QFlags<>(Zero *) ctor, which is designed to accept a 0, but no other int. But in doing so, it requires passing a nullptr literal, and 0 is not a nullptr literal accepted under -Wzero-as-null-pointer-constant or similar warnings. Fix by using the QFlags::QFlags() ctor instead. Task-number: QTBUG-45291 Change-Id: I73f9c9f4de11eeb1ba04ace6c7121d17510ea29f Reviewed-by: Thiago Macieira --- src/gui/text/qtextdocument.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/gui/text/qtextdocument.h') diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h index 43f351135b..f05b624704 100644 --- a/src/gui/text/qtextdocument.h +++ b/src/gui/text/qtextdocument.h @@ -157,17 +157,17 @@ public: }; Q_DECLARE_FLAGS(FindFlags, FindFlag) - QTextCursor find(const QString &subString, int from = 0, FindFlags options = 0) const; - QTextCursor find(const QString &subString, const QTextCursor &cursor, FindFlags options = 0) const; + QTextCursor find(const QString &subString, int from = 0, FindFlags options = FindFlags()) const; + QTextCursor find(const QString &subString, const QTextCursor &cursor, FindFlags options = FindFlags()) const; #ifndef QT_NO_REGEXP - QTextCursor find(const QRegExp &expr, int from = 0, FindFlags options = 0) const; - QTextCursor find(const QRegExp &expr, const QTextCursor &cursor, FindFlags options = 0) const; + QTextCursor find(const QRegExp &expr, int from = 0, FindFlags options = FindFlags()) const; + QTextCursor find(const QRegExp &expr, const QTextCursor &cursor, FindFlags options = FindFlags()) const; #endif #ifndef QT_NO_REGULAREXPRESSION - QTextCursor find(const QRegularExpression &expr, int from = 0, FindFlags options = 0) const; - QTextCursor find(const QRegularExpression &expr, const QTextCursor &cursor, FindFlags options = 0) const; + QTextCursor find(const QRegularExpression &expr, int from = 0, FindFlags options = FindFlags()) const; + QTextCursor find(const QRegularExpression &expr, const QTextCursor &cursor, FindFlags options = FindFlags()) const; #endif QTextFrame *frameAt(int pos) const; -- cgit v1.2.3