Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTR

Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

5 files changed, 6 insertions, 6 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.