From 496f66ee52214ac614135c736f7d89c4dd08ba14 Mon Sep 17 00:00:00 2001 From: Zeno Albisser Date: Wed, 6 Nov 2013 17:15:12 +0100 Subject: Mark functions with Q_DECL_OVERRIDE where necessary. Change-Id: I15261c3737a3284b99308453132f09ee7889c444 Reviewed-by: Pierre Rossi --- lib/backing_store_qt.h | 6 +- lib/content_browser_client_qt.cpp | 26 ++--- lib/delegated_frame_node.cpp | 10 +- lib/download_manager_delegate_qt.cpp | 4 +- lib/javascript_dialog_manager_qt.h | 10 +- lib/network_delegate_qt.h | 100 ++++++---------- lib/quick/plugin.cpp | 2 +- .../render_widget_host_view_qt_delegate_quick.h | 36 +++--- lib/render_widget_host_view_qt.h | 130 ++++++++++----------- lib/resource_context_qt.h | 10 +- lib/url_request_context_getter_qt.h | 6 +- lib/web_contents_delegate_qt.h | 19 +-- lib/web_contents_view_qt.h | 50 ++++---- lib/widgets/Api/qwebenginepage.h | 2 +- .../render_widget_host_view_qt_delegate_widget.h | 28 ++--- lib/yuv_video_node.cpp | 16 +-- lib/yuv_video_node.h | 12 +- 17 files changed, 222 insertions(+), 245 deletions(-) diff --git a/lib/backing_store_qt.h b/lib/backing_store_qt.h index 7a7a23ee2..bce469034 100644 --- a/lib/backing_store_qt.h +++ b/lib/backing_store_qt.h @@ -57,10 +57,10 @@ public: virtual void PaintToBackingStore(content::RenderProcessHost *process, TransportDIB::Id bitmap, const gfx::Rect &bitmap_rect, const std::vector ©_rects, float scale_factor, const base::Closure &completion_callback, - bool *scheduled_completion_callback); + bool *scheduled_completion_callback) Q_DECL_OVERRIDE; - virtual void ScrollBackingStore(const gfx::Vector2d &delta, const gfx::Rect &clip_rect, const gfx::Size &view_size); - virtual bool CopyFromBackingStore(const gfx::Rect &rect, skia::PlatformBitmap *output); + virtual void ScrollBackingStore(const gfx::Vector2d &delta, const gfx::Rect &clip_rect, const gfx::Size &view_size) Q_DECL_OVERRIDE; + virtual bool CopyFromBackingStore(const gfx::Rect &rect, skia::PlatformBitmap *output) Q_DECL_OVERRIDE; private: // Number of physical pixels per view unit. This is 1 or 2 in practice. diff --git a/lib/content_browser_client_qt.cpp b/lib/content_browser_client_qt.cpp index 82587bf8d..dbe5ca2f4 100644 --- a/lib/content_browser_client_qt.cpp +++ b/lib/content_browser_client_qt.cpp @@ -93,35 +93,35 @@ public: { } - virtual void Run(Delegate *delegate) + virtual void Run(Delegate *delegate) Q_DECL_OVERRIDE { // FIXME: This could be needed if we want to run Chromium tests. // We could run a QEventLoop here. } - virtual void Quit() + virtual void Quit() Q_DECL_OVERRIDE { Q_UNREACHABLE(); } - virtual void ScheduleWork() + virtual void ScheduleWork() Q_DECL_OVERRIDE { QCoreApplication::postEvent(this, new QEvent(QEvent::User)); } - virtual void ScheduleDelayedWork(const base::TimeTicks &delayed_work_time) + virtual void ScheduleDelayedWork(const base::TimeTicks &delayed_work_time) Q_DECL_OVERRIDE { startTimer(GetTimeIntervalMilliseconds(delayed_work_time)); } protected: - virtual void customEvent(QEvent *ev) + virtual void customEvent(QEvent *ev) Q_DECL_OVERRIDE { if (handleScheduledWork()) QCoreApplication::postEvent(this, new QEvent(QEvent::User)); } - virtual void timerEvent(QTimerEvent *ev) + virtual void timerEvent(QTimerEvent *ev) Q_DECL_OVERRIDE { killTimer(ev->timerId()); @@ -229,15 +229,15 @@ public: Q_UNREACHABLE(); } - virtual void* GetHandle() { return m_handle; } + virtual void* GetHandle() Q_DECL_OVERRIDE { return m_handle; } // We don't care about the rest, this context shouldn't be used except for its handle. - virtual bool Initialize(gfx::GLSurface *, gfx::GpuPreference) { Q_UNREACHABLE(); return false; } - virtual void Destroy() { Q_UNREACHABLE(); } - virtual bool MakeCurrent(gfx::GLSurface *) { Q_UNREACHABLE(); return false; } - virtual void ReleaseCurrent(gfx::GLSurface *) { Q_UNREACHABLE(); } - virtual bool IsCurrent(gfx::GLSurface *) { Q_UNREACHABLE(); return false; } - virtual void SetSwapInterval(int) { Q_UNREACHABLE(); } + virtual bool Initialize(gfx::GLSurface *, gfx::GpuPreference) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; } + virtual void Destroy() Q_DECL_OVERRIDE { Q_UNREACHABLE(); } + virtual bool MakeCurrent(gfx::GLSurface *) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; } + virtual void ReleaseCurrent(gfx::GLSurface *) Q_DECL_OVERRIDE { Q_UNREACHABLE(); } + virtual bool IsCurrent(gfx::GLSurface *) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; } + virtual void SetSwapInterval(int) Q_DECL_OVERRIDE { Q_UNREACHABLE(); } private: void *m_handle; diff --git a/lib/delegated_frame_node.cpp b/lib/delegated_frame_node.cpp index c75256542..ad4bb7016 100644 --- a/lib/delegated_frame_node.cpp +++ b/lib/delegated_frame_node.cpp @@ -109,12 +109,12 @@ private: class MailboxTexture : public QSGTexture { public: MailboxTexture(const cc::TransferableResource *resource, bool hasAlpha); - virtual int textureId() const { return m_textureId; } + virtual int textureId() const Q_DECL_OVERRIDE { return m_textureId; } void setTextureSize(const QSize& size) { m_textureSize = size; } - virtual QSize textureSize() const { return m_textureSize; } - virtual bool hasAlphaChannel() const { return m_hasAlpha; } - virtual bool hasMipmaps() const { return false; } - virtual void bind(); + virtual QSize textureSize() const Q_DECL_OVERRIDE { return m_textureSize; } + virtual bool hasAlphaChannel() const Q_DECL_OVERRIDE { return m_hasAlpha; } + virtual bool hasMipmaps() const Q_DECL_OVERRIDE { return false; } + virtual void bind() Q_DECL_OVERRIDE; bool needsToFetch() const { return m_resource; } const cc::TransferableResource *resource() const { return m_resource; } diff --git a/lib/download_manager_delegate_qt.cpp b/lib/download_manager_delegate_qt.cpp index 265c28b1b..633d203ae 100644 --- a/lib/download_manager_delegate_qt.cpp +++ b/lib/download_manager_delegate_qt.cpp @@ -67,8 +67,8 @@ public: bool determineDownloadTarget(content::DownloadItem *item, const content::DownloadTargetCallback &callback); - virtual void OnDownloadUpdated(content::DownloadItem *download); - virtual void OnDownloadDestroyed(content::DownloadItem *download); + virtual void OnDownloadUpdated(content::DownloadItem *download) Q_DECL_OVERRIDE; + virtual void OnDownloadDestroyed(content::DownloadItem *download) Q_DECL_OVERRIDE; private: bool isPathAvailable(const QString& path); diff --git a/lib/javascript_dialog_manager_qt.h b/lib/javascript_dialog_manager_qt.h index 1a2a01db2..de416e03e 100644 --- a/lib/javascript_dialog_manager_qt.h +++ b/lib/javascript_dialog_manager_qt.h @@ -58,12 +58,12 @@ public: virtual void RunJavaScriptDialog(content::WebContents *, const GURL &, const std::string &acceptLang, content::JavaScriptMessageType javascriptMessageType, const base::string16 &messageText, const base::string16 &defaultPromptText, - const content::JavaScriptDialogManager::DialogClosedCallback &callback, bool *didSuppressMessage); + const content::JavaScriptDialogManager::DialogClosedCallback &callback, bool *didSuppressMessage) Q_DECL_OVERRIDE; virtual void RunBeforeUnloadDialog(content::WebContents *, const base::string16 &messageText, bool isReload, - const content::JavaScriptDialogManager::DialogClosedCallback &callback) { Q_UNUSED(messageText); Q_UNUSED(isReload); Q_UNUSED(callback); } - virtual bool HandleJavaScriptDialog(content::WebContents *, bool accept, const base::string16 *promptOverride); - virtual void CancelActiveAndPendingDialogs(content::WebContents *) {} - virtual void WebContentsDestroyed(content::WebContents *) {} + const content::JavaScriptDialogManager::DialogClosedCallback &callback) Q_DECL_OVERRIDE { Q_UNUSED(messageText); Q_UNUSED(isReload); Q_UNUSED(callback); } + virtual bool HandleJavaScriptDialog(content::WebContents *, bool accept, const base::string16 *promptOverride) Q_DECL_OVERRIDE; + virtual void CancelActiveAndPendingDialogs(content::WebContents *) Q_DECL_OVERRIDE {} + virtual void WebContentsDestroyed(content::WebContents *) Q_DECL_OVERRIDE {} }; diff --git a/lib/network_delegate_qt.h b/lib/network_delegate_qt.h index f31b98212..9413addb3 100644 --- a/lib/network_delegate_qt.h +++ b/lib/network_delegate_qt.h @@ -43,75 +43,47 @@ #include "net/base/network_delegate.h" +#include "qglobal.h" + class NetworkDelegateQt : public net::NetworkDelegate { - public: - NetworkDelegateQt() {} - virtual ~NetworkDelegateQt() {} +public: + NetworkDelegateQt() {} + virtual ~NetworkDelegateQt() {} + + + private: + // net::NetworkDelegate implementation. + virtual int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, GURL* new_url) Q_DECL_OVERRIDE + { + return net::OK; + } + + virtual int OnBeforeSendHeaders(net::URLRequest* request, const net::CompletionCallback& callback, net::HttpRequestHeaders* headers) Q_DECL_OVERRIDE + { + return net::OK; + } + virtual void OnSendHeaders(net::URLRequest* request, const net::HttpRequestHeaders& headers) Q_DECL_OVERRIDE {} + virtual int OnHeadersReceived(net::URLRequest* request, const net::CompletionCallback& callback, + const net::HttpResponseHeaders* original_response_headers, + scoped_refptr* override_response_headers) Q_DECL_OVERRIDE { return net::OK; } - private: - // net::NetworkDelegate implementation. - virtual int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, GURL* new_url) /*Q_DECL_OVERRIDE*/ - { - return net::OK; - } - virtual int OnBeforeSendHeaders(net::URLRequest* request, - const net::CompletionCallback& callback, - net::HttpRequestHeaders* headers) /*Q_DECL_OVERRIDE*/ { - return net::OK; - } - virtual void OnSendHeaders(net::URLRequest* request, - const net::HttpRequestHeaders& headers) /*Q_DECL_OVERRIDE*/ {} - virtual int OnHeadersReceived( - net::URLRequest* request, - const net::CompletionCallback& callback, - const net::HttpResponseHeaders* original_response_headers, - scoped_refptr* override_response_headers) /*Q_DECL_OVERRIDE*/ { - return net::OK; - } - virtual void OnBeforeRedirect(net::URLRequest* request, - const GURL& new_location) /*Q_DECL_OVERRIDE*/ {} - virtual void OnResponseStarted(net::URLRequest* request) /*Q_DECL_OVERRIDE*/ {} - virtual void OnRawBytesRead(const net::URLRequest& request, - int bytes_read) /*Q_DECL_OVERRIDE*/ {} - virtual void OnCompleted(net::URLRequest* request, bool started) /*Q_DECL_OVERRIDE*/ {} - virtual void OnURLRequestDestroyed(net::URLRequest* request) /*Q_DECL_OVERRIDE*/ {} + virtual void OnBeforeRedirect(net::URLRequest* request, const GURL& new_location) Q_DECL_OVERRIDE { } + virtual void OnResponseStarted(net::URLRequest* request) Q_DECL_OVERRIDE { } + virtual void OnRawBytesRead(const net::URLRequest& request, int bytes_read) Q_DECL_OVERRIDE { } + virtual void OnCompleted(net::URLRequest* request, bool started) Q_DECL_OVERRIDE { } + virtual void OnURLRequestDestroyed(net::URLRequest* request) Q_DECL_OVERRIDE { } - virtual void OnPACScriptError(int line_number, - const base::string16& error) /*Q_DECL_OVERRIDE*/ { - } - virtual AuthRequiredResponse OnAuthRequired( - net::URLRequest* request, - const net::AuthChallengeInfo& auth_info, - const AuthCallback& callback, - net::AuthCredentials* credentials) /*Q_DECL_OVERRIDE*/ { - return AUTH_REQUIRED_RESPONSE_NO_ACTION; - } - virtual bool OnCanGetCookies(const net::URLRequest& request, - const net::CookieList& cookie_list) /*Q_DECL_OVERRIDE*/ { - return true; - } - virtual bool OnCanSetCookie(const net::URLRequest& request, - const std::string& cookie_line, - net::CookieOptions* options) /*Q_DECL_OVERRIDE*/ { - return true; - } - virtual bool OnCanAccessFile(const net::URLRequest& request, - const base::FilePath& path) const /*Q_DECL_OVERRIDE*/ { - return true; - } - virtual bool OnCanThrottleRequest(const net::URLRequest& request) const /*Q_DECL_OVERRIDE*/ { - return false; - } - virtual int OnBeforeSocketStreamConnect( - net::SocketStream* stream, - const net::CompletionCallback& callback) /*Q_DECL_OVERRIDE*/ { - return net::OK; - } - virtual void OnRequestWaitStateChange(const net::URLRequest& request, - RequestWaitState state) /*Q_DECL_OVERRIDE*/ { - } + virtual void OnPACScriptError(int line_number, const base::string16& error) Q_DECL_OVERRIDE { } + virtual AuthRequiredResponse OnAuthRequired(net::URLRequest* request, const net::AuthChallengeInfo& auth_info, + const AuthCallback& callback, net::AuthCredentials* credentials) Q_DECL_OVERRIDE { return AUTH_REQUIRED_RESPONSE_NO_ACTION; } + virtual bool OnCanGetCookies(const net::URLRequest& request, const net::CookieList& cookie_list) Q_DECL_OVERRIDE { return true; } + virtual bool OnCanSetCookie(const net::URLRequest& request, const std::string& cookie_line, net::CookieOptions* options) Q_DECL_OVERRIDE { return true; } + virtual bool OnCanAccessFile(const net::URLRequest& request, const base::FilePath& path) const Q_DECL_OVERRIDE { return true; } + virtual bool OnCanThrottleRequest(const net::URLRequest& request) const Q_DECL_OVERRIDE { return false; } + virtual int OnBeforeSocketStreamConnect(net::SocketStream* stream, const net::CompletionCallback& callback) Q_DECL_OVERRIDE { return net::OK; } + virtual void OnRequestWaitStateChange(const net::URLRequest& request, RequestWaitState state) Q_DECL_OVERRIDE { } }; #endif // NETWORK_DELEGATE_QT_H diff --git a/lib/quick/plugin.cpp b/lib/quick/plugin.cpp index e1da73cca..5efde6dd8 100644 --- a/lib/quick/plugin.cpp +++ b/lib/quick/plugin.cpp @@ -50,7 +50,7 @@ class QtWebEnginePlugin : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: - virtual void registerTypes(const char *uri) + virtual void registerTypes(const char *uri) Q_DECL_OVERRIDE { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine")); Q_UNUSED(uri); diff --git a/lib/quick/render_widget_host_view_qt_delegate_quick.h b/lib/quick/render_widget_host_view_qt_delegate_quick.h index 612b89ed1..5c96f4832 100644 --- a/lib/quick/render_widget_host_view_qt_delegate_quick.h +++ b/lib/quick/render_widget_host_view_qt_delegate_quick.h @@ -64,13 +64,13 @@ public: this->setAcceptHoverEvents(true); } - virtual void initAsChild(WebContentsAdapterClient* container) + virtual void initAsChild(WebContentsAdapterClient* container) Q_DECL_OVERRIDE { QQuickWebEngineViewPrivate *viewPrivate = static_cast(container); this->setParentItem(viewPrivate->q_func()); } - virtual void initAsPopup(const QRect& rect) + virtual void initAsPopup(const QRect& rect) Q_DECL_OVERRIDE { this->setX(rect.x()); this->setY(rect.y()); @@ -79,48 +79,48 @@ public: this->setVisible(true); } - virtual QRectF screenRect() const + virtual QRectF screenRect() const Q_DECL_OVERRIDE { QPointF pos = this->mapToScene(QPointF(0,0)); return QRectF(pos.x(), pos.y(), this->width(), this->height()); } - virtual void setKeyboardFocus() + virtual void setKeyboardFocus() Q_DECL_OVERRIDE { this->setFocus(true); } - virtual bool hasKeyboardFocus() + virtual bool hasKeyboardFocus() Q_DECL_OVERRIDE { return this->hasFocus(); } - virtual void show() + virtual void show() Q_DECL_OVERRIDE { this->setVisible(true); } - virtual void hide() + virtual void hide() Q_DECL_OVERRIDE { this->setVisible(false); } - virtual bool isVisible() const + virtual bool isVisible() const Q_DECL_OVERRIDE { return ItemBaseT::isVisible(); } - virtual QWindow* window() const + virtual QWindow* window() const Q_DECL_OVERRIDE { return ItemBaseT::window(); } - virtual void updateCursor(const QCursor &cursor) + virtual void updateCursor(const QCursor &cursor) Q_DECL_OVERRIDE { this->setCursor(cursor); } - virtual void resize(int width, int height) + virtual void resize(int width, int height) Q_DECL_OVERRIDE { this->setSize(QSizeF(width, height)); } @@ -213,12 +213,12 @@ class RenderWidgetHostViewQtDelegateQuick : public RenderWidgetHostViewQtDelegat public: RenderWidgetHostViewQtDelegateQuick(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent = 0); - virtual WId nativeWindowIdForCompositor() const; - virtual void update(const QRect& rect = QRect()); + virtual WId nativeWindowIdForCompositor() const Q_DECL_OVERRIDE; + virtual void update(const QRect& rect = QRect()) Q_DECL_OVERRIDE; - virtual void itemChange(ItemChange, const ItemChangeData &); - virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); - virtual void releaseResources(); + virtual void itemChange(ItemChange, const ItemChangeData &) Q_DECL_OVERRIDE; + virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + virtual void releaseResources() Q_DECL_OVERRIDE; public Q_SLOTS: void onFrameSwapped(); @@ -231,8 +231,8 @@ class RenderWidgetHostViewQtDelegateQuickPainted : public RenderWidgetHostViewQt public: RenderWidgetHostViewQtDelegateQuickPainted(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent = 0); - virtual WId nativeWindowIdForCompositor() const; - virtual void update(const QRect& rect = QRect()); + virtual WId nativeWindowIdForCompositor() const Q_DECL_OVERRIDE; + virtual void update(const QRect& rect = QRect()) Q_DECL_OVERRIDE; void paint(QPainter *painter); diff --git a/lib/render_widget_host_view_qt.h b/lib/render_widget_host_view_qt.h index be32cfcf5..eec96a12a 100644 --- a/lib/render_widget_host_view_qt.h +++ b/lib/render_widget_host_view_qt.h @@ -101,63 +101,63 @@ public: void setAdapterClient(WebContentsAdapterClient *adapterClient); BackingStoreQt* GetBackingStore(); - virtual content::BackingStore *AllocBackingStore(const gfx::Size &size); - - virtual void InitAsChild(gfx::NativeView); - virtual void InitAsPopup(content::RenderWidgetHostView*, const gfx::Rect&); - virtual void InitAsFullscreen(content::RenderWidgetHostView*); - virtual content::RenderWidgetHost* GetRenderWidgetHost() const; - virtual void SetSize(const gfx::Size& size); - virtual void SetBounds(const gfx::Rect& rect); - virtual gfx::Size GetPhysicalBackingSize() const; - virtual gfx::NativeView GetNativeView() const; - virtual gfx::NativeViewId GetNativeViewId() const; - virtual gfx::NativeViewAccessible GetNativeViewAccessible(); - virtual void Focus(); - virtual bool HasFocus() const; - virtual bool IsSurfaceAvailableForCopy() const; - virtual void Show(); - virtual void Hide(); - virtual bool IsShowing(); - virtual gfx::Rect GetViewBounds() const; - virtual void SetBackground(const SkBitmap& background); - virtual bool LockMouse(); - virtual void UnlockMouse(); + virtual content::BackingStore *AllocBackingStore(const gfx::Size &size) Q_DECL_OVERRIDE; + + virtual void InitAsChild(gfx::NativeView) Q_DECL_OVERRIDE; + virtual void InitAsPopup(content::RenderWidgetHostView*, const gfx::Rect&) Q_DECL_OVERRIDE; + virtual void InitAsFullscreen(content::RenderWidgetHostView*) Q_DECL_OVERRIDE; + virtual content::RenderWidgetHost* GetRenderWidgetHost() const Q_DECL_OVERRIDE; + virtual void SetSize(const gfx::Size& size) Q_DECL_OVERRIDE; + virtual void SetBounds(const gfx::Rect& rect) Q_DECL_OVERRIDE; + virtual gfx::Size GetPhysicalBackingSize() const Q_DECL_OVERRIDE; + virtual gfx::NativeView GetNativeView() const Q_DECL_OVERRIDE; + virtual gfx::NativeViewId GetNativeViewId() const Q_DECL_OVERRIDE; + virtual gfx::NativeViewAccessible GetNativeViewAccessible() Q_DECL_OVERRIDE; + virtual void Focus() Q_DECL_OVERRIDE; + virtual bool HasFocus() const Q_DECL_OVERRIDE; + virtual bool IsSurfaceAvailableForCopy() const Q_DECL_OVERRIDE; + virtual void Show() Q_DECL_OVERRIDE; + virtual void Hide() Q_DECL_OVERRIDE; + virtual bool IsShowing() Q_DECL_OVERRIDE; + virtual gfx::Rect GetViewBounds() const Q_DECL_OVERRIDE; + virtual void SetBackground(const SkBitmap& background) Q_DECL_OVERRIDE; + virtual bool LockMouse() Q_DECL_OVERRIDE; + virtual void UnlockMouse() Q_DECL_OVERRIDE; #if defined(TOOLKIT_GTK) - virtual GdkEventButton* GetLastMouseDown(); - virtual gfx::NativeView BuildInputMethodsGtkMenu(); + virtual GdkEventButton* GetLastMouseDown() Q_DECL_OVERRIDE; + virtual gfx::NativeView BuildInputMethodsGtkMenu() Q_DECL_OVERRIDE; #endif // defined(TOOLKIT_GTK) - virtual void WasShown(); - virtual void WasHidden(); - virtual void MovePluginWindows(const gfx::Vector2d&, const std::vector&); - virtual void Blur(); - virtual void UpdateCursor(const WebCursor&); - virtual void SetIsLoading(bool); - virtual void TextInputTypeChanged(ui::TextInputType, bool, ui::TextInputMode); - virtual void ImeCancelComposition(); - virtual void ImeCompositionRangeChanged(const ui::Range&, const std::vector&); - virtual void DidUpdateBackingStore(const gfx::Rect& scroll_rect, const gfx::Vector2d& scroll_delta, const std::vector& copy_rects, const ui::LatencyInfo&); - virtual void RenderProcessGone(base::TerminationStatus, int); - virtual void Destroy(); - virtual void SetTooltipText(const string16&); - virtual void SelectionBoundsChanged(const ViewHostMsg_SelectionBounds_Params&); - virtual void ScrollOffsetChanged(); - virtual void CopyFromCompositingSurface(const gfx::Rect& src_subrect, const gfx::Size& /* dst_size */, const base::Callback& callback); - virtual void CopyFromCompositingSurfaceToVideoFrame(const gfx::Rect& src_subrect, const scoped_refptr& target, const base::Callback& callback); - virtual bool CanCopyToVideoFrame() const; - virtual void OnAcceleratedCompositingStateChange(); - virtual void AcceleratedSurfaceBuffersSwapped(const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, int gpu_host_id); - virtual void AcceleratedSurfacePostSubBuffer(const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, int gpu_host_id); - virtual void AcceleratedSurfaceSuspend(); - virtual void AcceleratedSurfaceRelease(); - virtual bool HasAcceleratedSurface(const gfx::Size&); + virtual void WasShown() Q_DECL_OVERRIDE; + virtual void WasHidden() Q_DECL_OVERRIDE; + virtual void MovePluginWindows(const gfx::Vector2d&, const std::vector&) Q_DECL_OVERRIDE; + virtual void Blur() Q_DECL_OVERRIDE; + virtual void UpdateCursor(const WebCursor&) Q_DECL_OVERRIDE; + virtual void SetIsLoading(bool) Q_DECL_OVERRIDE; + virtual void TextInputTypeChanged(ui::TextInputType, bool, ui::TextInputMode) Q_DECL_OVERRIDE; + virtual void ImeCancelComposition() Q_DECL_OVERRIDE; + virtual void ImeCompositionRangeChanged(const ui::Range&, const std::vector&) Q_DECL_OVERRIDE; + virtual void DidUpdateBackingStore(const gfx::Rect& scroll_rect, const gfx::Vector2d& scroll_delta, const std::vector& copy_rects, const ui::LatencyInfo&) Q_DECL_OVERRIDE; + virtual void RenderProcessGone(base::TerminationStatus, int) Q_DECL_OVERRIDE; + virtual void Destroy() Q_DECL_OVERRIDE; + virtual void SetTooltipText(const string16&) Q_DECL_OVERRIDE; + virtual void SelectionBoundsChanged(const ViewHostMsg_SelectionBounds_Params&) Q_DECL_OVERRIDE; + virtual void ScrollOffsetChanged() Q_DECL_OVERRIDE; + virtual void CopyFromCompositingSurface(const gfx::Rect& src_subrect, const gfx::Size& /* dst_size */, const base::Callback& callback) Q_DECL_OVERRIDE; + virtual void CopyFromCompositingSurfaceToVideoFrame(const gfx::Rect& src_subrect, const scoped_refptr& target, const base::Callback& callback) Q_DECL_OVERRIDE; + virtual bool CanCopyToVideoFrame() const Q_DECL_OVERRIDE; + virtual void OnAcceleratedCompositingStateChange() Q_DECL_OVERRIDE; + virtual void AcceleratedSurfaceBuffersSwapped(const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, int gpu_host_id) Q_DECL_OVERRIDE; + virtual void AcceleratedSurfacePostSubBuffer(const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, int gpu_host_id) Q_DECL_OVERRIDE; + virtual void AcceleratedSurfaceSuspend() Q_DECL_OVERRIDE; + virtual void AcceleratedSurfaceRelease() Q_DECL_OVERRIDE; + virtual bool HasAcceleratedSurface(const gfx::Size&) Q_DECL_OVERRIDE; virtual void OnSwapCompositorFrame(uint32 output_surface_id, scoped_ptr frame) Q_DECL_OVERRIDE; - virtual void GetScreenInfo(WebKit::WebScreenInfo* results); - virtual gfx::Rect GetBoundsInRootWindow(); - virtual gfx::GLSurfaceHandle GetCompositingSurface(); - virtual void SetHasHorizontalScrollbar(bool); - virtual void SetScrollOffsetPinning(bool, bool); - virtual void OnAccessibilityNotifications(const std::vector&); + virtual void GetScreenInfo(WebKit::WebScreenInfo* results) Q_DECL_OVERRIDE; + virtual gfx::Rect GetBoundsInRootWindow() Q_DECL_OVERRIDE; + virtual gfx::GLSurfaceHandle GetCompositingSurface() Q_DECL_OVERRIDE; + virtual void SetHasHorizontalScrollbar(bool) Q_DECL_OVERRIDE; + virtual void SetScrollOffsetPinning(bool, bool) Q_DECL_OVERRIDE; + virtual void OnAccessibilityNotifications(const std::vector&) Q_DECL_OVERRIDE; virtual void ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, content::InputEventAckState ack_result) Q_DECL_OVERRIDE; // Overridden from ui::GestureEventHelper. @@ -181,17 +181,17 @@ public: void handleFocusEvent(QFocusEvent*); #if defined(OS_MACOSX) - virtual void SetTakesFocusOnlyOnMouseDown(bool flag) { QT_NOT_YET_IMPLEMENTED } - virtual void SetActive(bool active) { QT_NOT_YET_IMPLEMENTED } - virtual bool IsSpeaking() const { QT_NOT_YET_IMPLEMENTED; return false; } - virtual void SpeakSelection() { QT_NOT_YET_IMPLEMENTED } - virtual bool PostProcessEventForPluginIme(const content::NativeWebKeyboardEvent& event) { QT_NOT_YET_IMPLEMENTED; return false; } - virtual void AboutToWaitForBackingStoreMsg() { QT_NOT_YET_IMPLEMENTED } - virtual void StopSpeaking() { QT_NOT_YET_IMPLEMENTED } - virtual void SetWindowVisibility(bool visible) { QT_NOT_YET_IMPLEMENTED } - virtual bool SupportsSpeech() const { QT_NOT_YET_IMPLEMENTED; return false; } - virtual void ShowDefinitionForSelection() { QT_NOT_YET_IMPLEMENTED } - virtual void WindowFrameChanged() { QT_NOT_YET_IMPLEMENTED } + virtual void SetTakesFocusOnlyOnMouseDown(bool flag) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } + virtual void SetActive(bool active) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } + virtual bool IsSpeaking() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED; return false; } + virtual void SpeakSelection() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } + virtual bool PostProcessEventForPluginIme(const content::NativeWebKeyboardEvent& event) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED; return false; } + virtual void AboutToWaitForBackingStoreMsg() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } + virtual void StopSpeaking() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } + virtual void SetWindowVisibility(bool visible) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } + virtual bool SupportsSpeech() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED; return false; } + virtual void ShowDefinitionForSelection() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } + virtual void WindowFrameChanged() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } #endif // defined(OS_MACOSX) private: diff --git a/lib/resource_context_qt.h b/lib/resource_context_qt.h index cb3bc2927..cd01b8aee 100644 --- a/lib/resource_context_qt.h +++ b/lib/resource_context_qt.h @@ -44,6 +44,8 @@ #include "content/public/browser/resource_context.h" +#include "qglobal.h" + namespace net { class URLRequestContextGetter; } @@ -59,12 +61,12 @@ public: , getter_(0) {} - virtual net::HostResolver* GetHostResolver(); + virtual net::HostResolver* GetHostResolver() Q_DECL_OVERRIDE; - virtual net::URLRequestContext* GetRequestContext(); + virtual net::URLRequestContext* GetRequestContext() Q_DECL_OVERRIDE; - virtual bool AllowMicAccess(const GURL& origin) { return false; } - virtual bool AllowCameraAccess(const GURL& origin) { return false; } + virtual bool AllowMicAccess(const GURL& origin) Q_DECL_OVERRIDE { return false; } + virtual bool AllowCameraAccess(const GURL& origin) Q_DECL_OVERRIDE { return false; } void set_url_request_context_getter(net::URLRequestContextGetter* getter); diff --git a/lib/url_request_context_getter_qt.h b/lib/url_request_context_getter_qt.h index 4ffc57a66..ca56cb38e 100644 --- a/lib/url_request_context_getter_qt.h +++ b/lib/url_request_context_getter_qt.h @@ -50,6 +50,8 @@ #include "net/url_request/url_request_job_factory_impl.h" #include "content/public/common/url_constants.h" +#include "qglobal.h" + namespace net { class HostResolver; class MappedHostResolver; @@ -61,9 +63,9 @@ class URLRequestContextGetterQt : public net::URLRequestContextGetter { public: explicit URLRequestContextGetterQt(const base::FilePath&); - virtual net::URLRequestContext* GetURLRequestContext() /*OVERRIDE*/; + virtual net::URLRequestContext* GetURLRequestContext() Q_DECL_OVERRIDE; - virtual scoped_refptr GetNetworkTaskRunner() const /*OVERRIDE*/; + virtual scoped_refptr GetNetworkTaskRunner() const Q_DECL_OVERRIDE; private: virtual ~URLRequestContextGetterQt() {} diff --git a/lib/web_contents_delegate_qt.h b/lib/web_contents_delegate_qt.h index d5628f486..9e27c043f 100644 --- a/lib/web_contents_delegate_qt.h +++ b/lib/web_contents_delegate_qt.h @@ -62,15 +62,16 @@ class WebContentsDelegateQt : public content::WebContentsDelegate public: WebContentsDelegateQt(content::WebContents*, WebContentsAdapterClient *adapterClient); - virtual void NavigationStateChanged(const content::WebContents* source, unsigned changed_flags); - virtual void AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked); - virtual void CloseContents(content::WebContents *source); - virtual void LoadingStateChanged(content::WebContents* source); - virtual void LoadProgressChanged(content::WebContents* source, double progress); - virtual void DidFailLoad(int64 frame_id, const GURL &validated_url, bool is_main_frame, int error_code, const string16 &error_description, content::RenderViewHost *render_view_host); - virtual void DidFinishLoad(int64 frame_id, const GURL &validated_url, bool is_main_frame, content::RenderViewHost *render_view_host); - virtual void DidUpdateFaviconURL(int32 page_id, const std::vector& candidates); - virtual content::JavaScriptDialogManager *GetJavaScriptDialogManager(); + virtual void NavigationStateChanged(const content::WebContents* source, unsigned changed_flags) Q_DECL_OVERRIDE; + virtual void AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked) Q_DECL_OVERRIDE; + virtual void CloseContents(content::WebContents *source) Q_DECL_OVERRIDE; + virtual void LoadingStateChanged(content::WebContents* source) Q_DECL_OVERRIDE; + // FIXME: with the next chromium update LoadProgressChanged with progress becomes available. Q_DECL_OVERRIDE must then be activated. + virtual void LoadProgressChanged(content::WebContents* source, double progress) /*Q_DECL_OVERRIDE*/; + virtual void DidFailLoad(int64 frame_id, const GURL &validated_url, bool is_main_frame, int error_code, const string16 &error_description, content::RenderViewHost *render_view_host) Q_DECL_OVERRIDE; + virtual void DidFinishLoad(int64 frame_id, const GURL &validated_url, bool is_main_frame, content::RenderViewHost *render_view_host) Q_DECL_OVERRIDE; + virtual void DidUpdateFaviconURL(int32 page_id, const std::vector& candidates) Q_DECL_OVERRIDE; + virtual content::JavaScriptDialogManager *GetJavaScriptDialogManager() Q_DECL_OVERRIDE; private: WebContentsAdapterClient *m_viewClient; diff --git a/lib/web_contents_view_qt.h b/lib/web_contents_view_qt.h index 8a5cc07cf..ee81ccc81 100644 --- a/lib/web_contents_view_qt.h +++ b/lib/web_contents_view_qt.h @@ -69,54 +69,54 @@ public: void initialize(WebContentsAdapterClient* client); WebContentsAdapterClient *client() { return m_client; } - virtual content::RenderWidgetHostView *CreateViewForWidget(content::RenderWidgetHost* render_widget_host); + virtual content::RenderWidgetHostView *CreateViewForWidget(content::RenderWidgetHost* render_widget_host) Q_DECL_OVERRIDE; - virtual void CreateView(const gfx::Size& initial_size, gfx::NativeView context); + virtual void CreateView(const gfx::Size& initial_size, gfx::NativeView context) Q_DECL_OVERRIDE; - virtual content::RenderWidgetHostView* CreateViewForPopupWidget(content::RenderWidgetHost* render_widget_host); + virtual content::RenderWidgetHostView* CreateViewForPopupWidget(content::RenderWidgetHost* render_widget_host) Q_DECL_OVERRIDE; - virtual void SetPageTitle(const string16& title); + virtual void SetPageTitle(const string16& title) Q_DECL_OVERRIDE; - virtual void RenderViewCreated(content::RenderViewHost* host) { QT_NOT_YET_IMPLEMENTED } + virtual void RenderViewCreated(content::RenderViewHost* host) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } - virtual void RenderViewSwappedIn(content::RenderViewHost* host) { QT_NOT_YET_IMPLEMENTED } + virtual void RenderViewSwappedIn(content::RenderViewHost* host) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } - virtual void SetOverscrollControllerEnabled(bool enabled) { QT_NOT_YET_IMPLEMENTED } + virtual void SetOverscrollControllerEnabled(bool enabled) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } - virtual gfx::NativeView GetNativeView() const; + virtual gfx::NativeView GetNativeView() const Q_DECL_OVERRIDE; - virtual gfx::NativeView GetContentNativeView() const { QT_NOT_USED return 0; } + virtual gfx::NativeView GetContentNativeView() const Q_DECL_OVERRIDE { QT_NOT_USED return 0; } - virtual gfx::NativeWindow GetTopLevelNativeWindow() const { QT_NOT_USED return 0; } + virtual gfx::NativeWindow GetTopLevelNativeWindow() const Q_DECL_OVERRIDE { QT_NOT_USED return 0; } - virtual void GetContainerBounds(gfx::Rect* out) const; + virtual void GetContainerBounds(gfx::Rect* out) const Q_DECL_OVERRIDE; - virtual void OnTabCrashed(base::TerminationStatus status, int error_code) { QT_NOT_YET_IMPLEMENTED } + virtual void OnTabCrashed(base::TerminationStatus status, int error_code) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } - virtual void SizeContents(const gfx::Size& size) { QT_NOT_YET_IMPLEMENTED } + virtual void SizeContents(const gfx::Size& size) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } - virtual void Focus(); + virtual void Focus() Q_DECL_OVERRIDE; - virtual void SetInitialFocus(); + virtual void SetInitialFocus() Q_DECL_OVERRIDE; - virtual void StoreFocus() { QT_NOT_USED } + virtual void StoreFocus() Q_DECL_OVERRIDE { QT_NOT_USED } - virtual void RestoreFocus() { QT_NOT_USED } + virtual void RestoreFocus() Q_DECL_OVERRIDE { QT_NOT_USED } - virtual content::DropData* GetDropData() const { QT_NOT_YET_IMPLEMENTED return 0; } + virtual content::DropData* GetDropData() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED return 0; } - virtual gfx::Rect GetViewBounds() const { QT_NOT_YET_IMPLEMENTED return gfx::Rect(); } + virtual gfx::Rect GetViewBounds() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED return gfx::Rect(); } virtual void ShowPopupMenu(const gfx::Rect& bounds, int item_height, double item_font_size, int selected_item, - const std::vector& items, bool right_aligned, bool allow_multiple_selection) { QT_NOT_YET_IMPLEMENTED } + const std::vector& items, bool right_aligned, bool allow_multiple_selection) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } - virtual void ShowContextMenu(const content::ContextMenuParams ¶ms); + virtual void ShowContextMenu(const content::ContextMenuParams ¶ms) Q_DECL_OVERRIDE; #if defined(OS_MACOSX) - virtual void SetAllowOverlappingViews(bool overlapping) { QT_NOT_YET_IMPLEMENTED } - virtual void CloseTabAfterEventTracking() { QT_NOT_YET_IMPLEMENTED } - virtual bool GetAllowOverlappingViews() const { QT_NOT_YET_IMPLEMENTED; return false; } - virtual bool IsEventTracking() const { QT_NOT_YET_IMPLEMENTED; return false; } + virtual void SetAllowOverlappingViews(bool overlapping) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } + virtual void CloseTabAfterEventTracking() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED } + virtual bool GetAllowOverlappingViews() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED; return false; } + virtual bool IsEventTracking() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED; return false; } #endif // defined(OS_MACOSX) private: diff --git a/lib/widgets/Api/qwebenginepage.h b/lib/widgets/Api/qwebenginepage.h index c6e397197..a613f4a27 100644 --- a/lib/widgets/Api/qwebenginepage.h +++ b/lib/widgets/Api/qwebenginepage.h @@ -60,7 +60,7 @@ struct FunctorBase { template struct FunctorCallback : public FunctorBase { FunctorCallback(F callback) : m_callback(callback) {} - virtual void operator()(const QVariant &value) { m_callback(value); } + virtual void operator()(const QVariant &value) Q_DECL_OVERRIDE { m_callback(value); } private: F m_callback; }; diff --git a/lib/widgets/render_widget_host_view_qt_delegate_widget.h b/lib/widgets/render_widget_host_view_qt_delegate_widget.h index ccb11df29..7ec91931f 100644 --- a/lib/widgets/render_widget_host_view_qt_delegate_widget.h +++ b/lib/widgets/render_widget_host_view_qt_delegate_widget.h @@ -58,20 +58,20 @@ class RenderWidgetHostViewQtDelegateWidget : public QWidget, public RenderWidget public: RenderWidgetHostViewQtDelegateWidget(RenderWidgetHostViewQtDelegateClient *client, QWidget *parent = 0); - virtual void initAsChild(WebContentsAdapterClient* container); - virtual void initAsPopup(const QRect&); - virtual QRectF screenRect() const; - virtual void setKeyboardFocus(); - virtual bool hasKeyboardFocus(); - virtual void show(); - virtual void hide(); - virtual bool isVisible() const; - virtual WId nativeWindowIdForCompositor() const; - virtual QWindow* window() const; - virtual void update(const QRect& rect = QRect()); - virtual void updateCursor(const QCursor &); - virtual void resize(int width, int height); - virtual void inputMethodStateChanged(bool editorVisible); + virtual void initAsChild(WebContentsAdapterClient* container) Q_DECL_OVERRIDE; + virtual void initAsPopup(const QRect&) Q_DECL_OVERRIDE; + virtual QRectF screenRect() const Q_DECL_OVERRIDE; + virtual void setKeyboardFocus() Q_DECL_OVERRIDE; + virtual bool hasKeyboardFocus() Q_DECL_OVERRIDE; + virtual void show() Q_DECL_OVERRIDE; + virtual void hide() Q_DECL_OVERRIDE; + virtual bool isVisible() const Q_DECL_OVERRIDE; + virtual WId nativeWindowIdForCompositor() const Q_DECL_OVERRIDE; + virtual QWindow* window() const Q_DECL_OVERRIDE; + virtual void update(const QRect& rect = QRect()) Q_DECL_OVERRIDE; + virtual void updateCursor(const QCursor &) Q_DECL_OVERRIDE; + virtual void resize(int width, int height) Q_DECL_OVERRIDE; + virtual void inputMethodStateChanged(bool editorVisible) Q_DECL_OVERRIDE; protected: void paintEvent(QPaintEvent * event); diff --git a/lib/yuv_video_node.cpp b/lib/yuv_video_node.cpp index 869630f67..e6c0c7da9 100644 --- a/lib/yuv_video_node.cpp +++ b/lib/yuv_video_node.cpp @@ -45,9 +45,9 @@ class YUVVideoMaterialShader : public QSGMaterialShader { public: - virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); + virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_OVERRIDE; - virtual char const *const *attributeNames() const { + virtual char const *const *attributeNames() const Q_DECL_OVERRIDE { static const char *names[] = { "a_position", "a_texCoord", @@ -57,7 +57,7 @@ public: } protected: - virtual const char *vertexShader() const { + virtual const char *vertexShader() const Q_DECL_OVERRIDE { // Keep in sync with cc::VertexShaderPosTexYUVStretch const char *shader = "attribute highp vec4 a_position;\n" @@ -72,7 +72,7 @@ protected: return shader; } - virtual const char *fragmentShader() const { + virtual const char *fragmentShader() const Q_DECL_OVERRIDE { // Keep in sync with cc::FragmentShaderYUVVideo static const char *shader = "varying mediump vec2 v_texCoord;\n" @@ -93,7 +93,7 @@ protected: return shader; } - virtual void initialize() { + virtual void initialize() Q_DECL_OVERRIDE { m_id_matrix = program()->uniformLocation("matrix"); m_id_texScale = program()->uniformLocation("texScale"); m_id_yTexture = program()->uniformLocation("y_texture"); @@ -116,10 +116,10 @@ protected: class YUVAVideoMaterialShader : public YUVVideoMaterialShader { - virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); + virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_OVERRIDE; protected: - virtual const char *fragmentShader() const { + virtual const char *fragmentShader() const Q_DECL_OVERRIDE { // Keep in sync with cc::FragmentShaderYUVAVideo static const char *shader = // "precision mediump float;\n" @@ -144,7 +144,7 @@ protected: return shader; } - virtual void initialize() { + virtual void initialize() Q_DECL_OVERRIDE { // YUVVideoMaterialShader has a subset of the uniforms. YUVVideoMaterialShader::initialize(); m_id_aTexture = program()->uniformLocation("a_texture"); diff --git a/lib/yuv_video_node.h b/lib/yuv_video_node.h index 73e267d92..509ef40e6 100644 --- a/lib/yuv_video_node.h +++ b/lib/yuv_video_node.h @@ -57,13 +57,13 @@ class YUVVideoMaterial : public QSGMaterial public: YUVVideoMaterial(QSGTexture *yTexture, QSGTexture *uTexture, QSGTexture *vTexture, const QSizeF &texScale); - virtual QSGMaterialType *type() const { + virtual QSGMaterialType *type() const Q_DECL_OVERRIDE { static QSGMaterialType theType; return &theType; } - virtual QSGMaterialShader *createShader() const; - virtual int compare(const QSGMaterial *other) const; + virtual QSGMaterialShader *createShader() const Q_DECL_OVERRIDE; + virtual int compare(const QSGMaterial *other) const Q_DECL_OVERRIDE; QSGTexture *m_yTexture; QSGTexture *m_uTexture; @@ -76,13 +76,13 @@ class YUVAVideoMaterial : public YUVVideoMaterial public: YUVAVideoMaterial(QSGTexture *yTexture, QSGTexture *uTexture, QSGTexture *vTexture, QSGTexture *aTexture, const QSizeF &texScale); - virtual QSGMaterialType *type() const { + virtual QSGMaterialType *type() const Q_DECL_OVERRIDE{ static QSGMaterialType theType; return &theType; } - virtual QSGMaterialShader *createShader() const; - virtual int compare(const QSGMaterial *other) const; + virtual QSGMaterialShader *createShader() const Q_DECL_OVERRIDE; + virtual int compare(const QSGMaterial *other) const Q_DECL_OVERRIDE; QSGTexture *m_aTexture; }; -- cgit v1.2.3