use modern construct 'override' in the derive class.

[platform/core/uifw/dali-core.git] / dali / internal / event / common / type-info-impl.h

diff --git a/dali/internal/event/common/type-info-impl.h b/dali/internal/event/common/type-info-impl.h
index d704040..6d90b75 100644 (file)
--- a/dali/internal/event/common/type-info-impl.h
+++ b/dali/internal/event/common/type-info-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TYPE_INFO_H__
-#define __DALI_INTERNAL_TYPE_INFO_H__
+#ifndef DALI_INTERNAL_TYPE_INFO_H
+#define DALI_INTERNAL_TYPE_INFO_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.
@@ -68,7 +68,7 @@ public:
   /**
    * Destructor
    */
-  virtual ~TypeInfo();
+  ~TypeInfo() override;
 
   /**
    * @copydoc Dali::TypeInfo::GetName
@@ -384,15 +384,15 @@ private:
     int32_t componentIndex = Property::INVALID_COMPONENT_INDEX;
   };
 
-  typedef std::pair<std::string, Dali::TypeInfo::SignalConnectorFunction > ConnectionPair;
-  typedef std::pair<std::string, Dali::TypeInfo::ActionFunction > ActionPair;
-  typedef std::pair<Property::Index, RegisteredProperty> RegisteredPropertyPair;
-  typedef std::pair<Property::Index, Property::Value> PropertyDefaultValuePair;
+  using ConnectionPair           = std::pair<std::string, Dali::TypeInfo::SignalConnectorFunction>;
+  using ActionPair               = std::pair<std::string, Dali::TypeInfo::ActionFunction>;
+  using RegisteredPropertyPair   = std::pair<Property::Index, RegisteredProperty>;
+  using PropertyDefaultValuePair = std::pair<Property::Index, Property::Value>;
 
-  typedef std::vector< ActionPair > ActionContainer;
-  typedef std::vector< ConnectionPair > ConnectorContainer;
-  typedef std::vector< RegisteredPropertyPair > RegisteredPropertyContainer;
-  typedef std::vector< PropertyDefaultValuePair > PropertyDefaultValueContainer;
+  using ActionContainer               = std::vector<ActionPair>;
+  using ConnectorContainer            = std::vector<ConnectionPair>;
+  using RegisteredPropertyContainer   = std::vector<RegisteredPropertyPair>;
+  using PropertyDefaultValueContainer = std::vector<PropertyDefaultValuePair>;
 
   /**
    * Append properties from registeredProperties onto indices.
@@ -447,4 +447,4 @@ inline const Internal::TypeInfo& GetImplementation(const Dali::TypeInfo& typeInf
 
 } // namespace Dali
 
-#endif // header
+#endif // DALI_INTERNAL_TYPE_INFO_H