From b6c0fd19182faf643e0f519c37959f89f37a964f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gy=C3=B6rgy=20Straub?= Date: Fri, 4 Sep 2020 17:06:19 +0100 Subject: [PATCH] Changed 'virtual' function override declarations to 'override'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: If1f4eeb2708709e1f62fb03d204aad27018e8b2d Signed-off-by: György Straub --- .../adaptor-framework/native-image-source-queue.h | 4 +- .../adaptor-framework/scene-holder-impl.h | 2 +- .../common/accessibility-adaptor-impl.h | 2 +- .../common/accessibility-gesture-detector.h | 2 +- .../generic/tts-player-impl-generic.h | 2 +- dali/internal/adaptor/common/adaptor-impl.h | 38 +- dali/internal/adaptor/common/application-impl.h | 26 +- .../common/combined-update-render-controller.h | 32 +- .../adaptor/common/lifecycle-controller-impl.h | 2 +- .../tizen-wayland/component-application-impl.h | 2 +- .../tizen-wearable/watch-application-impl.h | 8 +- .../common/clipboard-event-notifier-impl.h | 2 +- dali/internal/clipboard/common/clipboard-impl.h | 2 +- .../gles/egl-context-helper-implementation.h | 6 +- dali/internal/graphics/gles/egl-graphics-factory.h | 4 +- dali/internal/graphics/gles/egl-implementation.h | 14 +- .../graphics/gles/egl-sync-implementation.h | 6 +- dali/internal/graphics/gles/gl-implementation.h | 500 ++++++++++----------- .../graphics/gles/gl-proxy-implementation.h | 78 ++-- .../internal/haptics/common/feedback-player-impl.h | 2 +- .../imaging/common/animated-image-loading-impl.h | 2 +- dali/internal/imaging/common/pixel-buffer-impl.h | 2 +- .../ubuntu-x11/native-image-source-impl-x.h | 10 +- .../internal/input/common/physical-keyboard-impl.h | 2 +- .../legacy/common/tizen-platform-abstraction.h | 34 +- .../network/common/network-performance-server.h | 2 +- dali/internal/network/common/socket-factory.h | 6 +- dali/internal/network/common/socket-impl.h | 22 +- dali/internal/styling/common/style-monitor-impl.h | 2 +- .../system/android/callback-manager-android.h | 16 +- .../internal/system/common/color-controller-impl.h | 2 +- dali/internal/system/common/environment-options.h | 2 +- dali/internal/system/common/kernel-trace.h | 4 +- .../system/common/performance-logger-impl.h | 2 +- dali/internal/system/common/performance-server.h | 14 +- dali/internal/system/common/sound-player-impl.h | 2 +- dali/internal/system/common/system-trace.h | 4 +- dali/internal/system/common/timer-impl.h | 14 +- .../internal/system/linux/callback-manager-ecore.h | 16 +- .../tizen-wayland/widget-application-impl-tizen.h | 2 +- .../internal/system/windows/callback-manager-win.h | 16 +- .../trace/android/trace-manager-impl-android.h | 2 +- dali/internal/trace/common/trace-manager-impl.h | 2 +- .../trace/generic/trace-manager-impl-generic.h | 2 +- .../trace/tizen/trace-manager-impl-tizen.h | 2 +- .../window-system/android/window-base-android.h | 98 ++-- dali/internal/window-system/common/event-handler.h | 2 +- .../window-system/common/orientation-impl.h | 2 +- dali/internal/window-system/common/window-impl.h | 2 +- .../window-system/common/window-render-surface.h | 34 +- .../tizen-wayland/ecore-wl/window-base-ecore-wl.h | 98 ++-- .../ecore-wl2/window-base-ecore-wl2.h | 98 ++-- .../tizen-wayland/native-render-surface-ecore-wl.h | 44 +- .../ubuntu-x11/pixmap-render-surface-ecore-x.h | 38 +- .../window-system/ubuntu-x11/window-base-ecore-x.h | 98 ++-- .../window-system/windows/window-base-win.h | 98 ++-- .../adaptor-framework/native-image-source.h | 4 +- dali/public-api/adaptor-framework/widget-impl.h | 4 +- 58 files changed, 769 insertions(+), 769 deletions(-) diff --git a/dali/devel-api/adaptor-framework/native-image-source-queue.h b/dali/devel-api/adaptor-framework/native-image-source-queue.h index 0848079..f1d2eec 100755 --- a/dali/devel-api/adaptor-framework/native-image-source-queue.h +++ b/dali/devel-api/adaptor-framework/native-image-source-queue.h @@ -177,7 +177,7 @@ private: // native image /** * @copydoc Dali::NativeImageInterface::GetExtension() */ - NativeImageInterface::Extension* GetExtension(); + NativeImageInterface::Extension* GetExtension() override; private: @@ -196,7 +196,7 @@ private: * * The implementation should destroy the NativeImage resources. */ - DALI_INTERNAL virtual ~NativeImageSourceQueue(); + DALI_INTERNAL ~NativeImageSourceQueue() override; /** * @brief Undefined copy constructor. diff --git a/dali/integration-api/adaptor-framework/scene-holder-impl.h b/dali/integration-api/adaptor-framework/scene-holder-impl.h index 2628526..8289c9e 100644 --- a/dali/integration-api/adaptor-framework/scene-holder-impl.h +++ b/dali/integration-api/adaptor-framework/scene-holder-impl.h @@ -263,7 +263,7 @@ protected: /** * virtual destructor */ - virtual ~SceneHolder(); + ~SceneHolder() override; private: // The following methods can be overridden if required diff --git a/dali/internal/accessibility/common/accessibility-adaptor-impl.h b/dali/internal/accessibility/common/accessibility-adaptor-impl.h index ed79b3e..29cbb08 100644 --- a/dali/internal/accessibility/common/accessibility-adaptor-impl.h +++ b/dali/internal/accessibility/common/accessibility-adaptor-impl.h @@ -228,7 +228,7 @@ protected: /** * Destructor. */ - virtual ~AccessibilityAdaptor(); + ~AccessibilityAdaptor() override; private: diff --git a/dali/internal/accessibility/common/accessibility-gesture-detector.h b/dali/internal/accessibility/common/accessibility-gesture-detector.h index e9297f2..aa6bc54 100644 --- a/dali/internal/accessibility/common/accessibility-gesture-detector.h +++ b/dali/internal/accessibility/common/accessibility-gesture-detector.h @@ -54,7 +54,7 @@ public: /** * Virtual destructor. */ - virtual ~AccessibilityGestureDetector(); + ~AccessibilityGestureDetector() override; /** * Set the handler to handle accessibility gestures. diff --git a/dali/internal/accessibility/generic/tts-player-impl-generic.h b/dali/internal/accessibility/generic/tts-player-impl-generic.h index c310a93..257350f 100644 --- a/dali/internal/accessibility/generic/tts-player-impl-generic.h +++ b/dali/internal/accessibility/generic/tts-player-impl-generic.h @@ -94,7 +94,7 @@ public: /** * Destructor */ - virtual ~TtsPlayerGeneric(); + ~TtsPlayerGeneric() override; private: diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h index cf81f7c..a62bede 100755 --- a/dali/internal/adaptor/common/adaptor-impl.h +++ b/dali/internal/adaptor/common/adaptor-impl.h @@ -147,7 +147,7 @@ public: /** * Virtual destructor. */ - virtual ~Adaptor(); + ~Adaptor() override; /** * @copydoc Dali::Adaptor::Get() @@ -311,7 +311,7 @@ public: /** * @return the Core instance */ - virtual Dali::Integration::Core& GetCore(); + Dali::Integration::Core& GetCore() override; /** * @copydoc Dali::Adaptor::SetRenderRefreshRate() @@ -445,52 +445,52 @@ public: //AdaptorInternalServices /** * @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetPlatformAbstractionInterface() */ - virtual Dali::Integration::PlatformAbstraction& GetPlatformAbstractionInterface(); + Dali::Integration::PlatformAbstraction& GetPlatformAbstractionInterface() override; /** * @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetDisplayConnectionInterface() */ - virtual Dali::DisplayConnection& GetDisplayConnectionInterface(); + Dali::DisplayConnection& GetDisplayConnectionInterface() override; /** * @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetGraphicsInterface() */ - virtual GraphicsInterface& GetGraphicsInterface(); + GraphicsInterface& GetGraphicsInterface() override; /** * @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetTriggerEventInterface() */ - virtual TriggerEventInterface& GetProcessCoreEventsTrigger(); + TriggerEventInterface& GetProcessCoreEventsTrigger() override; /** * @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetSocketFactoryInterface() */ - virtual SocketFactoryInterface& GetSocketFactoryInterface(); + SocketFactoryInterface& GetSocketFactoryInterface() override; /** * @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetRenderSurfaceInterface() */ - virtual Dali::RenderSurfaceInterface* GetRenderSurfaceInterface(); + Dali::RenderSurfaceInterface* GetRenderSurfaceInterface() override; /** * @copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetPerformanceInterface() */ - virtual PerformanceInterface* GetPerformanceInterface(); + PerformanceInterface* GetPerformanceInterface() override; /** * copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetKernelTraceInterface() */ - virtual TraceInterface& GetKernelTraceInterface(); + TraceInterface& GetKernelTraceInterface() override; /** * copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetSystemTraceInterface() */ - virtual TraceInterface& GetSystemTraceInterface(); + TraceInterface& GetSystemTraceInterface() override; /** * copydoc Dali::Internal::Adaptor::AdaptorInternalServices::GetWindowContainerInterface() */ - virtual void GetWindowContainerInterface( WindowContainer& windows ); + void GetWindowContainerInterface( WindowContainer& windows ) override; public: // Signals @@ -523,45 +523,45 @@ public: // From Dali::Internal::Adaptor::CoreEventInterface /** * @copydoc Dali::Internal::Adaptor:CoreEventInterface:::ProcessCoreEvents() */ - virtual void ProcessCoreEvents(); + void ProcessCoreEvents() override; private: // From Dali::Internal::Adaptor::CoreEventInterface /** * @copydoc Dali::Internal::Adaptor::CoreEventInterface::QueueCoreEvent() */ - virtual void QueueCoreEvent(const Dali::Integration::Event& event); + void QueueCoreEvent(const Dali::Integration::Event& event) override; private: // From Dali::Integration::RenderController /** * @copydoc Dali::Integration::RenderController::RequestUpdate() */ - virtual void RequestUpdate( bool forceUpdate ); + void RequestUpdate( bool forceUpdate ) override; /** * @copydoc Dali::Integration::RenderController::RequestProcessEventsOnIdle() */ - virtual void RequestProcessEventsOnIdle( bool forceProcess ); + void RequestProcessEventsOnIdle( bool forceProcess ) override; public: // From Dali::Internal::Adaptor::WindowVisibilityObserver /** * Called when the window becomes fully or partially visible. */ - virtual void OnWindowShown(); + void OnWindowShown() override; /** * Called when the window is fully hidden. */ - virtual void OnWindowHidden(); + void OnWindowHidden() override; private: // From Dali::Internal::Adaptor::DamageObserver /** * @copydoc Dali::Internal::Adaptor::DamageObserver::OnDamaged() */ - void OnDamaged( const DamageArea& area ); + void OnDamaged( const DamageArea& area ) override; private: diff --git a/dali/internal/adaptor/common/application-impl.h b/dali/internal/adaptor/common/application-impl.h index 2c868ba..4d3a4eb 100644 --- a/dali/internal/adaptor/common/application-impl.h +++ b/dali/internal/adaptor/common/application-impl.h @@ -163,63 +163,63 @@ public: // From Framework::Observer /** * Called when the framework is initialised. */ - virtual void OnInit(); + void OnInit() override; /** * Called when the framework is terminated. */ - virtual void OnTerminate(); + void OnTerminate() override; /** * Called when the framework is paused. */ - virtual void OnPause(); + void OnPause() override; /** * Called when the framework resumes from a paused state. */ - virtual void OnResume(); + void OnResume() override; /** * Called when the framework received AppControlSignal. * @param[in] The bundle data of AppControl event. */ - virtual void OnAppControl(void *data); + void OnAppControl(void *data) override; /** * Called when the framework informs the application that it should reset itself. */ - virtual void OnReset(); + void OnReset() override; /** * Called when the framework informs the application that the language of the device has changed. */ - virtual void OnLanguageChanged(); + void OnLanguageChanged() override; /** * Called when the framework informs the application that the region of the device has changed. */ - virtual void OnRegionChanged(); + void OnRegionChanged() override; /** * Called when the framework informs the application that the battery level of the device is low. */ - virtual void OnBatteryLow( Dali::DeviceStatus::Battery::Status status ); + void OnBatteryLow( Dali::DeviceStatus::Battery::Status status ) override; /** * Called when the framework informs the application that the memory level of the device is low. */ - virtual void OnMemoryLow( Dali::DeviceStatus::Memory::Status status ); + void OnMemoryLow( Dali::DeviceStatus::Memory::Status status ) override; /** * Called when the framework informs the application that the platform surface is created. */ - virtual void OnSurfaceCreated( Any newSurface ); + void OnSurfaceCreated( Any newSurface ) override; /** * Called when the framework informs the application that the platform surface is destroyed. */ - virtual void OnSurfaceDestroyed( Any newSurface ); + void OnSurfaceDestroyed( Any newSurface ) override; public: @@ -307,7 +307,7 @@ protected: /** * Destructor */ - virtual ~Application(); + ~Application() override; // Undefined Application(const Application&); diff --git a/dali/internal/adaptor/common/combined-update-render-controller.h b/dali/internal/adaptor/common/combined-update-render-controller.h index 8dfd4eb..6d0cb37 100644 --- a/dali/internal/adaptor/common/combined-update-render-controller.h +++ b/dali/internal/adaptor/common/combined-update-render-controller.h @@ -90,62 +90,62 @@ public: /** * @copydoc ThreadControllerInterface::Initialize() */ - virtual void Initialize(); + void Initialize() override; /** * @copydoc ThreadControllerInterface::Start() */ - virtual void Start(); + void Start() override; /** * @copydoc ThreadControllerInterface::Pause() */ - virtual void Pause(); + void Pause() override; /** * @copydoc ThreadControllerInterface::Resume() */ - virtual void Resume(); + void Resume() override; /** * @copydoc ThreadControllerInterface::Stop() */ - virtual void Stop(); + void Stop() override; /** * @copydoc ThreadControllerInterface::RequestUpdate() */ - virtual void RequestUpdate(); + void RequestUpdate() override; /** * @copydoc ThreadControllerInterface::RequestUpdateOnce() */ - virtual void RequestUpdateOnce( UpdateMode updateMode ); + void RequestUpdateOnce( UpdateMode updateMode ) override; /** * @copydoc ThreadControllerInterface::ReplaceSurface() */ - virtual void ReplaceSurface( Dali::RenderSurfaceInterface* surface ); + void ReplaceSurface( Dali::RenderSurfaceInterface* surface ) override; /** * @copydoc ThreadControllerInterface::DeleteSurface() */ - virtual void DeleteSurface( Dali::RenderSurfaceInterface* surface ); + void DeleteSurface( Dali::RenderSurfaceInterface* surface ) override; /** * @copydoc ThreadControllerInterface::ResizeSurface() */ - virtual void ResizeSurface(); + void ResizeSurface() override; /** * @copydoc ThreadControllerInterface::WaitForGraphicsInitialization() */ - virtual void WaitForGraphicsInitialization(); + void WaitForGraphicsInitialization() override; /** * @copydoc ThreadControllerInterface::SetRenderRefreshRate() */ - virtual void SetRenderRefreshRate( unsigned int numberOfFramesPerRender ); + void SetRenderRefreshRate( unsigned int numberOfFramesPerRender ) override; /** * @copydoc ThreadControllerInterface::SetPreRenderCallback @@ -155,7 +155,7 @@ public: /** * @copydoc ThreadControllerInterface::AddSurface() */ - virtual void AddSurface( Dali::RenderSurfaceInterface* surface ); + void AddSurface( Dali::RenderSurfaceInterface* surface ) override; private: @@ -322,7 +322,7 @@ private: /** * @copydoc ThreadSynchronizationInterface::PostRenderComplete() */ - virtual void PostRenderComplete(); + void PostRenderComplete() override; ///////////////////////////////////////////////////////////////////////////////////////////////// //// Called by the Render Thread if post-rendering is required @@ -331,12 +331,12 @@ private: /** * @copydoc ThreadSynchronizationInterface::PostRenderStarted() */ - virtual void PostRenderStarted(); + void PostRenderStarted() override; /** * @copydoc ThreadSynchronizationInterface::PostRenderStarted() */ - virtual void PostRenderWaitForCompletion(); + void PostRenderWaitForCompletion() override; private: diff --git a/dali/internal/adaptor/common/lifecycle-controller-impl.h b/dali/internal/adaptor/common/lifecycle-controller-impl.h index b04ff9a..f63c0c2 100644 --- a/dali/internal/adaptor/common/lifecycle-controller-impl.h +++ b/dali/internal/adaptor/common/lifecycle-controller-impl.h @@ -138,7 +138,7 @@ protected: /** * Virtual Destructor. */ - virtual ~LifecycleController(); + ~LifecycleController() override; private: diff --git a/dali/internal/adaptor/tizen-wayland/component-application-impl.h b/dali/internal/adaptor/tizen-wayland/component-application-impl.h index cd7e6c2..bf726ff 100644 --- a/dali/internal/adaptor/tizen-wayland/component-application-impl.h +++ b/dali/internal/adaptor/tizen-wayland/component-application-impl.h @@ -78,7 +78,7 @@ public: // From Framework::Observer /** * Called when the framework is Component Application Created. */ - virtual Any OnCreate(); + Any OnCreate() override; public: CreateSignal mCreateSignal; diff --git a/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h index 4701bba..2117e16 100644 --- a/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h +++ b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h @@ -79,22 +79,22 @@ public: /** * Called when the framework is initialised. */ - virtual void OnInit(); + void OnInit() override; /** * Called when the framework is terminated. */ - virtual void OnTerminate(); + void OnTerminate() override; /** * Called when the framework is paused. */ - virtual void OnPause(); + void OnPause() override; /** * Called when the framework resumes from a paused state. */ - virtual void OnResume(); + void OnResume() override; /** * Called every second diff --git a/dali/internal/clipboard/common/clipboard-event-notifier-impl.h b/dali/internal/clipboard/common/clipboard-event-notifier-impl.h index 993b680..2ec3e56 100755 --- a/dali/internal/clipboard/common/clipboard-event-notifier-impl.h +++ b/dali/internal/clipboard/common/clipboard-event-notifier-impl.h @@ -103,7 +103,7 @@ private: /** * Destructor. */ - virtual ~ClipboardEventNotifier(); + ~ClipboardEventNotifier() override; // Undefined ClipboardEventNotifier( const ClipboardEventNotifier& ); diff --git a/dali/internal/clipboard/common/clipboard-impl.h b/dali/internal/clipboard/common/clipboard-impl.h index 376d788..b4371ae 100644 --- a/dali/internal/clipboard/common/clipboard-impl.h +++ b/dali/internal/clipboard/common/clipboard-impl.h @@ -58,7 +58,7 @@ public: /** * Destructor */ - virtual ~Clipboard(); + ~Clipboard() override; /** * @copydoc Dali::Clipboard::SetItem() diff --git a/dali/internal/graphics/gles/egl-context-helper-implementation.h b/dali/internal/graphics/gles/egl-context-helper-implementation.h index ef38426..ba188f4 100644 --- a/dali/internal/graphics/gles/egl-context-helper-implementation.h +++ b/dali/internal/graphics/gles/egl-context-helper-implementation.h @@ -66,17 +66,17 @@ public: /** * @copydoc Dali::Integration::GlContextHelperAbstraction::MakeSurfacelessContextCurrent() */ - virtual void MakeSurfacelessContextCurrent() override; + void MakeSurfacelessContextCurrent() override; /** * @copydoc Dali::Integration::GlContextHelperAbstraction::MakeContextNull() */ - virtual void MakeContextNull() override; + void MakeContextNull() override; /** * @copydoc Dali::Integration::GlContextHelperAbstraction::WaitClient() */ - virtual void WaitClient() override; + void WaitClient() override; private: diff --git a/dali/internal/graphics/gles/egl-graphics-factory.h b/dali/internal/graphics/gles/egl-graphics-factory.h index 6ba1d91..a175248 100644 --- a/dali/internal/graphics/gles/egl-graphics-factory.h +++ b/dali/internal/graphics/gles/egl-graphics-factory.h @@ -43,7 +43,7 @@ public: /** * Destructor */ - virtual ~GraphicsFactory(); + ~GraphicsFactory() override; /** * @copydoc Dali::Internal::Adaptor::GraphicsFactoryInterface::Create() @@ -53,7 +53,7 @@ public: /** * @copydoc Dali::Internal::Adaptor::GraphicsFactoryInterface::Destroy() */ - void Destroy(); + void Destroy() override; }; } // Adaptor diff --git a/dali/internal/graphics/gles/egl-implementation.h b/dali/internal/graphics/gles/egl-implementation.h index 34d0f5c..6d9e3c9 100644 --- a/dali/internal/graphics/gles/egl-implementation.h +++ b/dali/internal/graphics/gles/egl-implementation.h @@ -60,7 +60,7 @@ public: /** * Destructor */ - virtual ~EglImplementation(); + ~EglImplementation() override; public: @@ -77,7 +77,7 @@ public: * Create the OpenGL context for the shared resource. * @return true if successful */ - virtual bool CreateContext(); + bool CreateContext() override; /** * Create the OpenGL context for the window. @@ -98,7 +98,7 @@ public: /** * Make the OpenGL context current */ - virtual void MakeContextCurrent( EGLSurface eglSurface, EGLContext eglContext ); + void MakeContextCurrent( EGLSurface eglSurface, EGLContext eglContext ) override; /** * clear the OpenGL context @@ -116,7 +116,7 @@ public: /** * Terminate GL */ - virtual void TerminateGles(); + void TerminateGles() override; /** * Checks if GL is initialised @@ -127,7 +127,7 @@ public: /** * Performs an OpenGL swap buffers command */ - virtual void SwapBuffers( EGLSurface& eglSurface ); + void SwapBuffers( EGLSurface& eglSurface ) override; /** * Gets current back buffer age @@ -147,12 +147,12 @@ public: /** * Performs an OpenGL copy buffers command */ - virtual void CopyBuffers( EGLSurface& eglSurface ); + void CopyBuffers( EGLSurface& eglSurface ) override; /** * Performs an EGL wait GL command */ - virtual void WaitGL(); + void WaitGL() override; /** * Choose config of egl diff --git a/dali/internal/graphics/gles/egl-sync-implementation.h b/dali/internal/graphics/gles/egl-sync-implementation.h index fbb3bdb..be69521 100644 --- a/dali/internal/graphics/gles/egl-sync-implementation.h +++ b/dali/internal/graphics/gles/egl-sync-implementation.h @@ -50,7 +50,7 @@ public: /** * @copydoc Dali::Integration::GlSyncAbstraction::SyncObject::IsSynced() */ - virtual bool IsSynced(); + bool IsSynced() override; private: #ifdef _ARCH_ARM_ @@ -92,12 +92,12 @@ public: /** * @copydoc Dali::Integration::GlSyncAbstraction::CreateSyncObject() */ - virtual SyncObject* CreateSyncObject(); + SyncObject* CreateSyncObject() override; /** * @copydoc Dali::Integration::GlSyncAbstraction::DestroySyncObject() */ - virtual void DestroySyncObject(SyncObject* syncObject); + void DestroySyncObject(SyncObject* syncObject) override; private: /** diff --git a/dali/internal/graphics/gles/gl-implementation.h b/dali/internal/graphics/gles/gl-implementation.h index 9ccc015..1cd7ed9 100644 --- a/dali/internal/graphics/gles/gl-implementation.h +++ b/dali/internal/graphics/gles/gl-implementation.h @@ -60,12 +60,12 @@ public: virtual ~GlImplementation() {} - void PreRender() + void PreRender() override { /* Do nothing in main implementation */ } - void PostRender() + void PostRender() override { /* Do nothing in main implementation */ } @@ -102,12 +102,12 @@ public: mIsSurfacelessContextSupported = isSupported; } - bool IsSurfacelessContextSupported() const + bool IsSurfacelessContextSupported() const override { return mIsSurfacelessContextSupported; } - bool TextureRequiresConverting( const GLenum imageGlFormat, const GLenum textureGlFormat, const bool isSubImage ) const + bool TextureRequiresConverting( const GLenum imageGlFormat, const GLenum textureGlFormat, const bool isSubImage ) const override { bool convert = ( ( imageGlFormat == GL_RGB ) && ( textureGlFormat == GL_RGBA ) ); if( mGlesVersion >= 30 ) @@ -129,1234 +129,1234 @@ public: /* OpenGL ES 2.0 */ - void ActiveTexture( GLenum texture ) + void ActiveTexture( GLenum texture ) override { glActiveTexture( texture ); } - void AttachShader( GLuint program, GLuint shader ) + void AttachShader( GLuint program, GLuint shader ) override { glAttachShader( program, shader ); } - void BindAttribLocation( GLuint program, GLuint index, const char* name ) + void BindAttribLocation( GLuint program, GLuint index, const char* name ) override { glBindAttribLocation( program, index, name ); } - void BindBuffer( GLenum target, GLuint buffer ) + void BindBuffer( GLenum target, GLuint buffer ) override { glBindBuffer( target, buffer ); } - void BindFramebuffer( GLenum target, GLuint framebuffer ) + void BindFramebuffer( GLenum target, GLuint framebuffer ) override { glBindFramebuffer( target, framebuffer ); } - void BindRenderbuffer( GLenum target, GLuint renderbuffer ) + void BindRenderbuffer( GLenum target, GLuint renderbuffer ) override { glBindRenderbuffer( target, renderbuffer ); } - void BindTexture( GLenum target, GLuint texture ) + void BindTexture( GLenum target, GLuint texture ) override { glBindTexture( target, texture ); } - void BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) + void BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) override { glBlendColor( red, green, blue, alpha ); } - void BlendEquation( GLenum mode ) + void BlendEquation( GLenum mode ) override { glBlendEquation( mode ); } - void BlendEquationSeparate( GLenum modeRGB, GLenum modeAlpha ) + void BlendEquationSeparate( GLenum modeRGB, GLenum modeAlpha ) override { glBlendEquationSeparate( modeRGB, modeAlpha ); } - void BlendFunc( GLenum sfactor, GLenum dfactor ) + void BlendFunc( GLenum sfactor, GLenum dfactor ) override { glBlendFunc( sfactor, dfactor ); } - void BlendFuncSeparate( GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha ) + void BlendFuncSeparate( GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha ) override { glBlendFuncSeparate( srcRGB, dstRGB, srcAlpha, dstAlpha ); } - void BufferData( GLenum target, GLsizeiptr size, const void* data, GLenum usage ) + void BufferData( GLenum target, GLsizeiptr size, const void* data, GLenum usage ) override { glBufferData( target, size, data, usage ); } - void BufferSubData( GLenum target, GLintptr offset, GLsizeiptr size, const void* data ) + void BufferSubData( GLenum target, GLintptr offset, GLsizeiptr size, const void* data ) override { glBufferSubData( target, offset, size, data ); } - GLenum CheckFramebufferStatus( GLenum target ) + GLenum CheckFramebufferStatus( GLenum target ) override { return glCheckFramebufferStatus( target ); } - void Clear( GLbitfield mask ) + void Clear( GLbitfield mask ) override { glClear( mask ); } - void ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) + void ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) override { glClearColor( red, green, blue, alpha ); } - void ClearDepthf( GLclampf depth ) + void ClearDepthf( GLclampf depth ) override { glClearDepthf( depth ); } - void ClearStencil( GLint s ) + void ClearStencil( GLint s ) override { glClearStencil( s ); } - void ColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ) + void ColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ) override { glColorMask( red, green, blue, alpha ); } - void CompileShader( GLuint shader ) + void CompileShader( GLuint shader ) override { glCompileShader( shader ); } - void CompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data ) + void CompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data ) override { glCompressedTexImage2D( target, level, internalformat, width, height, border, imageSize, data ); } - void CompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data ) + void CompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data ) override { glCompressedTexSubImage2D( target, level, xoffset, yoffset, width, height, format, imageSize, data ); } - void CopyTexImage2D( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border ) + void CopyTexImage2D( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border ) override { glCopyTexImage2D( target, level, internalformat, x, y, width, height, border ); } - void CopyTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height ) + void CopyTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height ) override { glCopyTexSubImage2D( target, level, xoffset, yoffset, x, y, width, height ); } - GLuint CreateProgram( void ) + GLuint CreateProgram( void ) override { return glCreateProgram(); } - GLuint CreateShader( GLenum type ) + GLuint CreateShader( GLenum type ) override { return glCreateShader( type ); } - void CullFace( GLenum mode ) + void CullFace( GLenum mode ) override { glCullFace( mode ); } - void DeleteBuffers( GLsizei n, const GLuint* buffers ) + void DeleteBuffers( GLsizei n, const GLuint* buffers ) override { glDeleteBuffers( n, buffers ); } - void DeleteFramebuffers( GLsizei n, const GLuint* framebuffers ) + void DeleteFramebuffers( GLsizei n, const GLuint* framebuffers ) override { glDeleteFramebuffers( n, framebuffers ); } - void DeleteProgram( GLuint program ) + void DeleteProgram( GLuint program ) override { glDeleteProgram( program ); } - void DeleteRenderbuffers( GLsizei n, const GLuint* renderbuffers ) + void DeleteRenderbuffers( GLsizei n, const GLuint* renderbuffers ) override { glDeleteRenderbuffers( n, renderbuffers ); } - void DeleteShader( GLuint shader ) + void DeleteShader( GLuint shader ) override { glDeleteShader( shader ); } - void DeleteTextures( GLsizei n, const GLuint* textures ) + void DeleteTextures( GLsizei n, const GLuint* textures ) override { glDeleteTextures( n, textures ); } - void DepthFunc( GLenum func ) + void DepthFunc( GLenum func ) override { glDepthFunc( func ); } - void DepthMask( GLboolean flag ) + void DepthMask( GLboolean flag ) override { glDepthMask( flag ); } - void DepthRangef( GLclampf zNear, GLclampf zFar ) + void DepthRangef( GLclampf zNear, GLclampf zFar ) override { glDepthRangef( zNear, zFar ); } - void DetachShader( GLuint program, GLuint shader ) + void DetachShader( GLuint program, GLuint shader ) override { glDetachShader( program, shader ); } - void Disable( GLenum cap ) + void Disable( GLenum cap ) override { glDisable( cap ); } - void DisableVertexAttribArray( GLuint index ) + void DisableVertexAttribArray( GLuint index ) override { glDisableVertexAttribArray( index ); } - void DrawArrays( GLenum mode, GLint first, GLsizei count ) + void DrawArrays( GLenum mode, GLint first, GLsizei count ) override { glDrawArrays( mode, first, count ); } - void DrawElements( GLenum mode, GLsizei count, GLenum type, const void* indices ) + void DrawElements( GLenum mode, GLsizei count, GLenum type, const void* indices ) override { glDrawElements( mode, count, type, indices ); } - void Enable( GLenum cap ) + void Enable( GLenum cap ) override { glEnable( cap ); } - void EnableVertexAttribArray( GLuint index ) + void EnableVertexAttribArray( GLuint index ) override { glEnableVertexAttribArray( index ); } - void Finish( void ) + void Finish( void ) override { glFinish(); } - void Flush( void ) + void Flush( void ) override { glFlush(); } - void FramebufferRenderbuffer( GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer ) + void FramebufferRenderbuffer( GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer ) override { glFramebufferRenderbuffer( target, attachment, renderbuffertarget, renderbuffer ); } - void FramebufferTexture2D( GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level ) + void FramebufferTexture2D( GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level ) override { glFramebufferTexture2D( target, attachment, textarget, texture, level ); } - void FrontFace( GLenum mode ) + void FrontFace( GLenum mode ) override { glFrontFace( mode ); } - void GenBuffers( GLsizei n, GLuint* buffers ) + void GenBuffers( GLsizei n, GLuint* buffers ) override { glGenBuffers( n, buffers ); } - void GenerateMipmap( GLenum target ) + void GenerateMipmap( GLenum target ) override { glGenerateMipmap( target ); } - void GenFramebuffers( GLsizei n, GLuint* framebuffers ) + void GenFramebuffers( GLsizei n, GLuint* framebuffers ) override { glGenFramebuffers( n, framebuffers ); } - void GenRenderbuffers( GLsizei n, GLuint* renderbuffers ) + void GenRenderbuffers( GLsizei n, GLuint* renderbuffers ) override { glGenRenderbuffers( n, renderbuffers ); } - void GenTextures( GLsizei n, GLuint* textures ) + void GenTextures( GLsizei n, GLuint* textures ) override { glGenTextures( n, textures ); } - void GetActiveAttrib( GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name ) + void GetActiveAttrib( GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name ) override { glGetActiveAttrib( program, index, bufsize, length, size, type, name ); } - void GetActiveUniform( GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name ) + void GetActiveUniform( GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name ) override { glGetActiveUniform( program, index, bufsize, length, size, type, name ); } - void GetAttachedShaders( GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders ) + void GetAttachedShaders( GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders ) override { glGetAttachedShaders( program, maxcount, count, shaders ); } - int GetAttribLocation( GLuint program, const char* name ) + int GetAttribLocation( GLuint program, const char* name ) override { return glGetAttribLocation( program, name ); } - void GetBooleanv( GLenum pname, GLboolean* params ) + void GetBooleanv( GLenum pname, GLboolean* params ) override { glGetBooleanv( pname, params ); } - void GetBufferParameteriv( GLenum target, GLenum pname, GLint* params ) + void GetBufferParameteriv( GLenum target, GLenum pname, GLint* params ) override { glGetBufferParameteriv( target, pname, params ); } - GLenum GetError( void ) + GLenum GetError( void ) override { return glGetError(); } - void GetFloatv( GLenum pname, GLfloat* params ) + void GetFloatv( GLenum pname, GLfloat* params ) override { glGetFloatv( pname, params ); } - void GetFramebufferAttachmentParameteriv( GLenum target, GLenum attachment, GLenum pname, GLint* params ) + void GetFramebufferAttachmentParameteriv( GLenum target, GLenum attachment, GLenum pname, GLint* params ) override { glGetFramebufferAttachmentParameteriv( target, attachment, pname, params ); } - void GetIntegerv( GLenum pname, GLint* params ) + void GetIntegerv( GLenum pname, GLint* params ) override { glGetIntegerv( pname, params ); } - void GetProgramiv( GLuint program, GLenum pname, GLint* params ) + void GetProgramiv( GLuint program, GLenum pname, GLint* params ) override { glGetProgramiv( program, pname, params ); } - void GetProgramInfoLog( GLuint program, GLsizei bufsize, GLsizei* length, char* infolog ) + void GetProgramInfoLog( GLuint program, GLsizei bufsize, GLsizei* length, char* infolog ) override { glGetProgramInfoLog( program, bufsize, length, infolog ); } - void GetRenderbufferParameteriv( GLenum target, GLenum pname, GLint* params ) + void GetRenderbufferParameteriv( GLenum target, GLenum pname, GLint* params ) override { glGetRenderbufferParameteriv( target, pname, params ); } - void GetShaderiv( GLuint shader, GLenum pname, GLint* params ) + void GetShaderiv( GLuint shader, GLenum pname, GLint* params ) override { glGetShaderiv( shader, pname, params ); } - void GetShaderInfoLog( GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog ) + void GetShaderInfoLog( GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog ) override { glGetShaderInfoLog( shader, bufsize, length, infolog ); } - void GetShaderPrecisionFormat( GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision ) + void GetShaderPrecisionFormat( GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision ) override { glGetShaderPrecisionFormat( shadertype, precisiontype, range, precision ); } - void GetShaderSource( GLuint shader, GLsizei bufsize, GLsizei* length, char* source ) + void GetShaderSource( GLuint shader, GLsizei bufsize, GLsizei* length, char* source ) override { glGetShaderSource( shader, bufsize, length, source ); } - const GLubyte* GetString( GLenum name ) + const GLubyte* GetString( GLenum name ) override { return glGetString( name ); } - void GetTexParameterfv( GLenum target, GLenum pname, GLfloat* params ) + void GetTexParameterfv( GLenum target, GLenum pname, GLfloat* params ) override { glGetTexParameterfv( target, pname, params ); } - void GetTexParameteriv( GLenum target, GLenum pname, GLint* params ) + void GetTexParameteriv( GLenum target, GLenum pname, GLint* params ) override { glGetTexParameteriv( target, pname, params ); } - void GetUniformfv( GLuint program, GLint location, GLfloat* params ) + void GetUniformfv( GLuint program, GLint location, GLfloat* params ) override { glGetUniformfv( program, location, params ); } - void GetUniformiv( GLuint program, GLint location, GLint* params ) + void GetUniformiv( GLuint program, GLint location, GLint* params ) override { glGetUniformiv( program, location, params ); } - int GetUniformLocation( GLuint program, const char* name ) + int GetUniformLocation( GLuint program, const char* name ) override { return glGetUniformLocation( program, name ); } - void GetVertexAttribfv( GLuint index, GLenum pname, GLfloat* params ) + void GetVertexAttribfv( GLuint index, GLenum pname, GLfloat* params ) override { glGetVertexAttribfv( index, pname, params ); } - void GetVertexAttribiv( GLuint index, GLenum pname, GLint* params ) + void GetVertexAttribiv( GLuint index, GLenum pname, GLint* params ) override { glGetVertexAttribiv( index, pname, params ); } - void GetVertexAttribPointerv( GLuint index, GLenum pname, void** pointer ) + void GetVertexAttribPointerv( GLuint index, GLenum pname, void** pointer ) override { glGetVertexAttribPointerv( index, pname, pointer ); } - void Hint( GLenum target, GLenum mode ) + void Hint( GLenum target, GLenum mode ) override { glHint( target, mode ); } - GLboolean IsBuffer( GLuint buffer ) + GLboolean IsBuffer( GLuint buffer ) override { return glIsBuffer( buffer ); } - GLboolean IsEnabled( GLenum cap ) + GLboolean IsEnabled( GLenum cap ) override { return glIsEnabled( cap ); } - GLboolean IsFramebuffer( GLuint framebuffer ) + GLboolean IsFramebuffer( GLuint framebuffer ) override { return glIsFramebuffer( framebuffer ); } - GLboolean IsProgram( GLuint program ) + GLboolean IsProgram( GLuint program ) override { return glIsProgram( program ); } - GLboolean IsRenderbuffer( GLuint renderbuffer ) + GLboolean IsRenderbuffer( GLuint renderbuffer ) override { return glIsRenderbuffer( renderbuffer ); } - GLboolean IsShader( GLuint shader ) + GLboolean IsShader( GLuint shader ) override { return glIsShader( shader ); } - GLboolean IsTexture( GLuint texture ) + GLboolean IsTexture( GLuint texture ) override { return glIsTexture( texture ); } - void LineWidth( GLfloat width ) + void LineWidth( GLfloat width ) override { glLineWidth( width ); } - void LinkProgram( GLuint program ) + void LinkProgram( GLuint program ) override { glLinkProgram( program ); } - void PixelStorei( GLenum pname, GLint param ) + void PixelStorei( GLenum pname, GLint param ) override { glPixelStorei( pname, param ); } - void PolygonOffset( GLfloat factor, GLfloat units ) + void PolygonOffset( GLfloat factor, GLfloat units ) override { glPolygonOffset( factor, units ); } - void ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels ) + void ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels ) override { glReadPixels( x, y, width, height, format, type, pixels ); } - void ReleaseShaderCompiler( void ) + void ReleaseShaderCompiler( void ) override { glReleaseShaderCompiler(); } - void RenderbufferStorage( GLenum target, GLenum internalformat, GLsizei width, GLsizei height ) + void RenderbufferStorage( GLenum target, GLenum internalformat, GLsizei width, GLsizei height ) override { glRenderbufferStorage( target, internalformat, width, height ); } - void SampleCoverage( GLclampf value, GLboolean invert ) + void SampleCoverage( GLclampf value, GLboolean invert ) override { glSampleCoverage( value, invert ); } - void Scissor( GLint x, GLint y, GLsizei width, GLsizei height ) + void Scissor( GLint x, GLint y, GLsizei width, GLsizei height ) override { glScissor( x, y, width, height ); } - void ShaderBinary( GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length ) + void ShaderBinary( GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length ) override { glShaderBinary( n, shaders, binaryformat, binary, length ); } - void ShaderSource( GLuint shader, GLsizei count, const char** string, const GLint* length ) + void ShaderSource( GLuint shader, GLsizei count, const char** string, const GLint* length ) override { glShaderSource( shader, count, string, length ); } - void StencilFunc( GLenum func, GLint ref, GLuint mask ) + void StencilFunc( GLenum func, GLint ref, GLuint mask ) override { glStencilFunc( func, ref, mask ); } - void StencilFuncSeparate( GLenum face, GLenum func, GLint ref, GLuint mask ) + void StencilFuncSeparate( GLenum face, GLenum func, GLint ref, GLuint mask ) override { glStencilFuncSeparate( face, func, ref, mask ); } - void StencilMask( GLuint mask ) + void StencilMask( GLuint mask ) override { glStencilMask( mask ); } - void StencilMaskSeparate( GLenum face, GLuint mask ) + void StencilMaskSeparate( GLenum face, GLuint mask ) override { glStencilMaskSeparate( face, mask ); } - void StencilOp( GLenum fail, GLenum zfail, GLenum zpass ) + void StencilOp( GLenum fail, GLenum zfail, GLenum zpass ) override { glStencilOp( fail, zfail, zpass ); } - void StencilOpSeparate( GLenum face, GLenum fail, GLenum zfail, GLenum zpass ) + void StencilOpSeparate( GLenum face, GLenum fail, GLenum zfail, GLenum zpass ) override { glStencilOpSeparate( face, fail, zfail, zpass ); } - void TexImage2D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels ) + void TexImage2D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels ) override { glTexImage2D( target, level, internalformat, width, height, border, format, type, pixels ); } - void TexParameterf( GLenum target, GLenum pname, GLfloat param ) + void TexParameterf( GLenum target, GLenum pname, GLfloat param ) override { glTexParameterf( target, pname, param ); } - void TexParameterfv( GLenum target, GLenum pname, const GLfloat* params ) + void TexParameterfv( GLenum target, GLenum pname, const GLfloat* params ) override { glTexParameterfv( target, pname, params ); } - void TexParameteri( GLenum target, GLenum pname, GLint param ) + void TexParameteri( GLenum target, GLenum pname, GLint param ) override { glTexParameteri( target, pname, param ); } - void TexParameteriv( GLenum target, GLenum pname, const GLint* params ) + void TexParameteriv( GLenum target, GLenum pname, const GLint* params ) override { glTexParameteriv( target, pname, params ); } - void TexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels ) + void TexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels ) override { glTexSubImage2D( target, level, xoffset, yoffset, width, height, format, type, pixels ); } - void Uniform1f( GLint location, GLfloat x ) + void Uniform1f( GLint location, GLfloat x ) override { glUniform1f( location, x ); } - void Uniform1fv( GLint location, GLsizei count, const GLfloat* v ) + void Uniform1fv( GLint location, GLsizei count, const GLfloat* v ) override { glUniform1fv( location, count, v ); } - void Uniform1i( GLint location, GLint x ) + void Uniform1i( GLint location, GLint x ) override { glUniform1i( location, x ); } - void Uniform1iv( GLint location, GLsizei count, const GLint* v ) + void Uniform1iv( GLint location, GLsizei count, const GLint* v ) override { glUniform1iv( location, count, v ); } - void Uniform2f( GLint location, GLfloat x, GLfloat y ) + void Uniform2f( GLint location, GLfloat x, GLfloat y ) override { glUniform2f( location, x, y ); } - void Uniform2fv( GLint location, GLsizei count, const GLfloat* v ) + void Uniform2fv( GLint location, GLsizei count, const GLfloat* v ) override { glUniform2fv( location, count, v ); } - void Uniform2i( GLint location, GLint x, GLint y ) + void Uniform2i( GLint location, GLint x, GLint y ) override { glUniform2i( location, x, y ); } - void Uniform2iv( GLint location, GLsizei count, const GLint* v ) + void Uniform2iv( GLint location, GLsizei count, const GLint* v ) override { glUniform2iv( location, count, v ); } - void Uniform3f( GLint location, GLfloat x, GLfloat y, GLfloat z ) + void Uniform3f( GLint location, GLfloat x, GLfloat y, GLfloat z ) override { glUniform3f( location, x, y, z ); } - void Uniform3fv( GLint location, GLsizei count, const GLfloat* v ) + void Uniform3fv( GLint location, GLsizei count, const GLfloat* v ) override { glUniform3fv( location, count, v ); } - void Uniform3i( GLint location, GLint x, GLint y, GLint z ) + void Uniform3i( GLint location, GLint x, GLint y, GLint z ) override { glUniform3i( location, x, y, z ); } - void Uniform3iv( GLint location, GLsizei count, const GLint* v ) + void Uniform3iv( GLint location, GLsizei count, const GLint* v ) override { glUniform3iv( location, count, v ); } - void Uniform4f( GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) + void Uniform4f( GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) override { glUniform4f( location, x, y, z, w ); } - void Uniform4fv( GLint location, GLsizei count, const GLfloat* v ) + void Uniform4fv( GLint location, GLsizei count, const GLfloat* v ) override { glUniform4fv( location, count, v ); } - void Uniform4i( GLint location, GLint x, GLint y, GLint z, GLint w ) + void Uniform4i( GLint location, GLint x, GLint y, GLint z, GLint w ) override { glUniform4i( location, x, y, z, w ); } - void Uniform4iv( GLint location, GLsizei count, const GLint* v ) + void Uniform4iv( GLint location, GLsizei count, const GLint* v ) override { glUniform4iv( location, count, v ); } - void UniformMatrix2fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) + void UniformMatrix2fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override { glUniformMatrix2fv( location, count, transpose, value ); } - void UniformMatrix3fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) + void UniformMatrix3fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override { glUniformMatrix3fv( location, count, transpose, value ); } - void UniformMatrix4fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) + void UniformMatrix4fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override { glUniformMatrix4fv( location, count, transpose, value ); } - void UseProgram( GLuint program ) + void UseProgram( GLuint program ) override { glUseProgram( program ); } - void ValidateProgram( GLuint program ) + void ValidateProgram( GLuint program ) override { glValidateProgram( program ); } - void VertexAttrib1f( GLuint indx, GLfloat x ) + void VertexAttrib1f( GLuint indx, GLfloat x ) override { glVertexAttrib1f( indx, x ); } - void VertexAttrib1fv( GLuint indx, const GLfloat* values ) + void VertexAttrib1fv( GLuint indx, const GLfloat* values ) override { glVertexAttrib1fv( indx, values ); } - void VertexAttrib2f( GLuint indx, GLfloat x, GLfloat y ) + void VertexAttrib2f( GLuint indx, GLfloat x, GLfloat y ) override { glVertexAttrib2f( indx, x, y ); } - void VertexAttrib2fv( GLuint indx, const GLfloat* values ) + void VertexAttrib2fv( GLuint indx, const GLfloat* values ) override { glVertexAttrib2fv( indx, values ); } - void VertexAttrib3f( GLuint indx, GLfloat x, GLfloat y, GLfloat z ) + void VertexAttrib3f( GLuint indx, GLfloat x, GLfloat y, GLfloat z ) override { glVertexAttrib3f( indx, x, y, z ); } - void VertexAttrib3fv( GLuint indx, const GLfloat* values ) + void VertexAttrib3fv( GLuint indx, const GLfloat* values ) override { glVertexAttrib3fv( indx, values ); } - void VertexAttrib4f( GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) + void VertexAttrib4f( GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) override { glVertexAttrib4f( indx, x, y, z, w ); } - void VertexAttrib4fv( GLuint indx, const GLfloat* values ) + void VertexAttrib4fv( GLuint indx, const GLfloat* values ) override { glVertexAttrib4fv( indx, values ); } - void VertexAttribPointer( GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr ) + void VertexAttribPointer( GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr ) override { glVertexAttribPointer( indx, size, type, normalized, stride, ptr ); } - void Viewport( GLint x, GLint y, GLsizei width, GLsizei height ) + void Viewport( GLint x, GLint y, GLsizei width, GLsizei height ) override { glViewport( x, y, width, height ); } /* OpenGL ES 3.0 */ - void ReadBuffer( GLenum mode ) + void ReadBuffer( GLenum mode ) override { mImpl->ReadBuffer( mode ); } - void DrawRangeElements( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices ) + void DrawRangeElements( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices ) override { mImpl->DrawRangeElements( mode, start, end, count, type, indices ); } - void TexImage3D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels ) + void TexImage3D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels ) override { mImpl->TexImage3D( target, level, internalformat, width, height, depth, border, format, type, pixels ); } - void TexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels ) + void TexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels ) override { mImpl->TexSubImage3D( target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels ); } - void CopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) + void CopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) override { mImpl->CopyTexSubImage3D( target, level, xoffset, yoffset, zoffset, x, y, width, height ); } - void CompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data ) + void CompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data ) override { mImpl->CompressedTexImage3D( target, level, internalformat, width, height, depth, border, imageSize, data ); } - void CompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data ) + void CompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data ) override { mImpl->CompressedTexSubImage3D( target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data ); } - void GenQueries( GLsizei n, GLuint* ids ) + void GenQueries( GLsizei n, GLuint* ids ) override { mImpl->GenQueries( n, ids ); } - void DeleteQueries( GLsizei n, const GLuint* ids ) + void DeleteQueries( GLsizei n, const GLuint* ids ) override { mImpl->DeleteQueries( n, ids ); } - GLboolean IsQuery( GLuint id ) + GLboolean IsQuery( GLuint id ) override { return mImpl->IsQuery( id ); } - void BeginQuery( GLenum target, GLuint id ) + void BeginQuery( GLenum target, GLuint id ) override { mImpl->BeginQuery( target, id ); } - void EndQuery( GLenum target ) + void EndQuery( GLenum target ) override { mImpl->EndQuery( target ); } - void GetQueryiv( GLenum target, GLenum pname, GLint* params ) + void GetQueryiv( GLenum target, GLenum pname, GLint* params ) override { mImpl->GetQueryiv( target, pname, params ); } - void GetQueryObjectuiv( GLuint id, GLenum pname, GLuint* params ) + void GetQueryObjectuiv( GLuint id, GLenum pname, GLuint* params ) override { mImpl->GetQueryObjectuiv( id, pname, params ); } - GLboolean UnmapBuffer( GLenum target ) + GLboolean UnmapBuffer( GLenum target ) override { return mImpl->UnmapBuffer( target ); } - void GetBufferPointerv( GLenum target, GLenum pname, GLvoid** params ) + void GetBufferPointerv( GLenum target, GLenum pname, GLvoid** params ) override { mImpl->GetBufferPointerv( target, pname, params ); } - void DrawBuffers( GLsizei n, const GLenum* bufs ) + void DrawBuffers( GLsizei n, const GLenum* bufs ) override { mImpl->DrawBuffers( n, bufs ); } - void UniformMatrix2x3fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) + void UniformMatrix2x3fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override { mImpl->UniformMatrix2x3fv( location, count, transpose, value ); } - void UniformMatrix3x2fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) + void UniformMatrix3x2fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override { mImpl->UniformMatrix3x2fv( location, count, transpose, value ); } - void UniformMatrix2x4fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) + void UniformMatrix2x4fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override { mImpl->UniformMatrix2x4fv( location, count, transpose, value ); } - void UniformMatrix4x2fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) + void UniformMatrix4x2fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override { mImpl->UniformMatrix4x2fv( location, count, transpose, value ); } - void UniformMatrix3x4fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) + void UniformMatrix3x4fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override { mImpl->UniformMatrix3x4fv( location, count, transpose, value ); } - void UniformMatrix4x3fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) + void UniformMatrix4x3fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override { mImpl->UniformMatrix4x3fv( location, count, transpose, value ); } - void BlitFramebuffer( GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter ) + void BlitFramebuffer( GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter ) override { mImpl->BlitFramebuffer( srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter ); } - void RenderbufferStorageMultisample( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height ) + void RenderbufferStorageMultisample( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height ) override { mImpl->RenderbufferStorageMultisample( target, samples, internalformat, width, height ); } - void FramebufferTextureLayer( GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer ) + void FramebufferTextureLayer( GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer ) override { mImpl->FramebufferTextureLayer( target, attachment, texture, level, layer ); } - GLvoid* MapBufferRange( GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access ) + GLvoid* MapBufferRange( GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access ) override { return mImpl->MapBufferRange( target, offset, length, access ); } - void FlushMappedBufferRange( GLenum target, GLintptr offset, GLsizeiptr length ) + void FlushMappedBufferRange( GLenum target, GLintptr offset, GLsizeiptr length ) override { mImpl->FlushMappedBufferRange( target, offset, length ); } - void BindVertexArray( GLuint array ) + void BindVertexArray( GLuint array ) override { mImpl->BindVertexArray( array ); } - void DeleteVertexArrays( GLsizei n, const GLuint* arrays ) + void DeleteVertexArrays( GLsizei n, const GLuint* arrays ) override { mImpl->DeleteVertexArrays( n, arrays ); } - void GenVertexArrays( GLsizei n, GLuint* arrays ) + void GenVertexArrays( GLsizei n, GLuint* arrays ) override { mImpl->GenVertexArrays( n, arrays ); } - GLboolean IsVertexArray( GLuint array ) + GLboolean IsVertexArray( GLuint array ) override { return mImpl->IsVertexArray( array ); } - void GetIntegeri_v( GLenum target, GLuint index, GLint* data ) + void GetIntegeri_v( GLenum target, GLuint index, GLint* data ) override { mImpl->GetIntegeri_v( target, index, data ); } - void BeginTransformFeedback( GLenum primitiveMode ) + void BeginTransformFeedback( GLenum primitiveMode ) override { mImpl->BeginTransformFeedback( primitiveMode ); } - void EndTransformFeedback( void ) + void EndTransformFeedback( void ) override { mImpl->EndTransformFeedback(); } - void BindBufferRange( GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size ) + void BindBufferRange( GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size ) override { mImpl->BindBufferRange( target, index, buffer, offset, size ); } - void BindBufferBase( GLenum target, GLuint index, GLuint buffer ) + void BindBufferBase( GLenum target, GLuint index, GLuint buffer ) override { mImpl->BindBufferBase( target, index, buffer ); } - void TransformFeedbackVaryings( GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode ) + void TransformFeedbackVaryings( GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode ) override { mImpl->TransformFeedbackVaryings( program, count, varyings, bufferMode ); } - void GetTransformFeedbackVarying( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name ) + void GetTransformFeedbackVarying( GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name ) override { mImpl->GetTransformFeedbackVarying( program, index, bufSize, length, size, type, name ); } - void VertexAttribIPointer( GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer ) + void VertexAttribIPointer( GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer ) override { mImpl->VertexAttribIPointer( index, size, type, stride, pointer ); } - void GetVertexAttribIiv( GLuint index, GLenum pname, GLint* params ) + void GetVertexAttribIiv( GLuint index, GLenum pname, GLint* params ) override { mImpl->GetVertexAttribIiv( index, pname, params ); } - void GetVertexAttribIuiv( GLuint index, GLenum pname, GLuint* params ) + void GetVertexAttribIuiv( GLuint index, GLenum pname, GLuint* params ) override { mImpl->GetVertexAttribIuiv( index, pname, params ); } - void VertexAttribI4i( GLuint index, GLint x, GLint y, GLint z, GLint w ) + void VertexAttribI4i( GLuint index, GLint x, GLint y, GLint z, GLint w ) override { mImpl->VertexAttribI4i( index, x, y, z, w ); } - void VertexAttribI4ui( GLuint index, GLuint x, GLuint y, GLuint z, GLuint w ) + void VertexAttribI4ui( GLuint index, GLuint x, GLuint y, GLuint z, GLuint w ) override { mImpl->VertexAttribI4ui( index, x, y, z, w ); } - void VertexAttribI4iv( GLuint index, const GLint* v ) + void VertexAttribI4iv( GLuint index, const GLint* v ) override { mImpl->VertexAttribI4iv( index, v ); } - void VertexAttribI4uiv( GLuint index, const GLuint* v ) + void VertexAttribI4uiv( GLuint index, const GLuint* v ) override { mImpl->VertexAttribI4uiv( index, v ); } - void GetUniformuiv( GLuint program, GLint location, GLuint* params ) + void GetUniformuiv( GLuint program, GLint location, GLuint* params ) override { mImpl->GetUniformuiv( program, location, params ); } - GLint GetFragDataLocation( GLuint program, const GLchar *name ) + GLint GetFragDataLocation( GLuint program, const GLchar *name ) override { return mImpl->GetFragDataLocation( program, name ); } - void Uniform1ui( GLint location, GLuint v0 ) + void Uniform1ui( GLint location, GLuint v0 ) override { mImpl->Uniform1ui( location, v0 ); } - void Uniform2ui( GLint location, GLuint v0, GLuint v1 ) + void Uniform2ui( GLint location, GLuint v0, GLuint v1 ) override { mImpl->Uniform2ui( location, v0, v1 ); } - void Uniform3ui( GLint location, GLuint v0, GLuint v1, GLuint v2 ) + void Uniform3ui( GLint location, GLuint v0, GLuint v1, GLuint v2 ) override { mImpl->Uniform3ui( location, v0, v1, v2 ); } - void Uniform4ui( GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3 ) + void Uniform4ui( GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3 ) override { mImpl->Uniform4ui( location, v0, v1, v2, v3 ); } - void Uniform1uiv( GLint location, GLsizei count, const GLuint* value ) + void Uniform1uiv( GLint location, GLsizei count, const GLuint* value ) override { mImpl->Uniform1uiv( location, count, value ); } - void Uniform2uiv( GLint location, GLsizei count, const GLuint* value ) + void Uniform2uiv( GLint location, GLsizei count, const GLuint* value ) override { mImpl->Uniform2uiv( location, count, value ); } - void Uniform3uiv( GLint location, GLsizei count, const GLuint* value ) + void Uniform3uiv( GLint location, GLsizei count, const GLuint* value ) override { mImpl->Uniform3uiv( location, count, value ); } - void Uniform4uiv( GLint location, GLsizei count, const GLuint* value ) + void Uniform4uiv( GLint location, GLsizei count, const GLuint* value ) override { mImpl->Uniform4uiv( location, count, value ); } - void ClearBufferiv( GLenum buffer, GLint drawbuffer, const GLint* value ) + void ClearBufferiv( GLenum buffer, GLint drawbuffer, const GLint* value ) override { mImpl->ClearBufferiv( buffer, drawbuffer, value ); } - void ClearBufferuiv( GLenum buffer, GLint drawbuffer, const GLuint* value ) + void ClearBufferuiv( GLenum buffer, GLint drawbuffer, const GLuint* value ) override { mImpl->ClearBufferuiv( buffer, drawbuffer, value ); } - void ClearBufferfv( GLenum buffer, GLint drawbuffer, const GLfloat* value ) + void ClearBufferfv( GLenum buffer, GLint drawbuffer, const GLfloat* value ) override { mImpl->ClearBufferfv( buffer, drawbuffer, value ); } - void ClearBufferfi( GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil ) + void ClearBufferfi( GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil ) override { mImpl->ClearBufferfi( buffer, drawbuffer, depth, stencil ); } - const GLubyte* GetStringi( GLenum name, GLuint index ) + const GLubyte* GetStringi( GLenum name, GLuint index ) override { return mImpl->GetStringi( name, index ); } - void CopyBufferSubData( GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size ) + void CopyBufferSubData( GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size ) override { mImpl->CopyBufferSubData( readTarget, writeTarget, readOffset, writeOffset, size ); } - void GetUniformIndices( GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices ) + void GetUniformIndices( GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices ) override { mImpl->GetUniformIndices( program, uniformCount, uniformNames, uniformIndices ); } - void GetActiveUniformsiv( GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params ) + void GetActiveUniformsiv( GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params ) override { mImpl->GetActiveUniformsiv( program, uniformCount, uniformIndices, pname, params ); } - GLuint GetUniformBlockIndex( GLuint program, const GLchar* uniformBlockName ) + GLuint GetUniformBlockIndex( GLuint program, const GLchar* uniformBlockName ) override { return mImpl->GetUniformBlockIndex( program, uniformBlockName ); } - void GetActiveUniformBlockiv( GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params ) + void GetActiveUniformBlockiv( GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params ) override { mImpl->GetActiveUniformBlockiv( program, uniformBlockIndex, pname, params ); } - void GetActiveUniformBlockName( GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName ) + void GetActiveUniformBlockName( GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName ) override { mImpl->GetActiveUniformBlockName( program, uniformBlockIndex, bufSize, length, uniformBlockName ); } - void UniformBlockBinding( GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding ) + void UniformBlockBinding( GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding ) override { mImpl->UniformBlockBinding( program, uniformBlockIndex, uniformBlockBinding ); } - void DrawArraysInstanced( GLenum mode, GLint first, GLsizei count, GLsizei instanceCount ) + void DrawArraysInstanced( GLenum mode, GLint first, GLsizei count, GLsizei instanceCount ) override { mImpl->DrawArraysInstanced( mode, first, count, instanceCount ); } - void DrawElementsInstanced( GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount ) + void DrawElementsInstanced( GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount ) override { mImpl->DrawElementsInstanced( mode, count, type, indices, instanceCount ); } - GLsync FenceSync( GLenum condition, GLbitfield flags ) + GLsync FenceSync( GLenum condition, GLbitfield flags ) override { return mImpl->FenceSync( condition, flags ); } - GLboolean IsSync( GLsync sync ) + GLboolean IsSync( GLsync sync ) override { return mImpl->IsSync( sync ); } - void DeleteSync( GLsync sync ) + void DeleteSync( GLsync sync ) override { mImpl->DeleteSync( sync ); } - GLenum ClientWaitSync( GLsync sync, GLbitfield flags, GLuint64 timeout ) + GLenum ClientWaitSync( GLsync sync, GLbitfield flags, GLuint64 timeout ) override { return mImpl->ClientWaitSync( sync, flags, timeout ); } - void WaitSync( GLsync sync, GLbitfield flags, GLuint64 timeout ) + void WaitSync( GLsync sync, GLbitfield flags, GLuint64 timeout ) override { mImpl->WaitSync( sync, flags, timeout ); } - void GetInteger64v( GLenum pname, GLint64* params ) + void GetInteger64v( GLenum pname, GLint64* params ) override { mImpl->GetInteger64v( pname, params ); } - void GetSynciv( GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values ) + void GetSynciv( GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values ) override { mImpl->GetSynciv( sync, pname, bufSize, length, values ); } - void GetInteger64i_v( GLenum target, GLuint index, GLint64* data ) + void GetInteger64i_v( GLenum target, GLuint index, GLint64* data ) override { mImpl->GetInteger64i_v( target, index, data ); } - void GetBufferParameteri64v( GLenum target, GLenum pname, GLint64* params ) + void GetBufferParameteri64v( GLenum target, GLenum pname, GLint64* params ) override { mImpl->GetBufferParameteri64v( target, pname, params ); } - void GenSamplers( GLsizei count, GLuint* samplers ) + void GenSamplers( GLsizei count, GLuint* samplers ) override { mImpl->GenSamplers( count, samplers ); } - void DeleteSamplers( GLsizei count, const GLuint* samplers ) + void DeleteSamplers( GLsizei count, const GLuint* samplers ) override { mImpl->DeleteSamplers( count, samplers ); } - GLboolean IsSampler( GLuint sampler ) + GLboolean IsSampler( GLuint sampler ) override { return mImpl->IsSampler( sampler ); } - void BindSampler( GLuint unit, GLuint sampler ) + void BindSampler( GLuint unit, GLuint sampler ) override { mImpl->BindSampler( unit, sampler ); } - void SamplerParameteri( GLuint sampler, GLenum pname, GLint param ) + void SamplerParameteri( GLuint sampler, GLenum pname, GLint param ) override { mImpl->SamplerParameteri( sampler, pname, param ); } - void SamplerParameteriv( GLuint sampler, GLenum pname, const GLint* param ) + void SamplerParameteriv( GLuint sampler, GLenum pname, const GLint* param ) override { mImpl->SamplerParameteriv( sampler, pname, param ); } - void SamplerParameterf( GLuint sampler, GLenum pname, GLfloat param ) + void SamplerParameterf( GLuint sampler, GLenum pname, GLfloat param ) override { mImpl->SamplerParameterf( sampler, pname, param ); } - void SamplerParameterfv( GLuint sampler, GLenum pname, const GLfloat* param ) + void SamplerParameterfv( GLuint sampler, GLenum pname, const GLfloat* param ) override { mImpl->SamplerParameterfv( sampler, pname, param ); } - void GetSamplerParameteriv( GLuint sampler, GLenum pname, GLint* params ) + void GetSamplerParameteriv( GLuint sampler, GLenum pname, GLint* params ) override { mImpl->GetSamplerParameteriv( sampler, pname, params ); } - void GetSamplerParameterfv( GLuint sampler, GLenum pname, GLfloat* params ) + void GetSamplerParameterfv( GLuint sampler, GLenum pname, GLfloat* params ) override { mImpl->GetSamplerParameterfv( sampler, pname, params ); } - void VertexAttribDivisor( GLuint index, GLuint divisor ) + void VertexAttribDivisor( GLuint index, GLuint divisor ) override { mImpl->VertexAttribDivisor( index, divisor ); } - void BindTransformFeedback( GLenum target, GLuint id ) + void BindTransformFeedback( GLenum target, GLuint id ) override { mImpl->BindTransformFeedback( target, id ); } - void DeleteTransformFeedbacks( GLsizei n, const GLuint* ids ) + void DeleteTransformFeedbacks( GLsizei n, const GLuint* ids ) override { mImpl->DeleteTransformFeedbacks( n, ids ); } - void GenTransformFeedbacks( GLsizei n, GLuint* ids ) + void GenTransformFeedbacks( GLsizei n, GLuint* ids ) override { mImpl->GenTransformFeedbacks( n, ids ); } - GLboolean IsTransformFeedback( GLuint id ) + GLboolean IsTransformFeedback( GLuint id ) override { return mImpl->IsTransformFeedback( id ); } - void PauseTransformFeedback( void ) + void PauseTransformFeedback( void ) override { mImpl->PauseTransformFeedback(); } - void ResumeTransformFeedback( void ) + void ResumeTransformFeedback( void ) override { mImpl->ResumeTransformFeedback(); } - void GetProgramBinary( GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary ) + void GetProgramBinary( GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary ) override { mImpl->GetProgramBinary( program, bufSize, length, binaryFormat, binary ); } - void ProgramBinary( GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length ) + void ProgramBinary( GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length ) override { mImpl->ProgramBinary( program, binaryFormat, binary, length ); } - void ProgramParameteri( GLuint program, GLenum pname, GLint value ) + void ProgramParameteri( GLuint program, GLenum pname, GLint value ) override { mImpl->ProgramParameteri( program, pname, value ); } - void InvalidateFramebuffer( GLenum target, GLsizei numAttachments, const GLenum* attachments ) + void InvalidateFramebuffer( GLenum target, GLsizei numAttachments, const GLenum* attachments ) override { mImpl->InvalidateFramebuffer( target, numAttachments, attachments ); } - void InvalidateSubFramebuffer( GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height ) + void InvalidateSubFramebuffer( GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height ) override { mImpl->InvalidateSubFramebuffer( target, numAttachments, attachments, x, y, width, height ); } - void TexStorage2D( GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height ) + void TexStorage2D( GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height ) override { mImpl->TexStorage2D( target, levels, internalformat, width, height ); } - void TexStorage3D( GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth ) + void TexStorage3D( GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth ) override { mImpl->TexStorage3D( target, levels, internalformat, width, height, depth ); } - void GetInternalformativ( GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params ) + void GetInternalformativ( GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params ) override { mImpl->GetInternalformativ( target, internalformat, pname, bufSize, params ); } diff --git a/dali/internal/graphics/gles/gl-proxy-implementation.h b/dali/internal/graphics/gles/gl-proxy-implementation.h index 638dcaa..626a797 100644 --- a/dali/internal/graphics/gles/gl-proxy-implementation.h +++ b/dali/internal/graphics/gles/gl-proxy-implementation.h @@ -160,51 +160,51 @@ public: /** * @copydoc GlAbstraction::PreRender(); */ - virtual void PreRender(); + void PreRender() override; /** * @copydoc GlAbstraction::PostRender(); */ - virtual void PostRender(); + void PostRender() override; /* OpenGL ES 2.0 API */ - virtual void Clear( GLbitfield mask ); - - virtual void GenBuffers( GLsizei n, GLuint* buffers ); - virtual void DeleteBuffers( GLsizei n, const GLuint* buffers ); - virtual void BindBuffer( GLenum target, GLuint buffer ); - - virtual void GenTextures( GLsizei n, GLuint* textures ); - virtual void DeleteTextures( GLsizei n, const GLuint* textures ); - virtual void ActiveTexture( GLenum texture ); - virtual void BindTexture( GLenum target, GLuint texture ); - - virtual void DrawArrays( GLenum mode, GLint first, GLsizei count ); - virtual void DrawElements( GLenum mode, GLsizei count, GLenum type, const void* indices ); - - virtual void Uniform1f ( GLint location, GLfloat x ); - virtual void Uniform1fv( GLint location, GLsizei count, const GLfloat* v ); - virtual void Uniform1i ( GLint location, GLint x ); - virtual void Uniform1iv( GLint location, GLsizei count, const GLint* v ); - virtual void Uniform2f ( GLint location, GLfloat x, GLfloat y ); - virtual void Uniform2fv( GLint location, GLsizei count, const GLfloat* v ); - virtual void Uniform2i ( GLint location, GLint x, GLint y ); - virtual void Uniform2iv( GLint location, GLsizei count, const GLint* v ); - virtual void Uniform3f ( GLint location, GLfloat x, GLfloat y, GLfloat z ); - virtual void Uniform3fv( GLint location, GLsizei count, const GLfloat* v ); - virtual void Uniform3i ( GLint location, GLint x, GLint y, GLint z ); - virtual void Uniform3iv( GLint location, GLsizei count, const GLint* v ); - virtual void Uniform4f ( GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w ); - virtual void Uniform4fv( GLint location, GLsizei count, const GLfloat* v ); - virtual void Uniform4i ( GLint location, GLint x, GLint y, GLint z, GLint w ); - virtual void Uniform4iv( GLint location, GLsizei count, const GLint* v ); - virtual void UniformMatrix2fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ); - virtual void UniformMatrix3fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ); - virtual void UniformMatrix4fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ); - - virtual GLuint CreateProgram( void ); - virtual void DeleteProgram( GLuint program ); - virtual void UseProgram( GLuint program ); + void Clear( GLbitfield mask ) override; + + void GenBuffers( GLsizei n, GLuint* buffers ) override; + void DeleteBuffers( GLsizei n, const GLuint* buffers ) override; + void BindBuffer( GLenum target, GLuint buffer ) override; + + void GenTextures( GLsizei n, GLuint* textures ) override; + void DeleteTextures( GLsizei n, const GLuint* textures ) override; + void ActiveTexture( GLenum texture ) override; + void BindTexture( GLenum target, GLuint texture ) override; + + void DrawArrays( GLenum mode, GLint first, GLsizei count ) override; + void DrawElements( GLenum mode, GLsizei count, GLenum type, const void* indices ) override; + + void Uniform1f ( GLint location, GLfloat x ) override; + void Uniform1fv( GLint location, GLsizei count, const GLfloat* v ) override; + void Uniform1i ( GLint location, GLint x ) override; + void Uniform1iv( GLint location, GLsizei count, const GLint* v ) override; + void Uniform2f ( GLint location, GLfloat x, GLfloat y ) override; + void Uniform2fv( GLint location, GLsizei count, const GLfloat* v ) override; + void Uniform2i ( GLint location, GLint x, GLint y ) override; + void Uniform2iv( GLint location, GLsizei count, const GLint* v ) override; + void Uniform3f ( GLint location, GLfloat x, GLfloat y, GLfloat z ) override; + void Uniform3fv( GLint location, GLsizei count, const GLfloat* v ) override; + void Uniform3i ( GLint location, GLint x, GLint y, GLint z ) override; + void Uniform3iv( GLint location, GLsizei count, const GLint* v ) override; + void Uniform4f ( GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) override; + void Uniform4fv( GLint location, GLsizei count, const GLfloat* v ) override; + void Uniform4i ( GLint location, GLint x, GLint y, GLint z, GLint w ) override; + void Uniform4iv( GLint location, GLsizei count, const GLint* v ) override; + void UniformMatrix2fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override; + void UniformMatrix3fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override; + void UniformMatrix4fv( GLint location, GLsizei count, GLboolean transpose, const GLfloat* value ) override; + + GLuint CreateProgram( void ) override; + void DeleteProgram( GLuint program ) override; + void UseProgram( GLuint program ) override; private: // Helpers diff --git a/dali/internal/haptics/common/feedback-player-impl.h b/dali/internal/haptics/common/feedback-player-impl.h index 1355e31..856f6ef 100644 --- a/dali/internal/haptics/common/feedback-player-impl.h +++ b/dali/internal/haptics/common/feedback-player-impl.h @@ -103,7 +103,7 @@ private: /** * Virtual Destructor */ - virtual ~FeedbackPlayer(); + ~FeedbackPlayer() override; // Undefined FeedbackPlayer(const FeedbackPlayer&); diff --git a/dali/internal/imaging/common/animated-image-loading-impl.h b/dali/internal/imaging/common/animated-image-loading-impl.h index 87f8c18..5d5d8af 100644 --- a/dali/internal/imaging/common/animated-image-loading-impl.h +++ b/dali/internal/imaging/common/animated-image-loading-impl.h @@ -66,7 +66,7 @@ public: /** * @brief Destructor */ - virtual ~AnimatedImageLoading() = default; + ~AnimatedImageLoading() override = default; /** * @copydoc Dali::AnimatedImageLoading::LoadNextNFrames() diff --git a/dali/internal/imaging/common/pixel-buffer-impl.h b/dali/internal/imaging/common/pixel-buffer-impl.h index b0a0bdc..5513f8b 100755 --- a/dali/internal/imaging/common/pixel-buffer-impl.h +++ b/dali/internal/imaging/common/pixel-buffer-impl.h @@ -104,7 +104,7 @@ protected: * * Release the pixel buffer if exists. */ - ~PixelBuffer(); + ~PixelBuffer() override; public: diff --git a/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h b/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h index 62b7410..c905912 100755 --- a/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h +++ b/dali/internal/imaging/ubuntu-x11/native-image-source-impl-x.h @@ -130,27 +130,27 @@ public: /** * @copydoc Dali::NativeImageSource::GetTextureTarget() */ - virtual int GetTextureTarget() const; + int GetTextureTarget() const override; /** * @copydoc Dali::NativeImageSource::GetCustomFragmentPrefix() */ - virtual const char* GetCustomFragmentPrefix() const; + const char* GetCustomFragmentPrefix() const override; /** * @copydoc Dali::NativeImageSource::GetCustomSamplerTypename() */ - virtual const char* GetCustomSamplerTypename() const; + const char* GetCustomSamplerTypename() const override; /** * @copydoc Dali::NativeImageSource::GetNativeImageHandle() */ - virtual Any GetNativeImageHandle() const; + Any GetNativeImageHandle() const override; /** * @copydoc Dali::NativeImageSource::SourceChanged() */ - virtual bool SourceChanged() const; + bool SourceChanged() const override; /** diff --git a/dali/internal/input/common/physical-keyboard-impl.h b/dali/internal/input/common/physical-keyboard-impl.h index 7bf323b..4aa6181 100644 --- a/dali/internal/input/common/physical-keyboard-impl.h +++ b/dali/internal/input/common/physical-keyboard-impl.h @@ -71,7 +71,7 @@ protected: /** * A reference counted object may only be deleted by calling Unreference() */ - virtual ~PhysicalKeyboard(); + ~PhysicalKeyboard() override; private: diff --git a/dali/internal/legacy/common/tizen-platform-abstraction.h b/dali/internal/legacy/common/tizen-platform-abstraction.h index fe4b018..9f501d7 100644 --- a/dali/internal/legacy/common/tizen-platform-abstraction.h +++ b/dali/internal/legacy/common/tizen-platform-abstraction.h @@ -54,57 +54,57 @@ public: // Construction & Destruction /** * Destructor */ - virtual ~TizenPlatformAbstraction(); + ~TizenPlatformAbstraction() override; public: // PlatformAbstraction overrides /** * @copydoc PlatformAbstraction::GetClosestImageSize() */ - virtual ImageDimensions GetClosestImageSize( const std::string& filename, - ImageDimensions size, - FittingMode::Type fittingMode, - SamplingMode::Type samplingMode, - bool orientationCorrection ); + ImageDimensions GetClosestImageSize( const std::string& filename, + ImageDimensions size, + FittingMode::Type fittingMode, + SamplingMode::Type samplingMode, + bool orientationCorrection ) override; /** * @copydoc PlatformAbstraction::GetClosestImageSize() */ - virtual ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer, - ImageDimensions size, - FittingMode::Type fittingMode, - SamplingMode::Type samplingMode, - bool orientationCorrection ); + ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer, + ImageDimensions size, + FittingMode::Type fittingMode, + SamplingMode::Type samplingMode, + bool orientationCorrection ) override; /** * @copydoc PlatformAbstraction::LoadImageSynchronously() */ - virtual Integration::ResourcePointer LoadImageSynchronously(const Integration::BitmapResourceType& resource, const std::string& resourcePath); + Integration::ResourcePointer LoadImageSynchronously(const Integration::BitmapResourceType& resource, const std::string& resourcePath) override; /** * @copydoc PlatformAbstraction::DecodeBuffer() */ - virtual Integration::BitmapPtr DecodeBuffer( const Integration::BitmapResourceType& resource, uint8_t * buffer, size_t size ); + Integration::BitmapPtr DecodeBuffer( const Integration::BitmapResourceType& resource, uint8_t * buffer, size_t size ) override; /** * @copydoc PlatformAbstraction::LoadShaderBinaryFile() */ - virtual bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const; + bool LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const override; /** * @copydoc PlatformAbstraction::SaveShaderBinaryFile() */ - virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const; + bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const override; /** * @copydoc PlatformAbstraction::StartTimer() */ - virtual uint32_t StartTimer( uint32_t milliseconds, CallbackBase* callback ); + uint32_t StartTimer( uint32_t milliseconds, CallbackBase* callback ) override; /** * @copydoc PlatformAbstraction::CancelTimer() */ - virtual void CancelTimer ( uint32_t timerId ); + void CancelTimer ( uint32_t timerId ) override; /** * Sets path for data/resource storage. diff --git a/dali/internal/network/common/network-performance-server.h b/dali/internal/network/common/network-performance-server.h index 0e0d45c..301d395 100644 --- a/dali/internal/network/common/network-performance-server.h +++ b/dali/internal/network/common/network-performance-server.h @@ -107,7 +107,7 @@ protected: // ClientSendDataInterface /** * @copydoc ClientSendDataInterface::ClientSendDataInterface() */ - virtual void SendData( const char* const data, unsigned int bufferSizeInBytes, unsigned int clientId ); + void SendData( const char* const data, unsigned int bufferSizeInBytes, unsigned int clientId ) override; private: diff --git a/dali/internal/network/common/socket-factory.h b/dali/internal/network/common/socket-factory.h index 2b048e6..d202ea7 100644 --- a/dali/internal/network/common/socket-factory.h +++ b/dali/internal/network/common/socket-factory.h @@ -46,19 +46,19 @@ public: /** * @brief destructor */ - virtual ~SocketFactory() + ~SocketFactory() override { } /** * @copydoc SocketFactoryInterface::NewSocket() */ - virtual SocketInterface* NewSocket( SocketInterface::Protocol protocol ); + SocketInterface* NewSocket( SocketInterface::Protocol protocol ) override; /** * @copydoc SocketFactoryInterface::DestroySocket() */ - virtual void DestroySocket( SocketInterface* socket ); + void DestroySocket( SocketInterface* socket ) override; }; diff --git a/dali/internal/network/common/socket-impl.h b/dali/internal/network/common/socket-impl.h index 21c8780..be017e9 100644 --- a/dali/internal/network/common/socket-impl.h +++ b/dali/internal/network/common/socket-impl.h @@ -48,58 +48,58 @@ public: /** * @copydoc Dali::Internal::Adaptor::SocketIsOpen() */ - virtual bool SocketIsOpen() const; + bool SocketIsOpen() const override; /** * @copydoc Dali::Internal::Adaptor::SocketInterface::CloseSocket */ - virtual bool CloseSocket(); + bool CloseSocket() override; /** * @copydoc Dali::Internal::Adaptor::SocketInterface::Bind */ - virtual bool Bind( uint16_t port ) ; + bool Bind( uint16_t port ) override; /** * @copydoc Dali::Internal::Adaptor::SocketInterface::Listen */ - virtual bool Listen( int blacklog); + bool Listen( int blacklog) override; /** * @copydoc Dali::Internal::Adaptor::SocketInterface::Accept */ - virtual SocketInterface* Accept() const ; + SocketInterface* Accept() const override; /** * @copydoc Dali::Internal::Adaptor::SocketInterface::Select */ - virtual SelectReturn Select( ); + SelectReturn Select( ) override; /** * @copydoc Dali::Internal::Adaptor::SocketInterface::ExitSelect */ - virtual void ExitSelect(); + void ExitSelect() override; /** * @copydoc Dali::Internal::Adaptor::SocketInterface::Recieve */ - virtual bool Read( void* buffer, unsigned int bufferSizeInBytes, unsigned int& bytesRead ); + bool Read( void* buffer, unsigned int bufferSizeInBytes, unsigned int& bytesRead ) override; /** * @copydoc Dali::Internal::Adaptor::SocketInterface::Send */ - virtual bool Write( const void* buffer, unsigned int bufferLength ); + bool Write( const void* buffer, unsigned int bufferLength ) override; /** * @copydoc Dali::Internal::Adaptor::SocketInterface::ReuseAddress */ - virtual bool ReuseAddress( bool reUse ); + bool ReuseAddress( bool reUse ) override; /** * @copydoc Dali::Internal::Adaptor::SocketInterface::SetBufferSize * */ - virtual bool SetBufferSize( SocketInterface::BufferType type, unsigned int bufferSizeInBytes ); + bool SetBufferSize( SocketInterface::BufferType type, unsigned int bufferSizeInBytes ) override; /** * @brief Virtual destructor diff --git a/dali/internal/styling/common/style-monitor-impl.h b/dali/internal/styling/common/style-monitor-impl.h index 638863d..2528def 100644 --- a/dali/internal/styling/common/style-monitor-impl.h +++ b/dali/internal/styling/common/style-monitor-impl.h @@ -108,7 +108,7 @@ protected: /** * Virtual Destructor. */ - virtual ~StyleMonitor(); + ~StyleMonitor() override; private: diff --git a/dali/internal/system/android/callback-manager-android.h b/dali/internal/system/android/callback-manager-android.h index 71017c5..5e153a8 100644 --- a/dali/internal/system/android/callback-manager-android.h +++ b/dali/internal/system/android/callback-manager-android.h @@ -57,42 +57,42 @@ public: /** * @copydoc CallbackManager::AddIdleCallback() */ - virtual bool AddIdleCallback( CallbackBase* callback, bool hasReturnValue ); + bool AddIdleCallback( CallbackBase* callback, bool hasReturnValue ) override; /** * @copydoc CallbackManager::RemoveIdleCallback() */ - virtual void RemoveIdleCallback( CallbackBase* callback ); + void RemoveIdleCallback( CallbackBase* callback ) override; /** * @copydoc CallbackManager::ProcessIdle() */ - virtual bool ProcessIdle(); + bool ProcessIdle() override; /** * @copydoc CallbackManager::ProcessIdle() */ - virtual void ClearIdleCallbacks(); + void ClearIdleCallbacks() override; /** * @copydoc CallbackManager::AddIdleEntererCallback() */ - virtual bool AddIdleEntererCallback( CallbackBase* callback ); + bool AddIdleEntererCallback( CallbackBase* callback ) override; /** * @copydoc CallbackManager::RemoveIdleEntererCallback() */ - virtual void RemoveIdleEntererCallback( CallbackBase* callback ); + void RemoveIdleEntererCallback( CallbackBase* callback ) override; /** * @copydoc CallbackManager::Start() */ - virtual void Start(); + void Start() override; /** * @copydoc CallbackManager::Stop() */ - virtual void Stop(); + void Stop() override; private: diff --git a/dali/internal/system/common/color-controller-impl.h b/dali/internal/system/common/color-controller-impl.h index 58de395..0efca0a 100644 --- a/dali/internal/system/common/color-controller-impl.h +++ b/dali/internal/system/common/color-controller-impl.h @@ -72,7 +72,7 @@ protected: /** * @brief Destructor. */ - virtual ~ColorController(); + ~ColorController() override; private: diff --git a/dali/internal/system/common/environment-options.h b/dali/internal/system/common/environment-options.h index 4d4b458..547adfa 100644 --- a/dali/internal/system/common/environment-options.h +++ b/dali/internal/system/common/environment-options.h @@ -73,7 +73,7 @@ public: /** * Install the log function for the current thread. */ - virtual void InstallLogFunction() const; + void InstallLogFunction() const override; /** * Un-install the log function for the current thread. diff --git a/dali/internal/system/common/kernel-trace.h b/dali/internal/system/common/kernel-trace.h index 07c017d..644c6f9 100644 --- a/dali/internal/system/common/kernel-trace.h +++ b/dali/internal/system/common/kernel-trace.h @@ -46,12 +46,12 @@ public: /** * Destructor */ - virtual ~KernelTrace(); + ~KernelTrace() override; /** * @copydoc KernelTracerInterface::KernelTrace() */ - virtual void Trace( const PerformanceMarker& marker, const std::string& traceMessage ); + void Trace( const PerformanceMarker& marker, const std::string& traceMessage ) override; private: diff --git a/dali/internal/system/common/performance-logger-impl.h b/dali/internal/system/common/performance-logger-impl.h index 461a3b1..cd7498f 100644 --- a/dali/internal/system/common/performance-logger-impl.h +++ b/dali/internal/system/common/performance-logger-impl.h @@ -62,7 +62,7 @@ public: /** * Destructor. */ - virtual ~PerformanceLogger(); + ~PerformanceLogger() override; /** * Add a performance marker diff --git a/dali/internal/system/common/performance-server.h b/dali/internal/system/common/performance-server.h index 1362f9b..74b1c0d 100644 --- a/dali/internal/system/common/performance-server.h +++ b/dali/internal/system/common/performance-server.h @@ -65,22 +65,22 @@ public: /** * @copydoc PerformanceLogger::AddContext() */ - virtual ContextId AddContext( const char* name ); + ContextId AddContext( const char* name ) override; /** * @copydoc PerformanceLogger::RemoveContext() */ - virtual void RemoveContext( ContextId contextId ); + void RemoveContext( ContextId contextId ) override; /** * @copydoc PerformanceInterface::AddMarker( MarkerType markerType ) */ - virtual void AddMarker( MarkerType markerType ); + void AddMarker( MarkerType markerType ) override; /** * @copydoc PerformanceLogger::AddMarker( MarkerType markerType, ContextId contextId ) */ - virtual void AddMarker( MarkerType markerType, ContextId contextId ); + void AddMarker( MarkerType markerType, ContextId contextId ) override; /** * @copydoc PerformanceInterface::SetLogging() @@ -92,19 +92,19 @@ public: /** * @copydoc PerformanceLogger::SetLoggingFrequency() */ - virtual void SetLoggingFrequency( unsigned int logFrequency, ContextId contextId ); + void SetLoggingFrequency( unsigned int logFrequency, ContextId contextId ) override; /** * @copydoc PerformanceLogger::EnableLogging() */ - virtual void EnableLogging( bool enable, ContextId contextId ); + void EnableLogging( bool enable, ContextId contextId ) override; public: //StatLogInterface /** * @copydoc StatLogInterface::LogContextStatistics() */ - virtual void LogContextStatistics( const char* const text ); + void LogContextStatistics( const char* const text ) override; private: diff --git a/dali/internal/system/common/sound-player-impl.h b/dali/internal/system/common/sound-player-impl.h index 514d4f0..a68b260 100644 --- a/dali/internal/system/common/sound-player-impl.h +++ b/dali/internal/system/common/sound-player-impl.h @@ -94,7 +94,7 @@ private: /** * Destructor */ - virtual ~SoundPlayer(); + ~SoundPlayer() override; /** * Emits the SoundPlayFinished signal. diff --git a/dali/internal/system/common/system-trace.h b/dali/internal/system/common/system-trace.h index 7802f17..17014ee 100644 --- a/dali/internal/system/common/system-trace.h +++ b/dali/internal/system/common/system-trace.h @@ -46,12 +46,12 @@ public: /** * Destructor */ - virtual ~SystemTrace(); + ~SystemTrace() override; /** * @copydoc KernelTracerInterface::KernelTrace() */ - virtual void Trace( const PerformanceMarker& marker, const std::string& traceMessage ); + void Trace( const PerformanceMarker& marker, const std::string& traceMessage ) override; }; diff --git a/dali/internal/system/common/timer-impl.h b/dali/internal/system/common/timer-impl.h index 4f1b1c6..f631585 100644 --- a/dali/internal/system/common/timer-impl.h +++ b/dali/internal/system/common/timer-impl.h @@ -62,37 +62,37 @@ public: /** * @copydoc Dali::Timer::Start() */ - virtual void Start(); + void Start() override; /** * @copydoc Dali::Timer::Stop() */ - virtual void Stop(); + void Stop() override; /** * @copydoc Dali::Timer::Pause() */ - virtual void Pause(); + void Pause() override; /** * @copydoc Dali::Timer::Resume() */ - virtual void Resume(); + void Resume() override; /** * @copydoc Dali::Timer::SetInterval() */ - virtual void SetInterval( unsigned int interval, bool restart ); + void SetInterval( unsigned int interval, bool restart ) override; /** * @copydoc Dali::Timer::GetInterval() */ - virtual unsigned int GetInterval() const; + unsigned int GetInterval() const override; /** * @copydoc Dali::Timer::IsRunning() */ - virtual bool IsRunning() const; + bool IsRunning() const override; /** * Tick diff --git a/dali/internal/system/linux/callback-manager-ecore.h b/dali/internal/system/linux/callback-manager-ecore.h index f5fe7e3..2e4b90b 100644 --- a/dali/internal/system/linux/callback-manager-ecore.h +++ b/dali/internal/system/linux/callback-manager-ecore.h @@ -59,42 +59,42 @@ public: /** * @copydoc CallbackManager::AddIdleCallback() */ - virtual bool AddIdleCallback( CallbackBase* callback, bool hasReturnValue ); + bool AddIdleCallback( CallbackBase* callback, bool hasReturnValue ) override; /** * @copydoc CallbackManager::RemoveIdleCallback() */ - virtual void RemoveIdleCallback( CallbackBase* callback ); + void RemoveIdleCallback( CallbackBase* callback ) override; /** * @copydoc CallbackManager::ProcessIdle() */ - virtual bool ProcessIdle(); + bool ProcessIdle() override; /** * @copydoc CallbackManager::ProcessIdle() */ - virtual void ClearIdleCallbacks(); + void ClearIdleCallbacks() override; /** * @copydoc CallbackManager::AddIdleEntererCallback() */ - virtual bool AddIdleEntererCallback( CallbackBase* callback ); + bool AddIdleEntererCallback( CallbackBase* callback ) override; /** * @copydoc CallbackManager::RemoveIdleEntererCallback() */ - virtual void RemoveIdleEntererCallback( CallbackBase* callback ); + void RemoveIdleEntererCallback( CallbackBase* callback ) override; /** * @copydoc CallbackManager::Start() */ - virtual void Start(); + void Start() override; /** * @copydoc CallbackManager::Stop() */ - virtual void Stop(); + void Stop() override; private: diff --git a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.h b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.h index b7b12a8..cab11aa 100644 --- a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.h +++ b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.h @@ -61,7 +61,7 @@ public: /** * @copydoc Dali::Internal::Adaptor::Application::OnInit() */ - virtual void OnInit(); + void OnInit() override; /** * @copydoc Dali::WidgetApplication::RegisterWidgetCreator() diff --git a/dali/internal/system/windows/callback-manager-win.h b/dali/internal/system/windows/callback-manager-win.h index ef85501..eed550f 100755 --- a/dali/internal/system/windows/callback-manager-win.h +++ b/dali/internal/system/windows/callback-manager-win.h @@ -54,22 +54,22 @@ public: /** * @copydoc CallbackManager::AddIdleCallback() */ - virtual bool AddIdleCallback( CallbackBase* callback, bool hasReturnValue ); + bool AddIdleCallback( CallbackBase* callback, bool hasReturnValue ) override; /** * @copydoc CallbackManager::RemoveIdleCallback() */ - virtual void RemoveIdleCallback( CallbackBase* callback ); + void RemoveIdleCallback( CallbackBase* callback ) override; /** * @copydoc CallbackManager::ProcessIdle() */ - virtual bool ProcessIdle(); + bool ProcessIdle() override; /** * @copydoc CallbackManager::ClearIdleCallbacks() */ - virtual void ClearIdleCallbacks(); + void ClearIdleCallbacks() override; /** * @brief Adds a @p callback to be run when entering an idle state. @@ -85,7 +85,7 @@ public: * * @return true on success */ - virtual bool AddIdleEntererCallback( CallbackBase* callback ); + bool AddIdleEntererCallback( CallbackBase* callback ) override; /** * @brief Removes a previously added the idle enterer callback. @@ -95,17 +95,17 @@ public: * * @param[in] callback The callback to be removed. */ - virtual void RemoveIdleEntererCallback( CallbackBase* callback ); + void RemoveIdleEntererCallback( CallbackBase* callback ) override; /** * @copydoc CallbackManager::Start() */ - virtual void Start(); + void Start() override; /** * @copydoc CallbackManager::Stop() */ - virtual void Stop(); + void Stop() override; private: std::set mCallbacks; diff --git a/dali/internal/trace/android/trace-manager-impl-android.h b/dali/internal/trace/android/trace-manager-impl-android.h index 419bf4a..1107d4e 100644 --- a/dali/internal/trace/android/trace-manager-impl-android.h +++ b/dali/internal/trace/android/trace-manager-impl-android.h @@ -56,7 +56,7 @@ protected: /** * Obtain the LogContextFunction method (Android specific) used for tracing */ - virtual Dali::Integration::Trace::LogContextFunction GetLogContextFunction() final; + Dali::Integration::Trace::LogContextFunction GetLogContextFunction() final; private: diff --git a/dali/internal/trace/common/trace-manager-impl.h b/dali/internal/trace/common/trace-manager-impl.h index 7bbb6cc..c5da7f0 100644 --- a/dali/internal/trace/common/trace-manager-impl.h +++ b/dali/internal/trace/common/trace-manager-impl.h @@ -68,7 +68,7 @@ protected: /** * Obtain the platform dependent LogContextFunction method used for tracing */ - virtual Dali::Integration::Trace::LogContextFunction GetLogContextFunction() { return nullptr; }; + Dali::Integration::Trace::LogContextFunction GetLogContextFunction() { return nullptr; }; private: diff --git a/dali/internal/trace/generic/trace-manager-impl-generic.h b/dali/internal/trace/generic/trace-manager-impl-generic.h index be99e8e..d7ff58f 100644 --- a/dali/internal/trace/generic/trace-manager-impl-generic.h +++ b/dali/internal/trace/generic/trace-manager-impl-generic.h @@ -56,7 +56,7 @@ protected: /** * Obtain the LogContextFunction method (Generic specific) used for tracing */ - virtual Dali::Integration::Trace::LogContextFunction GetLogContextFunction() final; + Dali::Integration::Trace::LogContextFunction GetLogContextFunction() final; private: diff --git a/dali/internal/trace/tizen/trace-manager-impl-tizen.h b/dali/internal/trace/tizen/trace-manager-impl-tizen.h index 58432cc..c596bcc 100644 --- a/dali/internal/trace/tizen/trace-manager-impl-tizen.h +++ b/dali/internal/trace/tizen/trace-manager-impl-tizen.h @@ -51,7 +51,7 @@ protected: /** * Obtain the LogContextFunction method (Tizen specific) used for tracing */ - virtual Dali::Integration::Trace::LogContextFunction GetLogContextFunction() final; + Dali::Integration::Trace::LogContextFunction GetLogContextFunction() final; private: diff --git a/dali/internal/window-system/android/window-base-android.h b/dali/internal/window-system/android/window-base-android.h index e970b7a..d5cf325 100644 --- a/dali/internal/window-system/android/window-base-android.h +++ b/dali/internal/window-system/android/window-base-android.h @@ -120,247 +120,247 @@ public: /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindow() */ - virtual Any GetNativeWindow() override; + Any GetNativeWindow() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindowId() */ - virtual int GetNativeWindowId() override; + int GetNativeWindowId() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow() */ - virtual EGLNativeWindowType CreateEglWindow( int width, int height ) override; + EGLNativeWindowType CreateEglWindow( int width, int height ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::DestroyEglWindow() */ - virtual void DestroyEglWindow() override; + void DestroyEglWindow() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowRotation() */ - virtual void SetEglWindowRotation( int angle ) override; + void SetEglWindowRotation( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowBufferTransform() */ - virtual void SetEglWindowBufferTransform( int angle ) override; + void SetEglWindowBufferTransform( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowTransform() */ - virtual void SetEglWindowTransform( int angle ) override; + void SetEglWindowTransform( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::ResizeEglWindow() */ - virtual void ResizeEglWindow( PositionSize positionSize ) override; + void ResizeEglWindow( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::IsEglWindowRotationSupported() */ - virtual bool IsEglWindowRotationSupported() override; + bool IsEglWindowRotationSupported() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Move() */ - virtual void Move( PositionSize positionSize ) override; + void Move( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Resize() */ - virtual void Resize( PositionSize positionSize ) override; + void Resize( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::MoveResize() */ - virtual void MoveResize( PositionSize positionSize ) override; + void MoveResize( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetClass() */ - virtual void SetClass( const std::string& name, const std::string& className ) override; + void SetClass( const std::string& name, const std::string& className ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Raise() */ - virtual void Raise() override; + void Raise() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Lower() */ - virtual void Lower() override; + void Lower() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Activate() */ - virtual void Activate() override; + void Activate() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableAnlges() */ - virtual void SetAvailableAnlges( const std::vector< int >& angles ) override; + void SetAvailableAnlges( const std::vector< int >& angles ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferredAngle() */ - virtual void SetPreferredAngle( int angle ) override; + void SetPreferredAngle( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAcceptFocus() */ - virtual void SetAcceptFocus( bool accept ) override; + void SetAcceptFocus( bool accept ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Show() */ - virtual void Show() override; + void Show() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Hide() */ - virtual void Hide() override; + void Hide() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHintCount() */ - virtual unsigned int GetSupportedAuxiliaryHintCount() const override; + unsigned int GetSupportedAuxiliaryHintCount() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHint() */ - virtual std::string GetSupportedAuxiliaryHint( unsigned int index ) const override; + std::string GetSupportedAuxiliaryHint( unsigned int index ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::AddAuxiliaryHint() */ - virtual unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override; + unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::RemoveAuxiliaryHint() */ - virtual bool RemoveAuxiliaryHint( unsigned int id ) override; + bool RemoveAuxiliaryHint( unsigned int id ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAuxiliaryHintValue() */ - virtual bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override; + bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintValue() */ - virtual std::string GetAuxiliaryHintValue( unsigned int id ) const override; + std::string GetAuxiliaryHintValue( unsigned int id ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintId() */ - virtual unsigned int GetAuxiliaryHintId( const std::string& hint ) const override; + unsigned int GetAuxiliaryHintId( const std::string& hint ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetInputRegion() */ - virtual void SetInputRegion( const Rect< int >& inputRegion ) override; + void SetInputRegion( const Rect< int >& inputRegion ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetType() */ - virtual void SetType( Dali::Window::Type type ) override; + void SetType( Dali::Window::Type type ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetNotificationLevel() */ - virtual bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override; + bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNotificationLevel() */ - virtual Dali::Window::NotificationLevel::Type GetNotificationLevel() const override; + Dali::Window::NotificationLevel::Type GetNotificationLevel() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetOpaqueState() */ - virtual void SetOpaqueState( bool opaque ) override; + void SetOpaqueState( bool opaque ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetScreenOffMode() */ - virtual bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override; + bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenOffMode() */ - virtual Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override; + Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetBrightness() */ - virtual bool SetBrightness( int brightness ) override; + bool SetBrightness( int brightness ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetBrightness() */ - virtual int GetBrightness() const override; + int GetBrightness() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GrabKey() */ - virtual bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override; + bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKey() */ - virtual bool UngrabKey( Dali::KEY key ) override; + bool UngrabKey( Dali::KEY key ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GrabKeyList() */ - virtual bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override; + bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKeyList() */ - virtual bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override; + bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetDpi() */ - virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; + void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle() */ - virtual int GetScreenRotationAngle() override; + int GetScreenRotationAngle() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetWindowRotationAngle() */ - virtual void SetWindowRotationAngle( int degree ) override; + void SetWindowRotationAngle( int degree ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted() */ - virtual void WindowRotationCompleted( int degree, int width, int height ) override; + void WindowRotationCompleted( int degree, int width, int height ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetTransparency() */ - virtual void SetTransparency( bool transparent ) override; + void SetTransparency( bool transparent ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetParent() */ - virtual void SetParent( WindowBase* parentWinBase ) override; + void SetParent( WindowBase* parentWinBase ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateFrameRenderedSyncFence() */ - virtual int CreateFrameRenderedSyncFence() override; + int CreateFrameRenderedSyncFence() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateFramePresentedSyncFence() */ - virtual int CreateFramePresentedSyncFence() override; + int CreateFramePresentedSyncFence() override; private: diff --git a/dali/internal/window-system/common/event-handler.h b/dali/internal/window-system/common/event-handler.h index 2516234..71f4ca5 100755 --- a/dali/internal/window-system/common/event-handler.h +++ b/dali/internal/window-system/common/event-handler.h @@ -119,7 +119,7 @@ public: /** * Destructor. */ - ~EventHandler(); + ~EventHandler() override; /** * Called when the adaptor is paused. diff --git a/dali/internal/window-system/common/orientation-impl.h b/dali/internal/window-system/common/orientation-impl.h index 2b16f2e..28d4f98 100644 --- a/dali/internal/window-system/common/orientation-impl.h +++ b/dali/internal/window-system/common/orientation-impl.h @@ -57,7 +57,7 @@ protected: /** * Destructor */ - virtual ~Orientation(); + ~Orientation() override; public: diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h index 11ea92a..9f2b8ca 100755 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -382,7 +382,7 @@ private: /** * Destructor */ - virtual ~Window(); + ~Window() override; /** * Second stage initialization diff --git a/dali/internal/window-system/common/window-render-surface.h b/dali/internal/window-system/common/window-render-surface.h index faf8f50..395656f 100644 --- a/dali/internal/window-system/common/window-render-surface.h +++ b/dali/internal/window-system/common/window-render-surface.h @@ -122,86 +122,86 @@ public: // from Dali::RenderSurfaceInterface /** * @copydoc Dali::RenderSurfaceInterface::GetPositionSize() */ - virtual PositionSize GetPositionSize() const override; + PositionSize GetPositionSize() const override; /** */ - virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; + void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** * @copydoc Dali::RenderSurfaceInterface::InitializeGraphics() */ - virtual void InitializeGraphics() override; + void InitializeGraphics() override; /** * @copydoc Dali::RenderSurfaceInterface::CreateSurface() */ - virtual void CreateSurface() override; + void CreateSurface() override; /** * @copydoc Dali::RenderSurfaceInterface::DestroySurface() */ - virtual void DestroySurface() override; + void DestroySurface() override; /** * @copydoc Dali::RenderSurfaceInterface::ReplaceGraphicsSurface() */ - virtual bool ReplaceGraphicsSurface() override; + bool ReplaceGraphicsSurface() override; /** * @copydoc Dali::RenderSurfaceInterface::MoveResize() */ - virtual void MoveResize( Dali::PositionSize positionSize) override; + void MoveResize( Dali::PositionSize positionSize) override; /** * @copydoc Dali::RenderSurfaceInterface::StartRender() */ - virtual void StartRender() override; + void StartRender() override; /** * @copydoc Dali::RenderSurfaceInterface::PreRender() */ - virtual bool PreRender( bool resizingSurface, const std::vector>& damagedRects, Rect& clippingRect ) override; + bool PreRender( bool resizingSurface, const std::vector>& damagedRects, Rect& clippingRect ) override; /** * @copydoc Dali::RenderSurfaceInterface::PostRender() */ - virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector>& damagedRects ) override; + void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector>& damagedRects ) override; /** * @copydoc Dali::RenderSurfaceInterface::StopRender() */ - virtual void StopRender() override; + void StopRender() override; /** * @copydoc Dali::RenderSurfaceInterface::SetThreadSynchronization */ - virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override; + void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override; /** * @copydoc Dali::RenderSurfaceInterface::ReleaseLock() */ - virtual void ReleaseLock() override; + void ReleaseLock() override; /** * @copydoc Dali::RenderSurfaceInterface::GetSurfaceType() */ - virtual Dali::RenderSurfaceInterface::Type GetSurfaceType() override; + Dali::RenderSurfaceInterface::Type GetSurfaceType() override; /** * @copydoc Dali::RenderSurfaceInterface::MakeContextCurrent() */ - virtual void MakeContextCurrent() override; + void MakeContextCurrent() override; /** * @copydoc Dali::RenderSurfaceInterface::GetDepthBufferRequired() */ - virtual Integration::DepthBufferAvailable GetDepthBufferRequired() override; + Integration::DepthBufferAvailable GetDepthBufferRequired() override; /** * @copydoc Dali::RenderSurfaceInterface::GetStencilBufferRequired() */ - virtual Integration::StencilBufferAvailable GetStencilBufferRequired() override; + Integration::StencilBufferAvailable GetStencilBufferRequired() override; private: diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h index d9116e1..33f9d3d 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h +++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h @@ -187,247 +187,247 @@ public: /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindow() */ - virtual Any GetNativeWindow() override; + Any GetNativeWindow() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindowId() */ - virtual int GetNativeWindowId() override; + int GetNativeWindowId() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow() */ - virtual EGLNativeWindowType CreateEglWindow( int width, int height ) override; + EGLNativeWindowType CreateEglWindow( int width, int height ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::DestroyEglWindow() */ - virtual void DestroyEglWindow() override; + void DestroyEglWindow() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowRotation() */ - virtual void SetEglWindowRotation( int angle ) override; + void SetEglWindowRotation( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowBufferTransform() */ - virtual void SetEglWindowBufferTransform( int angle ) override; + void SetEglWindowBufferTransform( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowTransform() */ - virtual void SetEglWindowTransform( int angle ) override; + void SetEglWindowTransform( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::ResizeEglWindow() */ - virtual void ResizeEglWindow( PositionSize positionSize ) override; + void ResizeEglWindow( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::IsEglWindowRotationSupported() */ - virtual bool IsEglWindowRotationSupported() override; + bool IsEglWindowRotationSupported() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Move() */ - virtual void Move( PositionSize positionSize ) override; + void Move( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Resize() */ - virtual void Resize( PositionSize positionSize ) override; + void Resize( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::MoveResize() */ - virtual void MoveResize( PositionSize positionSize ) override; + void MoveResize( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetClass() */ - virtual void SetClass( const std::string& name, const std::string& className ) override; + void SetClass( const std::string& name, const std::string& className ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Raise() */ - virtual void Raise() override; + void Raise() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Lower() */ - virtual void Lower() override; + void Lower() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Activate() */ - virtual void Activate() override; + void Activate() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableAnlges() */ - virtual void SetAvailableAnlges( const std::vector< int >& angles ) override; + void SetAvailableAnlges( const std::vector< int >& angles ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferredAngle() */ - virtual void SetPreferredAngle( int angle ) override; + void SetPreferredAngle( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAcceptFocus() */ - virtual void SetAcceptFocus( bool accept ) override; + void SetAcceptFocus( bool accept ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Show() */ - virtual void Show() override; + void Show() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Hide() */ - virtual void Hide() override; + void Hide() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHintCount() */ - virtual unsigned int GetSupportedAuxiliaryHintCount() const override; + unsigned int GetSupportedAuxiliaryHintCount() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHint() */ - virtual std::string GetSupportedAuxiliaryHint( unsigned int index ) const override; + std::string GetSupportedAuxiliaryHint( unsigned int index ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::AddAuxiliaryHint() */ - virtual unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override; + unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::RemoveAuxiliaryHint() */ - virtual bool RemoveAuxiliaryHint( unsigned int id ) override; + bool RemoveAuxiliaryHint( unsigned int id ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAuxiliaryHintValue() */ - virtual bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override; + bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintValue() */ - virtual std::string GetAuxiliaryHintValue( unsigned int id ) const override; + std::string GetAuxiliaryHintValue( unsigned int id ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintId() */ - virtual unsigned int GetAuxiliaryHintId( const std::string& hint ) const override; + unsigned int GetAuxiliaryHintId( const std::string& hint ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetInputRegion() */ - virtual void SetInputRegion( const Rect< int >& inputRegion ) override; + void SetInputRegion( const Rect< int >& inputRegion ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetType() */ - virtual void SetType( Dali::Window::Type type ) override; + void SetType( Dali::Window::Type type ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetNotificationLevel() */ - virtual bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override; + bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNotificationLevel() */ - virtual Dali::Window::NotificationLevel::Type GetNotificationLevel() const override; + Dali::Window::NotificationLevel::Type GetNotificationLevel() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetOpaqueState() */ - virtual void SetOpaqueState( bool opaque ) override; + void SetOpaqueState( bool opaque ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetScreenOffMode() */ - virtual bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override; + bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenOffMode() */ - virtual Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override; + Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetBrightness() */ - virtual bool SetBrightness( int brightness ) override; + bool SetBrightness( int brightness ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetBrightness() */ - virtual int GetBrightness() const override; + int GetBrightness() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GrabKey() */ - virtual bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override; + bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKey() */ - virtual bool UngrabKey( Dali::KEY key ) override; + bool UngrabKey( Dali::KEY key ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GrabKeyList() */ - virtual bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override; + bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKeyList() */ - virtual bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override; + bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetDpi() */ - virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; + void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle() */ - virtual int GetScreenRotationAngle() override; + int GetScreenRotationAngle() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetWindowRotationAngle() */ - virtual void SetWindowRotationAngle( int degree ) override; + void SetWindowRotationAngle( int degree ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted() */ - virtual void WindowRotationCompleted( int degree, int width, int height ) override; + void WindowRotationCompleted( int degree, int width, int height ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetTransparency() */ - virtual void SetTransparency( bool transparent ) override; + void SetTransparency( bool transparent ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetParent() */ - virtual void SetParent( WindowBase* parentWinBase ) override; + void SetParent( WindowBase* parentWinBase ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateFrameRenderedSyncFence() */ - virtual int CreateFrameRenderedSyncFence() override; + int CreateFrameRenderedSyncFence() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateFramePresentedSyncFence() */ - virtual int CreateFramePresentedSyncFence() override; + int CreateFramePresentedSyncFence() override; private: diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h index e223591..3108032 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h @@ -214,247 +214,247 @@ public: /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindow() */ - virtual Any GetNativeWindow() override; + Any GetNativeWindow() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindowId() */ - virtual int GetNativeWindowId() override; + int GetNativeWindowId() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow() */ - virtual EGLNativeWindowType CreateEglWindow( int width, int height ) override; + EGLNativeWindowType CreateEglWindow( int width, int height ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::DestroyEglWindow() */ - virtual void DestroyEglWindow() override; + void DestroyEglWindow() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowRotation() */ - virtual void SetEglWindowRotation( int angle ) override; + void SetEglWindowRotation( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowBufferTransform() */ - virtual void SetEglWindowBufferTransform( int angle ) override; + void SetEglWindowBufferTransform( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowTransform() */ - virtual void SetEglWindowTransform( int angle ) override; + void SetEglWindowTransform( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::ResizeEglWindow() */ - virtual void ResizeEglWindow( PositionSize positionSize ) override; + void ResizeEglWindow( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::IsEglWindowRotationSupported() */ - virtual bool IsEglWindowRotationSupported() override; + bool IsEglWindowRotationSupported() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Move() */ - virtual void Move( PositionSize positionSize ) override; + void Move( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Resize() */ - virtual void Resize( PositionSize positionSize ) override; + void Resize( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::MoveResize() */ - virtual void MoveResize( PositionSize positionSize ) override; + void MoveResize( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetClass() */ - virtual void SetClass( const std::string& name, const std::string& className ) override; + void SetClass( const std::string& name, const std::string& className ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Raise() */ - virtual void Raise() override; + void Raise() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Lower() */ - virtual void Lower() override; + void Lower() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Activate() */ - virtual void Activate() override; + void Activate() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableAnlges() */ - virtual void SetAvailableAnlges( const std::vector< int >& angles ) override; + void SetAvailableAnlges( const std::vector< int >& angles ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferredAngle() */ - virtual void SetPreferredAngle( int angle ) override; + void SetPreferredAngle( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAcceptFocus() */ - virtual void SetAcceptFocus( bool accept ) override; + void SetAcceptFocus( bool accept ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Show() */ - virtual void Show() override; + void Show() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Hide() */ - virtual void Hide() override; + void Hide() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHintCount() */ - virtual unsigned int GetSupportedAuxiliaryHintCount() const override; + unsigned int GetSupportedAuxiliaryHintCount() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHint() */ - virtual std::string GetSupportedAuxiliaryHint( unsigned int index ) const override; + std::string GetSupportedAuxiliaryHint( unsigned int index ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::AddAuxiliaryHint() */ - virtual unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override; + unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::RemoveAuxiliaryHint() */ - virtual bool RemoveAuxiliaryHint( unsigned int id ) override; + bool RemoveAuxiliaryHint( unsigned int id ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAuxiliaryHintValue() */ - virtual bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override; + bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintValue() */ - virtual std::string GetAuxiliaryHintValue( unsigned int id ) const override; + std::string GetAuxiliaryHintValue( unsigned int id ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintId() */ - virtual unsigned int GetAuxiliaryHintId( const std::string& hint ) const override; + unsigned int GetAuxiliaryHintId( const std::string& hint ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetInputRegion() */ - virtual void SetInputRegion( const Rect< int >& inputRegion ) override; + void SetInputRegion( const Rect< int >& inputRegion ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetType() */ - virtual void SetType( Dali::Window::Type type ) override; + void SetType( Dali::Window::Type type ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetNotificationLevel() */ - virtual bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override; + bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNotificationLevel() */ - virtual Dali::Window::NotificationLevel::Type GetNotificationLevel() const override; + Dali::Window::NotificationLevel::Type GetNotificationLevel() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetOpaqueState() */ - virtual void SetOpaqueState( bool opaque ) override; + void SetOpaqueState( bool opaque ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetScreenOffMode() */ - virtual bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override; + bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenOffMode() */ - virtual Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override; + Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetBrightness() */ - virtual bool SetBrightness( int brightness ) override; + bool SetBrightness( int brightness ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetBrightness() */ - virtual int GetBrightness() const override; + int GetBrightness() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GrabKey() */ - virtual bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override; + bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKey() */ - virtual bool UngrabKey( Dali::KEY key ) override; + bool UngrabKey( Dali::KEY key ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GrabKeyList() */ - virtual bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override; + bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKeyList() */ - virtual bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override; + bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetDpi() */ - virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; + void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle() */ - virtual int GetScreenRotationAngle() override; + int GetScreenRotationAngle() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetWindowRotationAngle() */ - virtual void SetWindowRotationAngle( int degree ) override; + void SetWindowRotationAngle( int degree ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted() */ - virtual void WindowRotationCompleted( int degree, int width, int height ) override; + void WindowRotationCompleted( int degree, int width, int height ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetTransparency() */ - virtual void SetTransparency( bool transparent ) override; + void SetTransparency( bool transparent ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetParent() */ - virtual void SetParent( WindowBase* parentWinBase ) override; + void SetParent( WindowBase* parentWinBase ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateFrameRenderedSyncFence() */ - virtual int CreateFrameRenderedSyncFence() override; + int CreateFrameRenderedSyncFence() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateFramePresentedSyncFence() */ - virtual int CreateFramePresentedSyncFence() override; + int CreateFramePresentedSyncFence() override; private: diff --git a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h index ea9c6d7..ea01567 100644 --- a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h +++ b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h @@ -60,116 +60,116 @@ public: // from WindowRenderSurface /** * @copydoc Dali::NativeRenderSurface::GetSurface() */ - virtual Any GetDrawable() override; + Any GetDrawable() override; /** * @copydoc Dali::NativeRenderSurface::SetRenderNotification() */ - virtual void SetRenderNotification( TriggerEventInterface* renderNotification ) override; + void SetRenderNotification( TriggerEventInterface* renderNotification ) override; /** * @copydoc Dali::NativeRenderSurface::WaitUntilSurfaceReplaced() */ - virtual void WaitUntilSurfaceReplaced() override; + void WaitUntilSurfaceReplaced() override; public: // from Dali::RenderSurfaceInterface /** * @copydoc Dali::RenderSurfaceInterface::GetPositionSize() */ - virtual PositionSize GetPositionSize() const override; + PositionSize GetPositionSize() const override; /** * @copydoc Dali::RenderSurfaceInterface::GetDpi() */ - virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; + void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** * @copydoc Dali::RenderSurfaceInterface::InitializeGraphics() */ - virtual void InitializeGraphics() override; + void InitializeGraphics() override; /** * @copydoc Dali::RenderSurfaceInterface::CreateSurface() */ - virtual void CreateSurface() override; + void CreateSurface() override; /** * @copydoc Dali::RenderSurfaceInterface::DestroySurface() */ - virtual void DestroySurface() override; + void DestroySurface() override; /** * @copydoc Dali::RenderSurfaceInterface::ReplaceGraphicsSurface() */ - virtual bool ReplaceGraphicsSurface() override; + bool ReplaceGraphicsSurface() override; /** * @copydoc Dali::RenderSurfaceInterface::MoveResize() */ - virtual void MoveResize( Dali::PositionSize positionSize) override; + void MoveResize( Dali::PositionSize positionSize) override; /** * @copydoc Dali::RenderSurfaceInterface::StartRender() */ - virtual void StartRender() override; + void StartRender() override; /** * @copydoc Dali::RenderSurfaceInterface::PreRender() */ - virtual bool PreRender( bool resizingSurface, const std::vector>& damagedRects, Rect& clippingRect ) override; + bool PreRender( bool resizingSurface, const std::vector>& damagedRects, Rect& clippingRect ) override; /** * @copydoc Dali::RenderSurfaceInterface::PostRender() */ - virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector>& damagedRects ) override; + void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector>& damagedRects ) override; /** * @copydoc Dali::RenderSurfaceInterface::StopRender() */ - virtual void StopRender() override; + void StopRender() override; /** * @copydoc Dali::RenderSurfaceInterface::SetThreadSynchronization */ - virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization )override; + void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization )override; /** * @copydoc Dali::RenderSurfaceInterface::GetSurfaceType() */ - virtual Dali::RenderSurfaceInterface::Type GetSurfaceType() override; + Dali::RenderSurfaceInterface::Type GetSurfaceType() override; /** * @copydoc Dali::RenderSurfaceInterface::MakeContextCurrent() */ - virtual void MakeContextCurrent() override; + void MakeContextCurrent() override; /** * @copydoc Dali::RenderSurfaceInterface::GetDepthBufferRequired() */ - virtual Integration::DepthBufferAvailable GetDepthBufferRequired() override; + Integration::DepthBufferAvailable GetDepthBufferRequired() override; /** * @copydoc Dali::RenderSurfaceInterface::GetStencilBufferRequired() */ - virtual Integration::StencilBufferAvailable GetStencilBufferRequired() override; + Integration::StencilBufferAvailable GetStencilBufferRequired() override; private: /** * @copydoc Dali::RenderSurfaceInterface::ReleaseLock() */ - virtual void ReleaseLock() override; + void ReleaseLock() override; /** * @copydoc Dali::NativeRenderSurface::CreateNativeRenderable() */ - virtual void CreateNativeRenderable() override; + void CreateNativeRenderable() override; /** * @copydoc Dali::NativeRenderSurface::ReleaseDrawable() */ - virtual void ReleaseDrawable() override; + void ReleaseDrawable() override; private: // Data diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h index ebedfef..b88c3f6 100644 --- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h +++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h @@ -62,44 +62,44 @@ public: // from WindowRenderSurface /** * @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::GetSurface() */ - virtual Any GetSurface() override; + Any GetSurface() override; /** * @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::SetRenderNotification() */ - virtual void SetRenderNotification( TriggerEventInterface* renderNotification ) override; + void SetRenderNotification( TriggerEventInterface* renderNotification ) override; public: // from Dali::RenderSurfaceInterface /** * @copydoc Dali::RenderSurfaceInterface::GetPositionSize() */ - virtual PositionSize GetPositionSize() const override; + PositionSize GetPositionSize() const override; /** * @copydoc Dali::RenderSurfaceInterface::GetDpi() */ - virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; + void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** * @copydoc Dali::RenderSurfaceInterface::InitializeGraphics() */ - virtual void InitializeGraphics() override; + void InitializeGraphics() override; /** * @copydoc Dali::RenderSurfaceInterface::CreateSurface() */ - virtual void CreateSurface() override; + void CreateSurface() override; /** * @copydoc Dali::RenderSurfaceInterface::DestroySurface() */ - virtual void DestroySurface() override; + void DestroySurface() override; /** * @copydoc Dali::RenderSurfaceInterface::ReplaceGraphicsSurface() */ - virtual bool ReplaceGraphicsSurface() override; + bool ReplaceGraphicsSurface() override; /** * @copydoc Dali::RenderSurfaceInterface::MoveResize() @@ -109,59 +109,59 @@ public: // from Dali::RenderSurfaceInterface /** * @copydoc Dali::RenderSurfaceInterface::StartRender() */ - virtual void StartRender() override; + void StartRender() override; /** * @copydoc Dali::RenderSurfaceInterface::PreRender() */ - virtual bool PreRender( bool resizingSurface, const std::vector>& damagedRects, Rect& clippingRect ) override; + bool PreRender( bool resizingSurface, const std::vector>& damagedRects, Rect& clippingRect ) override; /** * @copydoc Dali::RenderSurfaceInterface::PostRender() */ - virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector>& damagedRects ) override; + void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector>& damagedRects ) override; /** * @copydoc Dali::RenderSurfaceInterface::StopRender() */ - virtual void StopRender() override; + void StopRender() override; /** * @copydoc Dali::RenderSurfaceInterface::SetThreadSynchronization */ - virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override; + void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override; /** * @copydoc Dali::RenderSurfaceInterface::GetSurfaceType() */ - virtual Dali::RenderSurfaceInterface::Type GetSurfaceType() override; + Dali::RenderSurfaceInterface::Type GetSurfaceType() override; /** * @copydoc Dali::RenderSurfaceInterface::MakeContextCurrent() */ - virtual void MakeContextCurrent() override; + void MakeContextCurrent() override; private: // from PixmapRenderSurface /** * @copydoc Dali::RenderSurfaceInterface::ReleaseLock() */ - virtual void ReleaseLock() override; + void ReleaseLock() override; /** * @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::Initialize() */ - virtual void Initialize( Any surface ) override; + void Initialize( Any surface ) override; /** * @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::Initialize() */ - virtual void CreateRenderable() override; + void CreateRenderable() override; /** * @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::Initialize() */ - virtual void UseExistingRenderable( unsigned int surfaceId ) override; + void UseExistingRenderable( unsigned int surfaceId ) override; private: diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h index bdbe0a8..601738b 100644 --- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h +++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h @@ -121,247 +121,247 @@ public: /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindow() */ - virtual Any GetNativeWindow() override; + Any GetNativeWindow() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindowId() */ - virtual int GetNativeWindowId() override; + int GetNativeWindowId() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow() */ - virtual EGLNativeWindowType CreateEglWindow( int width, int height ) override; + EGLNativeWindowType CreateEglWindow( int width, int height ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::DestroyEglWindow() */ - virtual void DestroyEglWindow() override; + void DestroyEglWindow() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowRotation() */ - virtual void SetEglWindowRotation( int angle ) override; + void SetEglWindowRotation( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowBufferTransform() */ - virtual void SetEglWindowBufferTransform( int angle ) override; + void SetEglWindowBufferTransform( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowTransform() */ - virtual void SetEglWindowTransform( int angle ) override; + void SetEglWindowTransform( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::ResizeEglWindow() */ - virtual void ResizeEglWindow( PositionSize positionSize ) override; + void ResizeEglWindow( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::IsEglWindowRotationSupported() */ - virtual bool IsEglWindowRotationSupported() override; + bool IsEglWindowRotationSupported() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Move() */ - virtual void Move( PositionSize positionSize ) override; + void Move( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Resize() */ - virtual void Resize( PositionSize positionSize ) override; + void Resize( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::MoveResize() */ - virtual void MoveResize( PositionSize positionSize ) override; + void MoveResize( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetClass() */ - virtual void SetClass( const std::string& name, const std::string& className ) override; + void SetClass( const std::string& name, const std::string& className ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Raise() */ - virtual void Raise() override; + void Raise() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Lower() */ - virtual void Lower() override; + void Lower() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Activate() */ - virtual void Activate() override; + void Activate() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableAnlges() */ - virtual void SetAvailableAnlges( const std::vector< int >& angles ) override; + void SetAvailableAnlges( const std::vector< int >& angles ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferredAngle() */ - virtual void SetPreferredAngle( int angle ) override; + void SetPreferredAngle( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAcceptFocus() */ - virtual void SetAcceptFocus( bool accept ) override; + void SetAcceptFocus( bool accept ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Show() */ - virtual void Show() override; + void Show() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Hide() */ - virtual void Hide() override; + void Hide() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHintCount() */ - virtual unsigned int GetSupportedAuxiliaryHintCount() const override; + unsigned int GetSupportedAuxiliaryHintCount() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHint() */ - virtual std::string GetSupportedAuxiliaryHint( unsigned int index ) const override; + std::string GetSupportedAuxiliaryHint( unsigned int index ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::AddAuxiliaryHint() */ - virtual unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override; + unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::RemoveAuxiliaryHint() */ - virtual bool RemoveAuxiliaryHint( unsigned int id ) override; + bool RemoveAuxiliaryHint( unsigned int id ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAuxiliaryHintValue() */ - virtual bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override; + bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintValue() */ - virtual std::string GetAuxiliaryHintValue( unsigned int id ) const override; + std::string GetAuxiliaryHintValue( unsigned int id ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintId() */ - virtual unsigned int GetAuxiliaryHintId( const std::string& hint ) const override; + unsigned int GetAuxiliaryHintId( const std::string& hint ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetInputRegion() */ - virtual void SetInputRegion( const Rect< int >& inputRegion ) override; + void SetInputRegion( const Rect< int >& inputRegion ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetType() */ - virtual void SetType( Dali::Window::Type type ) override; + void SetType( Dali::Window::Type type ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetNotificationLevel() */ - virtual bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override; + bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNotificationLevel() */ - virtual Dali::Window::NotificationLevel::Type GetNotificationLevel() const override; + Dali::Window::NotificationLevel::Type GetNotificationLevel() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetOpaqueState() */ - virtual void SetOpaqueState( bool opaque ) override; + void SetOpaqueState( bool opaque ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetScreenOffMode() */ - virtual bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override; + bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenOffMode() */ - virtual Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override; + Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetBrightness() */ - virtual bool SetBrightness( int brightness ) override; + bool SetBrightness( int brightness ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetBrightness() */ - virtual int GetBrightness() const override; + int GetBrightness() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GrabKey() */ - virtual bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override; + bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKey() */ - virtual bool UngrabKey( Dali::KEY key ) override; + bool UngrabKey( Dali::KEY key ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GrabKeyList() */ - virtual bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override; + bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKeyList() */ - virtual bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override; + bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetDpi() */ - virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; + void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle() */ - virtual int GetScreenRotationAngle() override; + int GetScreenRotationAngle() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetWindowRotationAngle() */ - virtual void SetWindowRotationAngle( int degree ) override; + void SetWindowRotationAngle( int degree ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted() */ - virtual void WindowRotationCompleted( int degree, int width, int height ) override; + void WindowRotationCompleted( int degree, int width, int height ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetTransparency() */ - virtual void SetTransparency( bool transparent ) override; + void SetTransparency( bool transparent ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetParent() */ - virtual void SetParent( WindowBase* parentWinBase ) override; + void SetParent( WindowBase* parentWinBase ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateFrameRenderedSyncFence() */ - virtual int CreateFrameRenderedSyncFence() override; + int CreateFrameRenderedSyncFence() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateFramePresentedSyncFence() */ - virtual int CreateFramePresentedSyncFence() override; + int CreateFramePresentedSyncFence() override; private: diff --git a/dali/internal/window-system/windows/window-base-win.h b/dali/internal/window-system/windows/window-base-win.h index a9ec27d..d93153b 100755 --- a/dali/internal/window-system/windows/window-base-win.h +++ b/dali/internal/window-system/windows/window-base-win.h @@ -109,247 +109,247 @@ public: /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindow() */ - virtual Any GetNativeWindow() override; + Any GetNativeWindow() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindowId() */ - virtual int GetNativeWindowId() override; + int GetNativeWindowId() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow() */ - virtual EGLNativeWindowType CreateEglWindow( int width, int height ) override; + EGLNativeWindowType CreateEglWindow( int width, int height ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::DestroyEglWindow() */ - virtual void DestroyEglWindow() override; + void DestroyEglWindow() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowRotation() */ - virtual void SetEglWindowRotation( int angle ) override; + void SetEglWindowRotation( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowBufferTransform() */ - virtual void SetEglWindowBufferTransform( int angle ) override; + void SetEglWindowBufferTransform( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetEglWindowTransform() */ - virtual void SetEglWindowTransform( int angle ) override; + void SetEglWindowTransform( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::ResizeEglWindow() */ - virtual void ResizeEglWindow( PositionSize positionSize ) override; + void ResizeEglWindow( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::IsEglWindowRotationSupported() */ - virtual bool IsEglWindowRotationSupported() override; + bool IsEglWindowRotationSupported() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Move() */ - virtual void Move( PositionSize positionSize ) override; + void Move( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Resize() */ - virtual void Resize( PositionSize positionSize ) override; + void Resize( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::MoveResize() */ - virtual void MoveResize( PositionSize positionSize ) override; + void MoveResize( PositionSize positionSize ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetClass() */ - virtual void SetClass( const std::string& name, const std::string& className ) override; + void SetClass( const std::string& name, const std::string& className ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Raise() */ - virtual void Raise() override; + void Raise() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Lower() */ - virtual void Lower() override; + void Lower() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Activate() */ - virtual void Activate() override; + void Activate() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableAnlges() */ - virtual void SetAvailableAnlges( const std::vector< int >& angles ) override; + void SetAvailableAnlges( const std::vector< int >& angles ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetPreferredAngle() */ - virtual void SetPreferredAngle( int angle ) override; + void SetPreferredAngle( int angle ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAcceptFocus() */ - virtual void SetAcceptFocus( bool accept ) override; + void SetAcceptFocus( bool accept ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Show() */ - virtual void Show() override; + void Show() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::Hide() */ - virtual void Hide() override; + void Hide() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHintCount() */ - virtual unsigned int GetSupportedAuxiliaryHintCount() const override; + unsigned int GetSupportedAuxiliaryHintCount() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetSupportedAuxiliaryHint() */ - virtual std::string GetSupportedAuxiliaryHint( unsigned int index ) const override; + std::string GetSupportedAuxiliaryHint( unsigned int index ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::AddAuxiliaryHint() */ - virtual unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override; + unsigned int AddAuxiliaryHint( const std::string& hint, const std::string& value ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::RemoveAuxiliaryHint() */ - virtual bool RemoveAuxiliaryHint( unsigned int id ) override; + bool RemoveAuxiliaryHint( unsigned int id ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetAuxiliaryHintValue() */ - virtual bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override; + bool SetAuxiliaryHintValue( unsigned int id, const std::string& value ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintValue() */ - virtual std::string GetAuxiliaryHintValue( unsigned int id ) const override; + std::string GetAuxiliaryHintValue( unsigned int id ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetAuxiliaryHintId() */ - virtual unsigned int GetAuxiliaryHintId( const std::string& hint ) const override; + unsigned int GetAuxiliaryHintId( const std::string& hint ) const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetInputRegion() */ - virtual void SetInputRegion( const Rect< int >& inputRegion ) override; + void SetInputRegion( const Rect< int >& inputRegion ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetType() */ - virtual void SetType( Dali::Window::Type type ) override; + void SetType( Dali::Window::Type type ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetNotificationLevel() */ - virtual bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override; + bool SetNotificationLevel( Dali::Window::NotificationLevel::Type level ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetNotificationLevel() */ - virtual Dali::Window::NotificationLevel::Type GetNotificationLevel() const override; + Dali::Window::NotificationLevel::Type GetNotificationLevel() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetOpaqueState() */ - virtual void SetOpaqueState( bool opaque ) override; + void SetOpaqueState( bool opaque ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetScreenOffMode() */ - virtual bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override; + bool SetScreenOffMode(Dali::Window::ScreenOffMode::Type screenOffMode) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenOffMode() */ - virtual Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override; + Dali::Window::ScreenOffMode::Type GetScreenOffMode() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetBrightness() */ - virtual bool SetBrightness( int brightness ) override; + bool SetBrightness( int brightness ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetBrightness() */ - virtual int GetBrightness() const override; + int GetBrightness() const override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GrabKey() */ - virtual bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override; + bool GrabKey( Dali::KEY key, KeyGrab::KeyGrabMode grabMode ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKey() */ - virtual bool UngrabKey( Dali::KEY key ) override; + bool UngrabKey( Dali::KEY key ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GrabKeyList() */ - virtual bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override; + bool GrabKeyList( const Dali::Vector< Dali::KEY >& key, const Dali::Vector< KeyGrab::KeyGrabMode >& grabMode, Dali::Vector< bool >& result ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::UngrabKeyList() */ - virtual bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override; + bool UngrabKeyList( const Dali::Vector< Dali::KEY >& key, Dali::Vector< bool >& result ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetDpi() */ - virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; + void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle() */ - virtual int GetScreenRotationAngle() override; + int GetScreenRotationAngle() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetWindowRotationAngle() */ - virtual void SetWindowRotationAngle( int degree ) override; + void SetWindowRotationAngle( int degree ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::WindowRotationCompleted() */ - virtual void WindowRotationCompleted( int degree, int width, int height ) override; + void WindowRotationCompleted( int degree, int width, int height ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetTransparency() */ - virtual void SetTransparency( bool transparent ) override; + void SetTransparency( bool transparent ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::SetParent() */ - virtual void SetParent( WindowBase* parentWinBase ) override; + void SetParent( WindowBase* parentWinBase ) override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateFrameRenderedSyncFence() */ - virtual int CreateFrameRenderedSyncFence() override; + int CreateFrameRenderedSyncFence() override; /** * @copydoc Dali::Internal::Adaptor::WindowBase::CreateFramePresentedSyncFence() */ - virtual int CreateFramePresentedSyncFence() override; + int CreateFramePresentedSyncFence() override; private: diff --git a/dali/public-api/adaptor-framework/native-image-source.h b/dali/public-api/adaptor-framework/native-image-source.h index 3f52899..c2f6211 100755 --- a/dali/public-api/adaptor-framework/native-image-source.h +++ b/dali/public-api/adaptor-framework/native-image-source.h @@ -217,7 +217,7 @@ private: // native image /** * @copydoc Dali::NativeImageInterface::GetExtension() */ - NativeImageInterface::Extension* GetExtension(); + NativeImageInterface::Extension* GetExtension() override; private: @@ -238,7 +238,7 @@ private: * The implementation should destroy the NativeImage resources. * @SINCE_1_0.0 */ - DALI_INTERNAL virtual ~NativeImageSource(); + DALI_INTERNAL ~NativeImageSource() override; /** * @brief Undefined copy constructor. diff --git a/dali/public-api/adaptor-framework/widget-impl.h b/dali/public-api/adaptor-framework/widget-impl.h index 75b61da..18299d9 100644 --- a/dali/public-api/adaptor-framework/widget-impl.h +++ b/dali/public-api/adaptor-framework/widget-impl.h @@ -120,12 +120,12 @@ public: /** * @copydoc ConnectionTrackerInterface::SignalConnected */ - virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ); + void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ) override; /** * @copydoc ConnectionTrackerInterface::SignalDisconnected */ - virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ); + void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ) override; /** * @brief Set content info to WidgetView. -- 2.7.4