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>

1 files changed, 16 insertions, 12 deletions

diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
index b21d40b87..c378c327e 100644
--- a/src/core/media_capture_devices_dispatcher.h
+++ b/src/core/media_capture_devices_dispatcher.h
@@ -44,7 +44,6 @@
 #include <deque>
 #include <list>
 #include <map>
-#include <QtCore/qcompilerdetection.h>
 
 #include "web_contents_adapter_client.h"
 
@@ -77,16 +76,21 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
   void getDefaultDevices(const std::string &audioDeviceId, const std::string &videoDeviceId, bool audio, bool video, content::MediaStreamDevices *);
 
   // Overridden from content::MediaObserver:
-  virtual void OnAudioCaptureDevicesChanged() Q_DECL_OVERRIDE { }
-  virtual void OnVideoCaptureDevicesChanged() Q_DECL_OVERRIDE { }
-  virtual void OnMediaRequestStateChanged(int render_process_id, int render_frame_id, int page_request_id, const GURL& security_origin, content::MediaStreamType stream_type, content::MediaRequestState state) Q_DECL_OVERRIDE;
-
-  virtual void OnCreatingAudioStream(int /*render_process_id*/, int /*render_frame_id*/) Q_DECL_OVERRIDE { }
-  virtual void OnSetCapturingLinkSecured(int /*render_process_id*/,
-                                         int /*render_frame_id*/,
-                                         int /*page_request_id*/,
-                                         content::MediaStreamType /*stream_type*/,
-                                         bool /*is_secure*/) Q_DECL_OVERRIDE { }
+  void OnAudioCaptureDevicesChanged() override { }
+  void OnVideoCaptureDevicesChanged() override { }
+  void OnMediaRequestStateChanged(int render_process_id,
+                                  int render_frame_id,
+                                  int page_request_id,
+                                  const GURL& security_origin,
+                                  content::MediaStreamType stream_type,
+                                  content::MediaRequestState state) override;
+
+  void OnCreatingAudioStream(int /*render_process_id*/, int /*render_frame_id*/) override { }
+  void OnSetCapturingLinkSecured(int /*render_process_id*/,
+                                 int /*render_frame_id*/,
+                                 int /*page_request_id*/,
+                                 content::MediaStreamType /*stream_type*/,
+                                 bool /*is_secure*/) override { }
 
   DesktopStreamsRegistry *getDesktopStreamsRegistry();
 
@@ -108,7 +112,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
   virtual ~MediaCaptureDevicesDispatcher();
 
   // content::NotificationObserver implementation.
-  virtual void Observe(int type, const content::NotificationSource &source, const content::NotificationDetails &details) Q_DECL_OVERRIDE;
+  void Observe(int type, const content::NotificationSource &source, const content::NotificationDetails &details) override;
 
   // Helpers for ProcessMediaAccessRequest().
   void processDesktopCaptureAccessRequest(content::WebContents *, const content::MediaStreamRequest &, const content::MediaResponseCallback &);