Use modern construct 'using' instead of typedef.

[platform/core/uifw/dali-core.git] / dali / public-api / signals / functor-delegate.h

diff --git a/dali/public-api/signals/functor-delegate.h b/dali/public-api/signals/functor-delegate.h
index 60c6795..7832173 100644 (file)
--- a/dali/public-api/signals/functor-delegate.h
+++ b/dali/public-api/signals/functor-delegate.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_FUNCTOR_DELEGATE_H__
-#define __DALI_FUNCTOR_DELEGATE_H__
+#ifndef DALI_FUNCTOR_DELEGATE_H
+#define DALI_FUNCTOR_DELEGATE_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.
@@ -73,7 +73,7 @@ struct FunctorDestroyer
  * @brief Used to connect a void() functor to a signal via BaseObject::SignalConnect().
  * @SINCE_1_0.0
  */
-class DALI_IMPORT_API FunctorDelegate
+class DALI_CORE_API FunctorDelegate
 {
 public:
 
@@ -110,13 +110,13 @@ private:
    * @brief Used to call the correct function.
    * @SINCE_1_0.0
    */
-  typedef void (*Dispatcher)( void* objectPtr );
+  using Dispatcher = void ( * )( void* );
 
   /**
    * @brief Used to destroy mObjectPointer.
    * @SINCE_1_0.0
    */
-  typedef void(*Destructor)( void* objectPtr );
+  using Destructor = void ( * )( void* );
 
   /**
    * @brief Not defined.
@@ -152,4 +152,4 @@ public: // Data for deriving classes & Dispatchers
  */
 } // namespace DALI
 
-#endif // __DALI_FUNCTOR_DELEGATE_H__
+#endif // DALI_FUNCTOR_DELEGATE_H