From ded7536c90023fdf5f643a180ced405643ba7ab5 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 2 Apr 2019 11:42:23 +0200
Subject: [PATCH] Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
---
src/core/api/qwebenginenotification.cpp | 2 +-
src/core/net/custom_protocol_handler.cpp | 2 +-
src/webengine/ui_delegates_manager.cpp | 2 +-
src/webenginewidgets/api/qwebengineview.cpp | 4 ++--
.../render_widget_host_view_qt_delegate_widget.cpp | 2 +-
.../quick/qquickwebengineview/tst_qquickwebengineview.cpp | 2 +-
.../tst_qquickwebengineviewgraphics.cpp | 2 +-
tests/auto/widgets/accessibility/tst_accessibility.cpp | 2 +-
tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 6 +++---
.../widgets/qwebengineprofile/tst_qwebengineprofile.cpp | 6 +++---
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 6 +++---
11 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/core/api/qwebenginenotification.cpp b/src/core/api/qwebenginenotification.cpp
index 89fd1eff9..ba9739b35 100644
--- a/src/core/api/qwebenginenotification.cpp
+++ b/src/core/api/qwebenginenotification.cpp
@@ -77,7 +77,7 @@ public:
}
// UserNotificationController::Client:
- virtual void notificationClosed(const UserNotificationController *) Q_DECL_OVERRIDE
+ virtual void notificationClosed(const UserNotificationController *) override
{
Q_EMIT q->closed();
}
diff --git a/src/core/net/custom_protocol_handler.cpp b/src/core/net/custom_protocol_handler.cpp
index 5132782c2..7e8ee47ab 100644
--- a/src/core/net/custom_protocol_handler.cpp
+++ b/src/core/net/custom_protocol_handler.cpp
@@ -54,7 +54,7 @@ CustomProtocolHandler::CustomProtocolHandler(QPointer<ProfileAdapter> profileAda
net::URLRequestJob *CustomProtocolHandler::MaybeCreateJob(net::URLRequest *request, net::NetworkDelegate *networkDelegate) const
{
if (!networkDelegate)
- return new net::URLRequestErrorJob(request, Q_NULLPTR, net::ERR_ACCESS_DENIED);
+ return new net::URLRequestErrorJob(request, nullptr, net::ERR_ACCESS_DENIED);
return new URLRequestCustomJob(request, networkDelegate, request->url().scheme(), m_profileAdapter);
}
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index da120ab69..a30fa7b98 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -324,7 +324,7 @@ void UIDelegatesManager::showDialog(QSharedPointer<JavaScriptDialogController> d
return;
}
- QQmlComponent *dialogComponent = Q_NULLPTR;
+ QQmlComponent *dialogComponent = nullptr;
switch (dialogComponentType) {
FOR_EACH_COMPONENT_TYPE(ASSIGN_DIALOG_COMPONENT_DATA_CASE_STATEMENT, NO_SEPARATOR)
default:
diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp
index 966b30100..91fc86cdf 100644
--- a/src/webenginewidgets/api/qwebengineview.cpp
+++ b/src/webenginewidgets/api/qwebengineview.cpp
@@ -119,7 +119,7 @@ static QAccessibleInterface *webAccessibleFactory(const QString &, QObject *obje
{
if (QWebEngineView *v = qobject_cast<QWebEngineView*>(object))
return new QWebEngineViewAccessible(v);
- return Q_NULLPTR;
+ return nullptr;
}
#endif // QT_NO_ACCESSIBILITY
@@ -459,7 +459,7 @@ QAccessibleInterface *QWebEngineViewAccessible::child(int index) const
{
if (index == 0 && view() && view()->page())
return view()->page()->d_func()->adapter->browserAccessible();
- return Q_NULLPTR;
+ return nullptr;
}
int QWebEngineViewAccessible::indexOfChild(const QAccessibleInterface *c) const
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 951360c05..140314681 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -197,7 +197,7 @@ void RenderWidgetHostViewQtDelegateWidget::removeParentBeforeParentDelete()
{
// Unset the parent, because parent is being destroyed, but the owner of this
// RenderWidgetHostViewQtDelegateWidget is actually a RenderWidgetHostViewQt instance.
- setParent(Q_NULLPTR);
+ setParent(nullptr);
// If this widget represents a popup window, make sure to close it, so that if the popup was the
// last visible top level window, the application event loop can quit if it deems it necessarry.
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index eb76be6db..74c04635f 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -878,7 +878,7 @@ public:
setAcceptHoverEvents(true);
}
- bool event(QEvent *event) Q_DECL_OVERRIDE
+ bool event(QEvent *event) override
{
switch (event->type()) {
case QEvent::TabletPress:
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
index 2b9742b99..b587f3b27 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
@@ -46,7 +46,7 @@ public:
Qt::QueuedConnection);
}
- virtual void exposeEvent(QExposeEvent *e) Q_DECL_OVERRIDE {
+ virtual void exposeEvent(QExposeEvent *e) override {
QQuickView::exposeEvent(e);
emit _q_exposeChanged();
}
diff --git a/tests/auto/widgets/accessibility/tst_accessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index 6efbf53ed..b0165cfbc 100644
--- a/tests/auto/widgets/accessibility/tst_accessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -134,7 +134,7 @@ void tst_Accessibility::hierarchy()
QVERIFY(windowRect.contains(inputRect));
QPoint inputCenter = inputRect.center();
QAccessibleInterface *hitTest = view;
- QAccessibleInterface *child = Q_NULLPTR;
+ QAccessibleInterface *child = nullptr;
while (hitTest) {
child = hitTest;
hitTest = hitTest->childAt(inputCenter.x(), inputCenter.y());
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 3792b5522..f73469d83 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -1550,7 +1550,7 @@ public:
JavaScriptCallback() { }
JavaScriptCallback(const QVariant& _expected) : expected(_expected) { }
- void check(const QVariant& result) Q_DECL_OVERRIDE
+ void check(const QVariant& result) override
{
QVERIFY(result.isValid());
QCOMPARE(result, expected);
@@ -1563,7 +1563,7 @@ private:
class JavaScriptCallbackNull : public JavaScriptCallbackBase
{
public:
- void check(const QVariant& result) Q_DECL_OVERRIDE
+ void check(const QVariant& result) override
{
QVERIFY(result.isNull());
// FIXME: Returned null values are currently invalid QVariants.
@@ -1574,7 +1574,7 @@ public:
class JavaScriptCallbackUndefined : public JavaScriptCallbackBase
{
public:
- void check(const QVariant& result) Q_DECL_OVERRIDE
+ void check(const QVariant& result) override
{
QVERIFY(result.isNull());
QVERIFY(!result.isValid());
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 8bd68bb97..ebd25e892 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -374,17 +374,17 @@ public:
{
}
- qint64 readData(char *, qint64) Q_DECL_OVERRIDE
+ qint64 readData(char *, qint64) override
{
m_job->fail(QWebEngineUrlRequestJob::RequestFailed);
return -1;
}
- qint64 writeData(const char *, qint64) Q_DECL_OVERRIDE
+ qint64 writeData(const char *, qint64) override
{
m_job->fail(QWebEngineUrlRequestJob::RequestFailed);
return -1;
}
- void close() Q_DECL_OVERRIDE
+ void close() override
{
QIODevice::close();
deleteLater();
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 17177c7fb..16a3d32b6 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -588,8 +588,8 @@ class KeyEventRecordingWidget : public QWidget {
public:
QList<QKeyEvent> pressEvents;
QList<QKeyEvent> releaseEvents;
- void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE { pressEvents << *e; }
- void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE { releaseEvents << *e; }
+ void keyPressEvent(QKeyEvent *e) override { pressEvents << *e; }
+ void keyReleaseEvent(QKeyEvent *e) override { releaseEvents << *e; }
};
void tst_QWebEngineView::unhandledKeyEventPropagation()
@@ -879,7 +879,7 @@ public:
explicit KeyboardAndMouseEventRecordingWidget(QWidget *parent = 0) :
QWidget(parent), m_eventCounter(0) {}
- bool event(QEvent *event) Q_DECL_OVERRIDE
+ bool event(QEvent *event) override
{
QString eventString;
switch (event->type()) {
--
GitLab