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 | |
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>
-rw-r--r-- | src/core/api/qwebenginecookiestore.cpp | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginecookiestore.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginedownloadrequest.h | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginenotification.cpp | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginepage.cpp | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginepage.h | 4 | ||||
-rw-r--r-- | src/core/api/qwebengineprofile.h | 6 | ||||
-rw-r--r-- | src/core/api/qwebengineurlschemehandler.h | 2 | ||||
-rw-r--r-- | src/plugins/qwebengineview/qwebengineview_plugin.h | 4 | ||||
-rw-r--r-- | src/webenginequick/api/qquickwebengineprofile.h | 4 | ||||
-rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 6 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.h | 2 |
12 files changed, 19 insertions, 19 deletions
diff --git a/src/core/api/qwebenginecookiestore.cpp b/src/core/api/qwebenginecookiestore.cpp index a09a74bf6..f24ac7b27 100644 --- a/src/core/api/qwebenginecookiestore.cpp +++ b/src/core/api/qwebenginecookiestore.cpp @@ -66,7 +66,7 @@ QWebEngineCookieStorePrivate::QWebEngineCookieStorePrivate(QWebEngineCookieStore , m_deleteSessionCookiesPending(false) , m_deleteAllCookiesPending(false) , m_getAllCookiesPending(false) - , delegate(0) + , delegate(nullptr) {} void QWebEngineCookieStorePrivate::processPendingUserCookies() diff --git a/src/core/api/qwebenginecookiestore.h b/src/core/api/qwebenginecookiestore.h index ff8865406..158c46108 100644 --- a/src/core/api/qwebenginecookiestore.h +++ b/src/core/api/qwebenginecookiestore.h @@ -85,7 +85,7 @@ Q_SIGNALS: void cookieRemoved(const QNetworkCookie &cookie); private: - explicit QWebEngineCookieStore(QObject *parent = Q_NULLPTR); + explicit QWebEngineCookieStore(QObject *parent = nullptr); friend class QtWebEngineCore::ContentBrowserClientQt; friend class QtWebEngineCore::CookieMonsterDelegateQt; friend class QtWebEngineCore::ProfileAdapter; diff --git a/src/core/api/qwebenginedownloadrequest.h b/src/core/api/qwebenginedownloadrequest.h index f30efe90c..60782390c 100644 --- a/src/core/api/qwebenginedownloadrequest.h +++ b/src/core/api/qwebenginedownloadrequest.h @@ -170,7 +170,7 @@ private: friend class QWebEngineProfilePrivate; friend class QQuickWebEngineProfilePrivate; friend class QWebEnginePage; - QWebEngineDownloadRequest(QWebEngineDownloadRequestPrivate*, QObject *parent = Q_NULLPTR); + QWebEngineDownloadRequest(QWebEngineDownloadRequestPrivate*, QObject *parent = nullptr); QScopedPointer<QWebEngineDownloadRequestPrivate> d_ptr; }; diff --git a/src/core/api/qwebenginenotification.cpp b/src/core/api/qwebenginenotification.cpp index 0505b825a..60646d2c9 100644 --- a/src/core/api/qwebenginenotification.cpp +++ b/src/core/api/qwebenginenotification.cpp @@ -90,7 +90,7 @@ public: ~QWebEngineNotificationPrivate() override { if (controller->client() == this) - controller->setClient(0); + controller->setClient(nullptr); } // UserNotificationController::Client: diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp index 158f79eef..499343bb3 100644 --- a/src/core/api/qwebenginepage.cpp +++ b/src/core/api/qwebenginepage.cpp @@ -169,7 +169,7 @@ QWebEnginePagePrivate::QWebEnginePagePrivate(QWebEngineProfile *_profile) , history(new QWebEngineHistory(new QWebEngineHistoryPrivate(this))) , profile(_profile ? _profile : QWebEngineProfile::defaultProfile()) , settings(new QWebEngineSettings(profile->settings())) - , view(0) + , view(nullptr) , isLoading(false) , scriptCollection(new QWebEngineScriptCollectionPrivate(profileAdapter()->userResourceController(), adapter)) , m_isBeingAdopted(false) diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h index 78d759e1a..ecf4e3307 100644 --- a/src/core/api/qwebenginepage.h +++ b/src/core/api/qwebenginepage.h @@ -240,8 +240,8 @@ public: }; Q_ENUM(LifecycleState) - explicit QWebEnginePage(QObject *parent = Q_NULLPTR); - QWebEnginePage(QWebEngineProfile *profile, QObject *parent = Q_NULLPTR); + explicit QWebEnginePage(QObject *parent = nullptr); + QWebEnginePage(QWebEngineProfile *profile, QObject *parent = nullptr); ~QWebEnginePage(); QWebEngineHistory *history() const; diff --git a/src/core/api/qwebengineprofile.h b/src/core/api/qwebengineprofile.h index b2088cf5d..a483f041e 100644 --- a/src/core/api/qwebengineprofile.h +++ b/src/core/api/qwebengineprofile.h @@ -66,8 +66,8 @@ class QWebEngineUrlSchemeHandler; class Q_WEBENGINECORE_EXPORT QWebEngineProfile : public QObject { Q_OBJECT public: - explicit QWebEngineProfile(QObject *parent = Q_NULLPTR); - explicit QWebEngineProfile(const QString &name, QObject *parent = Q_NULLPTR); + explicit QWebEngineProfile(QObject *parent = nullptr); + explicit QWebEngineProfile(const QString &name, QObject *parent = nullptr); virtual ~QWebEngineProfile(); enum HttpCacheType { @@ -153,7 +153,7 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QWebEngineProfile) Q_DECLARE_PRIVATE(QWebEngineProfile) - QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = Q_NULLPTR); + QWebEngineProfile(QWebEngineProfilePrivate *, QObject *parent = nullptr); friend class QWebEnginePage; friend class QWebEnginePagePrivate; diff --git a/src/core/api/qwebengineurlschemehandler.h b/src/core/api/qwebengineurlschemehandler.h index 4574bf8b0..91ee21695 100644 --- a/src/core/api/qwebengineurlschemehandler.h +++ b/src/core/api/qwebengineurlschemehandler.h @@ -51,7 +51,7 @@ class QWebEngineUrlRequestJob; class Q_WEBENGINECORE_EXPORT QWebEngineUrlSchemeHandler : public QObject { Q_OBJECT public: - QWebEngineUrlSchemeHandler(QObject *parent = Q_NULLPTR); + QWebEngineUrlSchemeHandler(QObject *parent = nullptr); ~QWebEngineUrlSchemeHandler(); virtual void requestStarted(QWebEngineUrlRequestJob *) = 0; diff --git a/src/plugins/qwebengineview/qwebengineview_plugin.h b/src/plugins/qwebengineview/qwebengineview_plugin.h index dd7d38a72..8c0960adc 100644 --- a/src/plugins/qwebengineview/qwebengineview_plugin.h +++ b/src/plugins/qwebengineview/qwebengineview_plugin.h @@ -64,7 +64,7 @@ class QWebEngineView : public QWidget { Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor) // Designable public: - explicit QWebEngineView(QWidget *parent = Q_NULLPTR) : QWidget(parent) {} + explicit QWebEngineView(QWidget *parent = nullptr) : QWidget(parent) {} QString title() const { return QString(); } QUrl url() const { return QUrl(); } @@ -84,7 +84,7 @@ class QWebEngineViewPlugin: public QObject, public QDesignerCustomWidgetInterfac Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface") Q_INTERFACES(QDesignerCustomWidgetInterface) public: - explicit QWebEngineViewPlugin(QObject *parent = Q_NULLPTR); + explicit QWebEngineViewPlugin(QObject *parent = nullptr); QString name() const override; QString group() const override; 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) diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h index 20ab9d6c0..22c115bd1 100644 --- a/src/webenginewidgets/api/qwebengineview.h +++ b/src/webenginewidgets/api/qwebengineview.h @@ -69,7 +69,7 @@ class QWEBENGINEWIDGETS_EXPORT QWebEngineView : public QWidget { Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor) public: - explicit QWebEngineView(QWidget* parent = Q_NULLPTR); + explicit QWebEngineView(QWidget *parent = nullptr); virtual ~QWebEngineView(); QWebEnginePage* page() const; |