use modern construct 'override' in the derive class.

[platform/core/uifw/dali-core.git] / dali / internal / event / common / property-notification-impl.h

diff --git a/dali/internal/event/common/property-notification-impl.h b/dali/internal/event/common/property-notification-impl.h
index 03e2d58..e89f413 100644 (file)
--- a/dali/internal/event/common/property-notification-impl.h
+++ b/dali/internal/event/common/property-notification-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PROPERTY_NOTIFICATION_H__
-#define __DALI_INTERNAL_PROPERTY_NOTIFICATION_H__
+#ifndef DALI_INTERNAL_PROPERTY_NOTIFICATION_H
+#define DALI_INTERNAL_PROPERTY_NOTIFICATION_H
 
 /*
- * Copyright (c) 2015 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.
@@ -43,7 +43,7 @@ class PropertyNotification;
 class Object;
 class PropertyNotificationManager;
 
-typedef IntrusivePtr<PropertyNotification> PropertyNotificationPtr;
+using PropertyNotificationPtr = IntrusivePtr<PropertyNotification>;
 
 /**
  * PropertyNotification is a proxy for a SceneGraph::PropertyNotification object.
@@ -53,14 +53,13 @@ typedef IntrusivePtr<PropertyNotification> PropertyNotificationPtr;
 class PropertyNotification : public BaseObject
 {
 public:
-
-  typedef Dali::PropertyNotification::NotifyMode NotifyMode;
-  typedef PropertyCondition::Type ConditionType;
+  using NotifyMode    = Dali::PropertyNotification::NotifyMode;
+  using ConditionType = PropertyCondition::Type;
 
   /**
    * RawArgumentContainer provides fast direct access to arguments for condition evaluation.
    */
-  typedef Dali::Vector<float> RawArgumentContainer;
+  using RawArgumentContainer = Dali::Vector<float>;
 
   /**
    * Create a new PropertyNotification object.
@@ -168,7 +167,7 @@ protected:
   /**
    * A reference counted object may only be deleted by calling Unreference()
    */
-  virtual ~PropertyNotification();
+  ~PropertyNotification() override;
 
 private:
 
@@ -196,6 +195,7 @@ private:
   RawArgumentContainer         mRawConditionArgs;             ///< The Raw Condition args. (float type)
   NotifyMode                   mNotifyMode;                   ///< The current notification mode.
   bool                         mNotifyResult;                 ///< The result of the last condition check that caused a signal emit
+  bool                         mCompare;                      ///< The flag of comparing previous property's raw value and current.
 };
 
 } // namespace Internal
@@ -222,4 +222,4 @@ inline const Internal::PropertyNotification& GetImplementation(const Dali::Prope
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PROPERTY_NOTIFICATION_H__
+#endif // DALI_INTERNAL_PROPERTY_NOTIFICATION_H