projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding 'override', removing 'virtual' from overriding functions' declarations in...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-platform-abstraction.h
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
..
1adedd4
100644
(file)
--- 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
@@
-49,55
+49,55
@@
public:
/**
* Destructor
*/
/**
* Destructor
*/
-
virtual ~TestPlatformAbstraction()
;
+
~TestPlatformAbstraction() override
;
/**
* @copydoc PlatformAbstraction::GetClosestImageSize()
*/
/**
* @copydoc PlatformAbstraction::GetClosestImageSize()
*/
-
virtual
ImageDimensions GetClosestImageSize( const std::string& filename,
+ ImageDimensions GetClosestImageSize( const std::string& filename,
ImageDimensions size,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
ImageDimensions size,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
- bool orientationCorrection );
+ bool orientationCorrection )
override
;
/**
* @copydoc PlatformAbstraction::GetClosestImageSize()
*/
/**
* @copydoc PlatformAbstraction::GetClosestImageSize()
*/
-
virtual
ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer,
+ ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer,
ImageDimensions size,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
ImageDimensions size,
FittingMode::Type fittingMode,
SamplingMode::Type samplingMode,
- bool orientationCorrection );
+ bool orientationCorrection )
override
;
/**
* @copydoc PlatformAbstraction::LoadResourceSynchronously()
*/
/**
* @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()
*/
/**
* @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()
*/
/**
* @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()
*/
/**
* @copydoc PlatformAbstraction::SaveShaderBinaryFile()
*/
- virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const { return true; }
+ virtual bool SaveShaderBinaryFile( const std::string& filename, const unsigned char * buffer, unsigned int numBytes ) const
override
{ return true; }
/**
* @copydoc PlatformAbstraction::StartTimer()
*/
/**
* @copydoc PlatformAbstraction::StartTimer()
*/
-
virtual uint32_t StartTimer( uint32_t milliseconds, CallbackBase* callback )
;
+
uint32_t StartTimer( uint32_t milliseconds, CallbackBase* callback ) override
;
/*
* @copydoc PlatformAbstraction::CancelTimer()
*/
/*
* @copydoc PlatformAbstraction::CancelTimer()
*/
- v
irtual void CancelTimer ( uint32_t timerId )
;
+ v
oid CancelTimer ( uint32_t timerId ) override
;
public: // TEST FUNCTIONS
public: // TEST FUNCTIONS