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/widgets/dialogs/qfiledialog.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/widgets/dialogs/qfiledialog.h') diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index bba8c5f3c7..ffe49a2dd2 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -205,14 +205,14 @@ public: const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, - Options options = 0); + Options options = Options()); static QUrl getOpenFileUrl(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QUrl &dir = QUrl(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, - Options options = 0, + Options options = Options(), const QStringList &supportedSchemes = QStringList()); static QString getSaveFileName(QWidget *parent = Q_NULLPTR, @@ -220,14 +220,14 @@ public: const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, - Options options = 0); + Options options = Options()); static QUrl getSaveFileUrl(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QUrl &dir = QUrl(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, - Options options = 0, + Options options = Options(), const QStringList &supportedSchemes = QStringList()); static QString getExistingDirectory(QWidget *parent = Q_NULLPTR, @@ -246,14 +246,14 @@ public: const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, - Options options = 0); + Options options = Options()); static QList getOpenFileUrls(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QUrl &dir = QUrl(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, - Options options = 0, + Options options = Options(), const QStringList &supportedSchemes = QStringList()); -- cgit v1.2.3