use modern construct 'override' in the derive class.

[platform/core/uifw/dali-core.git] / dali / integration-api / bitmap.h

diff --git a/dali/integration-api/bitmap.h b/dali/integration-api/bitmap.h
index 3058689..8d12661 100644 (file)
--- a/dali/integration-api/bitmap.h
+++ b/dali/integration-api/bitmap.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_BITMAP_H__
-#define __DALI_INTEGRATION_BITMAP_H__
+#ifndef DALI_INTEGRATION_BITMAP_H
+#define DALI_INTEGRATION_BITMAP_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,8 +42,8 @@ namespace Integration
 DALI_CORE_API void ConvertToGlFormat(Pixel::Format pixelformat, unsigned& pixelDataType, unsigned& internalFormat);
 
 class Bitmap;
-typedef IntrusivePtr<Bitmap>    BitmapPtr;
-typedef uint8_t                 PixelBuffer;  ///< Pixel data buffers are composed of these
+using BitmapPtr   = IntrusivePtr<Bitmap>;
+using PixelBuffer = uint8_t; ///< Pixel data buffers are composed of these
 
 /**
  * Bitmap class.
@@ -349,7 +349,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~Bitmap();
+  ~Bitmap() override;
 
 protected:
 
@@ -375,4 +375,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_BITMAP_H__
+#endif // DALI_INTEGRATION_BITMAP_H