diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-03 15:40:10 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-10 23:20:08 +0000 |
| commit | e1f733af31b27537f0c8ea6e559df4c8781050cd (patch) | |
| tree | fdfb1653ff3c2fe692aae675cfa6de99aa94048a /src/webenginequick | |
| parent | 2c248318bd5815d09d877027fcf29c90838bead6 (diff) | |
Replace Q_NULLPTR and pointer 0 with nullptr
Change-Id: Ifd7acf49b22be1532ba98371982af4b14f08e6fc
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
(cherry picked from commit 4a5a1ab7849bba6aed87132296c79ca9dba6d113)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/webenginequick')
| -rw-r--r-- | src/webenginequick/api/qquickwebengineprofile.h | 4 | ||||
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/webenginequick/api/qquickwebengineprofile.h b/src/webenginequick/api/qquickwebengineprofile.h index 61fd3ee18..93a7fbfdc 100644 --- a/src/webenginequick/api/qquickwebengineprofile.h +++ b/src/webenginequick/api/qquickwebengineprofile.h @@ -80,7 +80,7 @@ class Q_WEBENGINE_EXPORT QQuickWebEngineProfile : public QObject { Q_PROPERTY(QString downloadPath READ downloadPath WRITE setDownloadPath NOTIFY downloadPathChanged FINAL REVISION(1,5)) public: - QQuickWebEngineProfile(QObject *parent = Q_NULLPTR); + QQuickWebEngineProfile(QObject *parent = nullptr); ~QQuickWebEngineProfile(); enum HttpCacheType { @@ -174,7 +174,7 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QQuickWebEngineProfile) - QQuickWebEngineProfile(QQuickWebEngineProfilePrivate *, QObject *parent = Q_NULLPTR); + QQuickWebEngineProfile(QQuickWebEngineProfilePrivate *, QObject *parent = nullptr); QQuickWebEngineSettings *settings() const; friend class QQuickWebEngineSettings; diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 5a9e0f8fd..8b3c32d7c 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -130,15 +130,15 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate() return QQuickWebEngineFaviconProvider::faviconProviderUrl(url); }))) #if QT_CONFIG(webenginequick_testsupport) - , m_testSupport(0) + , m_testSupport(nullptr) #endif - , contextMenuExtraItems(0) + , contextMenuExtraItems(nullptr) , loadProgress(0) , m_fullscreenMode(false) , isLoading(false) , m_activeFocusOnPress(true) , devicePixelRatio(QGuiApplication::primaryScreen()->devicePixelRatio()) - , m_webChannel(0) + , m_webChannel(nullptr) , m_webChannelWorld(0) , m_defaultAudioMuted(false) , m_isBeingAdopted(false) |