[dali_1.0.21] Merge branch 'tizen'

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-imf-manager.h

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
index 856c943..2ac731f 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
@@ -1,5 +1,5 @@
-#ifndef _DALI_ADAPTOR_IMF_MANAGER_H_
-#define _DALI_ADAPTOR_IMF_MANAGER_H_
+#ifndef __DALI_TOOLKIT_TOOLKIT_IMF_MANAGER_H__
+#define __DALI_TOOLKIT_TOOLKIT_IMF_MANAGER_H__
 
 /*
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#define IMFMANAGER_H
+#define __DALI_IMF_MANAGER_H__
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal-v2.h>
 
@@ -211,9 +211,9 @@ public:
   ImfManager();
 
   /**
-   * Virtual destructor.
+   * Non virtual destructor.
    */
-  virtual ~ImfManager();
+  ~ImfManager();
 
   /**
    * This constructor is used by ImfManager::Get().
@@ -224,4 +224,4 @@ public:
 
 } // namespace Dali
 
-#endif // _DALI_ADAPTOR_IMF_MANAGER_H_
+#endif // __DALI_TOOLKIT_TOOLKIT_IMF_MANAGER_H__