diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 13:42:58 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 13:55:47 +0100 |
commit | c64e050dee65a880d21163ffb480fd44725b2a14 (patch) | |
tree | 7c77e1fccd0b23fdf5753d738ac2c31ac85c0139 | |
parent | ea2734947c55c611db339afd84bdade7fd19ff0c (diff) |
Avoid initializing QFlags with 0 or nullptr
It is being deprecated.
Change-Id: I69effb678ee29d9c98bdd51dc898845869211bcf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | src/imports/platform/qquickplatformfiledialog.cpp | 2 | ||||
-rw-r--r-- | src/imports/platform/qquickplatformfolderdialog.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdialogbuttonbox.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdialogbuttonbox_p_p.h | 2 | ||||
-rw-r--r-- | tests/auto/qquickpopup/tst_qquickpopup.cpp | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp index 9c1eb684..471fac07 100644 --- a/src/imports/platform/qquickplatformfiledialog.cpp +++ b/src/imports/platform/qquickplatformfiledialog.cpp @@ -303,7 +303,7 @@ void QQuickPlatformFileDialog::setOptions(QFileDialogOptions::FileDialogOptions void QQuickPlatformFileDialog::resetOptions() { - setOptions(0); + setOptions({}); } /*! diff --git a/src/imports/platform/qquickplatformfolderdialog.cpp b/src/imports/platform/qquickplatformfolderdialog.cpp index 512dce52..1854c637 100644 --- a/src/imports/platform/qquickplatformfolderdialog.cpp +++ b/src/imports/platform/qquickplatformfolderdialog.cpp @@ -186,7 +186,7 @@ void QQuickPlatformFolderDialog::setOptions(QFileDialogOptions::FileDialogOption void QQuickPlatformFolderDialog::resetOptions() { - setOptions(0); + setOptions({}); } /*! diff --git a/src/quicktemplates2/qquickdialogbuttonbox.cpp b/src/quicktemplates2/qquickdialogbuttonbox.cpp index 10d80778..2e91057a 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox.cpp +++ b/src/quicktemplates2/qquickdialogbuttonbox.cpp @@ -542,7 +542,7 @@ void QQuickDialogButtonBox::setAlignment(Qt::Alignment alignment) void QQuickDialogButtonBox::resetAlignment() { - setAlignment(0); + setAlignment({}); } /*! diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h index 6f9c9033..22da9e6d 100644 --- a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h +++ b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h @@ -80,7 +80,7 @@ public: void updateLanguage(); - Qt::Alignment alignment = 0; + Qt::Alignment alignment; QQuickDialogButtonBox::Position position = QQuickDialogButtonBox::Footer; QPlatformDialogHelper::StandardButtons standardButtons = QPlatformDialogHelper::NoButton; QPlatformDialogHelper::ButtonLayout buttonLayout = QPlatformDialogHelper::UnknownLayout; diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp index 78d55e6a..cef555c0 100644 --- a/tests/auto/qquickpopup/tst_qquickpopup.cpp +++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp @@ -745,7 +745,9 @@ void tst_QQuickPopup::wheel_data() static bool sendWheelEvent(QQuickItem *item, const QPoint &localPos, int degrees) { QQuickWindow *window = item->window(); - QWheelEvent wheelEvent(localPos, item->window()->mapToGlobal(localPos), QPoint(0, 0), QPoint(0, 8 * degrees), 0, Qt::Vertical, Qt::NoButton, 0); + QWheelEvent wheelEvent(localPos, item->window()->mapToGlobal(localPos), + QPoint(0, 0), QPoint(0, 8 * degrees), + 0, Qt::Vertical, Qt::NoButton, {}); QSpontaneKeyEvent::setSpontaneous(&wheelEvent); return qGuiApp->notify(window, &wheelEvent); } |