Revert "[3.0] (KeyboardFocusManager) Fixed ConnectSignal handling & SVACE error"

This reverts commit 63c3a7fbab95e9fe6ef276cdf06051302cedccdd.
Change-Id: I5dfb6af9f612843832930e3e879b8efd4010aa7b

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
index 6ef6e9e..95a6eb5 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * 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.
@@ -175,20 +175,9 @@ public:
   Actor mActivatedActor;
 };
 
-// Used to connect to signals via the ConnectSignal Handle method
-struct CallbackFunctor
-{
-  CallbackFunctor()
-  {
-  }
-
-  void operator()()
-  {
-  }
-};
-
 } // namespace
 
+
 int UtcDaliKeyboardFocusManagerGet(void)
 {
   ToolkitTestApplication application;
@@ -679,19 +668,3 @@ int UtcDaliKeyboardFocusManagerSignalFocusGroupChanged(void)
   focusGroupChangedCallback.Reset();
   END_TEST;
 }
-
-int UtcDaliKeyboardFocusManagerSignals(void)
-{
-  ToolkitTestApplication application;
-
-  KeyboardFocusManager manager = KeyboardFocusManager::Get();
-  DALI_TEST_CHECK( manager );
-
-  ConnectionTracker* testTracker = new ConnectionTracker();
-  DALI_TEST_EQUALS( true, manager.ConnectSignal( testTracker, "keyboardPreFocusChange", CallbackFunctor() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, manager.ConnectSignal( testTracker, "keyboardFocusChanged", CallbackFunctor() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, manager.ConnectSignal( testTracker, "keyboardFocusGroupChanged", CallbackFunctor() ), TEST_LOCATION );
-  DALI_TEST_EQUALS( true, manager.ConnectSignal( testTracker, "keyboardFocusedActorEnterKey", CallbackFunctor() ), TEST_LOCATION );
-
-  END_TEST;
-}

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 54d8afa..3f9a81d 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -707,17 +707,17 @@ bool KeyboardFocusManager::DoConnectSignal( BaseObject* object, ConnectionTracke
   Dali::BaseHandle handle( object );
 
   bool connected( true );
-  KeyboardFocusManager* manager = static_cast< KeyboardFocusManager* >( object ); // TypeRegistry guarantees that this is the correct type.
+  KeyboardFocusManager* manager = dynamic_cast<KeyboardFocusManager*>( object );
 
   if( 0 == strcmp( signalName.c_str(), SIGNAL_PRE_FOCUS_CHANGE ) )
   {
     manager->PreFocusChangeSignal().Connect( tracker, functor );
   }
-  else if( 0 == strcmp( signalName.c_str(), SIGNAL_FOCUS_CHANGED ) )
+  if( 0 == strcmp( signalName.c_str(), SIGNAL_FOCUS_CHANGED ) )
   {
     manager->FocusChangedSignal().Connect( tracker, functor );
   }
-  else if( 0 == strcmp( signalName.c_str(), SIGNAL_FOCUS_GROUP_CHANGED ) )
+  if( 0 == strcmp( signalName.c_str(), SIGNAL_FOCUS_GROUP_CHANGED ) )
   {
     manager->FocusGroupChangedSignal().Connect( tracker, functor );
   }

diff --git a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
index 457f222..96bbed0 100644 (file)
--- a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
+++ b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_KEYBOARD_FOCUS_MANAGER_H__
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -46,12 +46,12 @@ class KeyboardFocusManager;
  * is changed.
  *
  * Signals
- * | %Signal Name                 | Method                             |
- * |------------------------------|------------------------------------|
- * | keyboardPreFocusChange       | @ref PreFocusChangeSignal()        |
- * | keyboardFocusChanged         | @ref FocusChangedSignal()          |
- * | keyboardFocusGroupChanged    | @ref FocusGroupChangedSignal()     |
- * | keyboardFocusedActorEnterKey | @ref FocusedActorEnterKeySignal()  |
+ * | %Signal Name                  | Method                             |
+ * |-------------------------------|------------------------------------|
+ * | keyboardPreFocusChange        | @ref PreFocusChangeSignal()        |
+ * | keyboardFocusChanged          | @ref FocusChangedSignal()          |
+ * | keyboardFocusGroupChanged     | @ref FocusGroupChangedSignal()     |
+ * | keyboardFocusedActorAenterKey | @ref FocusedActorEnterKeySignal()  |
  * @SINCE_1_0.0
  */
 class DALI_IMPORT_API KeyboardFocusManager : public BaseHandle