summaryrefslogtreecommitdiffstats
path: root/src/core/renderer_host
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-12 11:58:21 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2017-04-21 11:10:13 +0000
commita5c1754faa7bd9491fcf64dda34b479cdf62c9bd (patch)
tree61a093917f9c8308d2153335d49c58acc3836981 /src/core/renderer_host
parentd08524fbfbb78eca09bbab58d5a9840387d2d0e7 (diff)
Standardize override declaration
Update our overrides to Qt coding standard getting rid of Q_DECL_OVERRIDE and redundant virtual declarations. Change-Id: Id8b0750eb05c51fc8f50cac4000a811eebcbf918 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core/renderer_host')
-rw-r--r--src/core/renderer_host/resource_dispatcher_host_delegate_qt.h2
-rw-r--r--src/core/renderer_host/user_resource_controller_host.cpp2
-rw-r--r--src/core/renderer_host/web_channel_ipc_transport_host.h6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h
index 604499e9f..e7701751e 100644
--- a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h
+++ b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h
@@ -92,7 +92,7 @@ public:
bool HandleExternalProtocol(const GURL& url,
content::ResourceRequestInfo* info) override;
- virtual content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(net::AuthChallengeInfo *authInfo, net::URLRequest *request) Q_DECL_OVERRIDE;
+ content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(net::AuthChallengeInfo *authInfo, net::URLRequest *request) override;
};
} // namespace QtWebEngineCore
diff --git a/src/core/renderer_host/user_resource_controller_host.cpp b/src/core/renderer_host/user_resource_controller_host.cpp
index 9d2ba8eb8..95385ae2f 100644
--- a/src/core/renderer_host/user_resource_controller_host.cpp
+++ b/src/core/renderer_host/user_resource_controller_host.cpp
@@ -98,7 +98,7 @@ void UserResourceControllerHost::WebContentsObserverHelper::WebContentsDestroyed
class UserResourceControllerHost::RenderProcessObserverHelper : public content::RenderProcessHostObserver {
public:
RenderProcessObserverHelper(UserResourceControllerHost *);
- virtual void RenderProcessHostDestroyed(content::RenderProcessHost *) Q_DECL_OVERRIDE;
+ void RenderProcessHostDestroyed(content::RenderProcessHost *) override;
private:
UserResourceControllerHost *m_controllerHost;
};
diff --git a/src/core/renderer_host/web_channel_ipc_transport_host.h b/src/core/renderer_host/web_channel_ipc_transport_host.h
index 75b40477e..aa406471c 100644
--- a/src/core/renderer_host/web_channel_ipc_transport_host.h
+++ b/src/core/renderer_host/web_channel_ipc_transport_host.h
@@ -59,16 +59,16 @@ public:
virtual ~WebChannelIPCTransportHost();
// WebContentsObserver
- virtual void RenderViewHostChanged(content::RenderViewHost* old_host, content::RenderViewHost* new_host) Q_DECL_OVERRIDE;
+ void RenderViewHostChanged(content::RenderViewHost* old_host, content::RenderViewHost* new_host) override;
// QWebChannelAbstractTransport
- void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE;
+ void sendMessage(const QJsonObject &message) override;
void setWorldId(uint worldId);
uint worldId() const { return m_worldId; }
private:
- bool OnMessageReceived(const IPC::Message& message) Q_DECL_OVERRIDE;
+ bool OnMessageReceived(const IPC::Message& message) override;
void onWebChannelMessage(const std::vector<char> &message);
uint m_worldId;
};