summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-03-22 13:28:48 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-03-22 17:52:09 +0100
commita31548aabef745973a70057753b46ecab252355e (patch)
treefcda428137ca5f431fcd0695050e978f89fd58f4 /src
parent09baa5c7190d67bcb7f156efde54b12a2aecd52c (diff)
Replace 0 pointer constants with nullptr
Change-Id: I938b593deef66c782f5b0998948c0a7b2c32f656 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/core/api/qwebenginehistory.cpp4
-rw-r--r--src/core/api/qwebenginepage_p.h2
-rw-r--r--src/core/api/qwebengineurlrequestinfo.cpp2
-rw-r--r--src/webengine/api/qquickwebenginesettings_p.h2
-rw-r--r--src/webengine/api/qquickwebenginetestsupport_p.h2
-rw-r--r--src/webengine/api/qquickwebengineview_p.h2
-rw-r--r--src/webenginewidgets/api/qwebengineview.cpp2
-rw-r--r--src/webenginewidgets/doc/snippets/simple/main.cpp2
-rw-r--r--src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h2
9 files changed, 10 insertions, 10 deletions
diff --git a/src/core/api/qwebenginehistory.cpp b/src/core/api/qwebenginehistory.cpp
index 2f32444b2..08119d78c 100644
--- a/src/core/api/qwebenginehistory.cpp
+++ b/src/core/api/qwebenginehistory.cpp
@@ -127,7 +127,7 @@ QWebEngineHistoryPrivate::~QWebEngineHistoryPrivate()
// Invalidate shared item references possibly still out there.
QList<QWebEngineHistoryItem>::iterator it, end;
for (it = items.begin(), end = items.end(); it != end; ++it)
- it->d->m_adapter = 0;
+ it->d->m_adapter = nullptr;
}
void QWebEngineHistoryPrivate::updateItems() const
@@ -136,7 +136,7 @@ void QWebEngineHistoryPrivate::updateItems() const
// and avoid dangling references to our m_adapter.
int entryCount = m_adapter->webContentsAdapter()->navigationEntryCount();
while (items.size() > entryCount) {
- items.last().d->m_adapter = 0;
+ items.last().d->m_adapter = nullptr;
items.removeLast();
}
while (items.size() < entryCount) {
diff --git a/src/core/api/qwebenginepage_p.h b/src/core/api/qwebenginepage_p.h
index c0652ccc6..1f8087c59 100644
--- a/src/core/api/qwebenginepage_p.h
+++ b/src/core/api/qwebenginepage_p.h
@@ -112,7 +112,7 @@ public:
Q_DECLARE_PUBLIC(QWebEnginePage)
QWebEnginePage *q_ptr;
- QWebEnginePagePrivate(QWebEngineProfile *profile = 0);
+ QWebEnginePagePrivate(QWebEngineProfile *profile = nullptr);
~QWebEnginePagePrivate();
QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) override;
diff --git a/src/core/api/qwebengineurlrequestinfo.cpp b/src/core/api/qwebengineurlrequestinfo.cpp
index 040305f66..10661ec8f 100644
--- a/src/core/api/qwebengineurlrequestinfo.cpp
+++ b/src/core/api/qwebengineurlrequestinfo.cpp
@@ -87,7 +87,7 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebContentsAdapterClient::RedirectNavigation
*/
/*!
- \fn QWebEngineUrlRequestInterceptor::QWebEngineUrlRequestInterceptor(QObject * p = 0)
+ \fn QWebEngineUrlRequestInterceptor::QWebEngineUrlRequestInterceptor(QObject *p = nullptr)
Creates a new QWebEngineUrlRequestInterceptor object with \a p as parent.
*/
diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h
index 20db86448..5fd5ed960 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
+++ b/src/webengine/api/qquickwebenginesettings_p.h
@@ -205,7 +205,7 @@ signals:
Q_REVISION(8) void pdfViewerEnabledChanged();
private:
- explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = 0);
+ explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = nullptr);
Q_DISABLE_COPY(QQuickWebEngineSettings)
friend class QQuickWebEngineProfilePrivate;
friend class QQuickWebEngineViewPrivate;
diff --git a/src/webengine/api/qquickwebenginetestsupport_p.h b/src/webengine/api/qquickwebenginetestsupport_p.h
index fa6045f89..449994295 100644
--- a/src/webengine/api/qquickwebenginetestsupport_p.h
+++ b/src/webengine/api/qquickwebenginetestsupport_p.h
@@ -104,7 +104,7 @@ public Q_SLOTS:
bool mouseMultiClick(QObject *item, qreal x, qreal y, int clickCount);
private:
- QWindow *eventWindow(QObject *item = 0);
+ QWindow *eventWindow(QObject *item = nullptr);
void mouseEvent(QEvent::Type type, QWindow *window, QObject *item, const QPointF &_pos);
};
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 65639f76e..74be049f5 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -134,7 +134,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
Q_PROPERTY(qint64 renderProcessPid READ renderProcessPid NOTIFY renderProcessPidChanged FINAL REVISION 11)
public:
- QQuickWebEngineView(QQuickItem *parent = 0);
+ QQuickWebEngineView(QQuickItem *parent = nullptr);
~QQuickWebEngineView();
QUrl url() const;
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index 0891f9ca8..f929a2691 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -939,7 +939,7 @@ bool QContextMenuBuilder::isFullScreenMode()
void QContextMenuBuilder::addMenuItem(ContextMenuItem menuItem)
{
QPointer<QWebEnginePage> thisRef(m_view->page());
- QAction *action = 0;
+ QAction *action = nullptr;
switch (menuItem) {
case ContextMenuItem::Back:
diff --git a/src/webenginewidgets/doc/snippets/simple/main.cpp b/src/webenginewidgets/doc/snippets/simple/main.cpp
index acaf073ba..39c07b84d 100644
--- a/src/webenginewidgets/doc/snippets/simple/main.cpp
+++ b/src/webenginewidgets/doc/snippets/simple/main.cpp
@@ -55,7 +55,7 @@
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
- QWidget *parent = 0;
+ QWidget *parent = nullptr;
//! [Using QWebEngineView]
QWebEngineView *view = new QWebEngineView(parent);
view->load(QUrl("http://qt-project.org/"));
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
index bd66eee68..d106cf351 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
@@ -65,7 +65,7 @@ namespace QtWebEngineCore {
class RenderWidgetHostViewQtDelegateWidget : public QQuickWidget, public RenderWidgetHostViewQtDelegate {
Q_OBJECT
public:
- RenderWidgetHostViewQtDelegateWidget(RenderWidgetHostViewQtDelegateClient *client, QWidget *parent = 0);
+ RenderWidgetHostViewQtDelegateWidget(RenderWidgetHostViewQtDelegateClient *client, QWidget *parent = nullptr);
~RenderWidgetHostViewQtDelegateWidget();
void initAsPopup(const QRect&) override;