From 268f651469300b3950b3f314fa33803b6c24273e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gy=C3=B6rgy=20Straub?= Date: Fri, 4 Sep 2020 15:25:00 +0100 Subject: [PATCH] Changed 'virtual' function override declarations to 'override' in automated-tests. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Id86e9c197e28b3fb67bc1a3aec504020dc093808 Signed-off-by: György Straub --- .../dali-toolkit-test-utils/dummy-visual.h | 12 +++---- .../dali-toolkit-test-utils/dummy-control.h | 40 +++++++++++----------- .../test-gl-context-helper-abstraction.h | 7 ++-- .../test-gl-sync-abstraction.h | 4 +-- .../test-platform-abstraction.h | 10 +++--- .../test-render-controller.h | 4 +-- .../toolkit-scene-holder-impl.h | 36 +++++++++---------- 7 files changed, 57 insertions(+), 56 deletions(-) diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dummy-visual.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dummy-visual.h index 8136089..ef4c37b 100644 --- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dummy-visual.h +++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dummy-visual.h @@ -75,12 +75,12 @@ protected: DummyVisual( VisualFactoryCache& factoryCache ); - virtual void DoCreatePropertyMap( Property::Map& map ) const override; - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const override; - virtual void DoSetProperties( const Property::Map& propertyMap ) override; - virtual void OnSetTransform() override; - virtual void DoSetOnScene( Actor& actor ) override; - virtual void OnDoAction( const Property::Index actionName, const Property::Value& attributes ) override; + void DoCreatePropertyMap( Property::Map& map ) const override; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; + void DoSetProperties( const Property::Map& propertyMap ) override; + void OnSetTransform() override; + void DoSetOnScene( Actor& actor ) override; + void OnDoAction( const Property::Index actionName, const Property::Value& attributes ) override; private: unsigned int mActionCounter; diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h index 0b257a1..9150df8 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h @@ -152,29 +152,29 @@ private: private: // From Internal::Control - virtual void OnInitialize(); - virtual bool OnAccessibilityActivated(); - virtual bool OnAccessibilityValueChange( bool isIncrease ); - - virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); - virtual void OnPinch(const PinchGesture& pinch); - virtual void OnPan(const PanGesture& pan); - virtual void OnTap(const TapGesture& tap); - virtual void OnLongPress(const LongPressGesture& longPress); - virtual Vector3 GetNaturalSize(); - virtual bool OnKeyEvent(const KeyEvent& event); + void OnInitialize() override; + bool OnAccessibilityActivated() override; + bool OnAccessibilityValueChange( bool isIncrease ) override; + + void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) override; + void OnPinch(const PinchGesture& pinch) override; + void OnPan(const PanGesture& pan) override; + void OnTap(const TapGesture& tap) override; + void OnLongPress(const LongPressGesture& longPress) override; + Vector3 GetNaturalSize() override; + bool OnKeyEvent(const KeyEvent& event) override; private: // From CustomActorImpl - virtual void OnSceneConnection( int depth ); - virtual void OnSceneDisconnection(); - virtual void OnChildAdd(Actor& child); - virtual void OnChildRemove(Actor& child); - virtual void OnSizeSet(const Vector3& targetSize); - virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize); - virtual void OnKeyInputFocusGained(); - virtual void OnKeyInputFocusLost(); - virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); + void OnSceneConnection( int depth ) override; + void OnSceneDisconnection() override; + void OnChildAdd(Actor& child) override; + void OnChildRemove(Actor& child) override; + void OnSizeSet(const Vector3& targetSize) override; + void OnSizeAnimation(Animation& animation, const Vector3& targetSize) override; + void OnKeyInputFocusGained() override; + void OnKeyInputFocusLost() override; + void OnRelayout( const Vector2& size, RelayoutContainer& container ) override; DALI_INTERNAL DummyControl( const DummyControl& ); DALI_INTERNAL DummyControl& operator=( const DummyControl& ); diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-context-helper-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-context-helper-abstraction.h index ce150d1..4c29757 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-context-helper-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-context-helper-abstraction.h @@ -43,17 +43,18 @@ public: /** * @brief Switch to the surfaceless GL context */ - virtual void MakeSurfacelessContextCurrent() {}; + void MakeSurfacelessContextCurrent() override {}; /** * @brief Clear the GL context */ - virtual void MakeContextNull() {}; + void MakeContextNull() override {}; /** * @brief Wait until all GL rendering calls for the current GL context are executed */ - virtual void WaitClient() {}; + void WaitClient() override {}; + private: TestGlContextHelperAbstraction( const TestGlContextHelperAbstraction& ); ///< Undefined diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h index 775d209..1990b9c 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h @@ -66,13 +66,13 @@ public: * Create a sync object * @return the sync object */ - virtual Integration::GlSyncAbstraction::SyncObject* CreateSyncObject( ); + Integration::GlSyncAbstraction::SyncObject* CreateSyncObject( ) override; /** * Destroy a sync object * @param[in] syncObject The object to destroy */ - virtual void DestroySyncObject( Integration::GlSyncAbstraction::SyncObject* syncObject ); + void DestroySyncObject( Integration::GlSyncAbstraction::SyncObject* syncObject ) override; public: // TEST FUNCTIONS diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h index 7c1b010..bb62c26 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h @@ -72,17 +72,17 @@ public: /** * @copydoc PlatformAbstraction::LoadResourceSynchronously() */ - virtual Integration::ResourcePointer LoadImageSynchronously( const Integration::BitmapResourceType& resourceType, const std::string& resourcePath ); + Integration::ResourcePointer LoadImageSynchronously( const Integration::BitmapResourceType& resourceType, const std::string& resourcePath ) override; /** * @copydoc PlatformAbstraction::DecodeBuffer() */ - virtual Integration::BitmapPtr DecodeBuffer( const Dali::Integration::BitmapResourceType& resourceType, uint8_t * buffer, size_t size ); + Integration::BitmapPtr DecodeBuffer( const Dali::Integration::BitmapResourceType& resourceType, 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() @@ -92,12 +92,12 @@ public: /** * @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; public: // TEST FUNCTIONS diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h index d44e7b6..74f0f5e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h @@ -31,8 +31,8 @@ public: TestRenderController(); ~TestRenderController(); - virtual void RequestUpdate( bool forceUpdate ); - virtual void RequestProcessEventsOnIdle( bool forceProcess ); + void RequestUpdate( bool forceUpdate ) override; + void RequestProcessEventsOnIdle( bool forceProcess ) override; typedef enum { diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h index 20c37cb..203ac73 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h @@ -33,43 +33,43 @@ public: TestRenderSurface( PositionSize positionSize ) {}; - virtual PositionSize GetPositionSize() const { PositionSize size; return size; }; + PositionSize GetPositionSize() const override { PositionSize size; return size; }; virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { dpiHorizontal = dpiVertical = 96; } - virtual void InitializeGraphics() {}; + void InitializeGraphics() override {}; - virtual void CreateSurface() {}; + void CreateSurface() override {}; - virtual void DestroySurface() {}; + void DestroySurface() override {}; - virtual bool ReplaceGraphicsSurface() { return false; }; + bool ReplaceGraphicsSurface() override { return false; }; - virtual void MoveResize( Dali::PositionSize positionSize ) {}; + void MoveResize( Dali::PositionSize positionSize ) override {}; - virtual void StartRender() {}; + void StartRender() override {}; - virtual bool PreRender( bool resizingSurface, const std::vector>& damagedRects, Rect& clippingRect ) { return false; }; + bool PreRender( bool resizingSurface, const std::vector>& damagedRects, Rect& clippingRect ) override { return false; }; - virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector>& damagedRects ) {}; + void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector>& damagedRects ) override {}; - virtual void StopRender() {}; + void StopRender() override {}; - virtual void ReleaseLock() {}; + void ReleaseLock() override {}; - virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) {}; + void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override {}; - virtual RenderSurfaceInterface::Type GetSurfaceType() { return RenderSurfaceInterface::WINDOW_RENDER_SURFACE; }; + RenderSurfaceInterface::Type GetSurfaceType() override { return RenderSurfaceInterface::WINDOW_RENDER_SURFACE; }; - virtual void MakeContextCurrent() {}; + void MakeContextCurrent() override {}; - virtual Integration::DepthBufferAvailable GetDepthBufferRequired() { return Integration::DepthBufferAvailable::FALSE; }; + Integration::DepthBufferAvailable GetDepthBufferRequired() override { return Integration::DepthBufferAvailable::FALSE; }; - virtual Integration::StencilBufferAvailable GetStencilBufferRequired() { return Integration::StencilBufferAvailable::FALSE; }; + Integration::StencilBufferAvailable GetStencilBufferRequired() override { return Integration::StencilBufferAvailable::FALSE; }; - virtual void SetBackgroundColor( Vector4 color ) {}; + void SetBackgroundColor( Vector4 color ) {}; - virtual Vector4 GetBackgroundColor() { return Color::WHITE; }; + Vector4 GetBackgroundColor() { return Color::WHITE; }; }; namespace Internal -- 2.7.4