X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-imf-manager.h;h=842078bb870be6309122f4f6d9dae66ba5a9b75d;hb=03c2c6f58b8812f93b2a396a22a26817aec2ad71;hp=2da670a2952ee1edce32e32ac6a07eb40956115c;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 2da670a..842078b 100644
--- 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,26 +1,27 @@
-#ifndef _DALI_ADAPTOR_IMF_MANAGER_H_
-#define _DALI_ADAPTOR_IMF_MANAGER_H_
-
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+#ifndef __DALI_TOOLKIT_TOOLKIT_IMF_MANAGER_H__
+#define __DALI_TOOLKIT_TOOLKIT_IMF_MANAGER_H__
+
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // 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>
+#include <dali/public-api/signals/dali-signal.h>
 
 namespace Dali DALI_IMPORT_API
 {
@@ -108,9 +109,9 @@ public:
     bool preeditResetRequired; // flag if preedit reset is required.
   };
 
-  typedef SignalV2< void (ImfManager&) > ImfManagerSignalV2;
+  typedef Signal< void (ImfManager&) > ImfManagerSignalType;
 
-  typedef SignalV2< ImfCallbackData ( ImfManager&, const ImfEventData& ) > ImfEventSignalV2;
+  typedef Signal< ImfCallbackData ( ImfManager&, const ImfEventData& ) > ImfEventSignalType;
 
 public:
 
@@ -150,7 +151,7 @@ public:
    * Set status whether the IMF has to restore the keyboard after losing focus.
    * @param[in] toggle True means that keyboard should be restored after focus lost and regained.
    */
-  void SetRestoreAferFocusLost( bool toggle );
+  void SetRestoreAfterFocusLost( bool toggle );
 
   /**
    * Send message reset the pred-edit state / imf module.  Used to interupt pre-edit state maybe due to a touch input.
@@ -194,13 +195,13 @@ public:
    * This is emitted when the virtual keyboard is connected to or the hardware keyboard is activated.
    * @return The IMF Activated signal.
    */
-  ImfManagerSignalV2& ActivatedSignal();
+  ImfManagerSignalType& ActivatedSignal();
 
   /**
    * This is emitted when the IMF manager receives an event from the IMF
    * @return The Event signal containing the event data.
    */
-  ImfEventSignalV2& EventReceivedSignal();
+  ImfEventSignalType& EventReceivedSignal();
 
   // Construction & Destruction
 
@@ -210,9 +211,9 @@ public:
   ImfManager();
 
   /**
-   * Virtual destructor.
+   * Non virtual destructor.
    */
-  virtual ~ImfManager();
+  ~ImfManager();
 
   /**
    * This constructor is used by ImfManager::Get().
@@ -223,4 +224,4 @@ public:
 
 } // namespace Dali
 
-#endif // _DALI_ADAPTOR_IMF_MANAGER_H_
+#endif // __DALI_TOOLKIT_TOOLKIT_IMF_MANAGER_H__