Merge "Remove unnecessary method from control-impl" into tizen

diff --combined base/dali-toolkit/public-api/controls/control-impl.cpp
index 99174c4,7fcbf76..e45436f
--- 1/base/dali-toolkit/public-api/controls/control-impl.cpp
--- 2/base/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/base/dali-toolkit/public-api/controls/control-impl.cpp
@@@ -76,12 -76,6 +76,12 @@@ TypeRegistration CONTROL_TYPE( typeid(C
  
  TypeAction ACTION_TYPE_1( CONTROL_TYPE, Toolkit::Control::ACTION_CONTROL_ACTIVATED, &Internal::Control::DoAction );
  
 +SignalConnectorType SIGNAL_CONNECTOR_1( CONTROL_TYPE, Toolkit::Control::SIGNAL_KEY_EVENT,     &Internal::Control::DoConnectSignal );
 +SignalConnectorType SIGNAL_CONNECTOR_2( CONTROL_TYPE, Toolkit::Control::SIGNAL_TAPPED,        &Internal::Control::DoConnectSignal );
 +SignalConnectorType SIGNAL_CONNECTOR_3( CONTROL_TYPE, Toolkit::Control::SIGNAL_PANNED,        &Internal::Control::DoConnectSignal );
 +SignalConnectorType SIGNAL_CONNECTOR_4( CONTROL_TYPE, Toolkit::Control::SIGNAL_PINCHED,       &Internal::Control::DoConnectSignal );
 +SignalConnectorType SIGNAL_CONNECTOR_5( CONTROL_TYPE, Toolkit::Control::SIGNAL_LONG_PRESSED,  &Internal::Control::DoConnectSignal );
 +
  /**
   * Structure which holds information about the background of a control
   */
@@@ -951,50 -945,6 +951,50 @@@ bool Control::DoAction(BaseObject* obje
    return ret;
  }
  
 +bool Control::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
 +{
 +  Dali::BaseHandle handle( object );
 +
 +  bool connected( false );
 +  Toolkit::Control control = Toolkit::Control::DownCast(handle);
 +  if ( control )
 +  {
 +    Control& controlImpl( control.GetImplementation() );
 +    connected = true;
 +
 +    if ( Toolkit::Control::SIGNAL_KEY_EVENT == signalName )
 +    {
 +      controlImpl.KeyEventSignal().Connect( tracker, functor );
 +    }
 +    else if( Toolkit::Control::SIGNAL_TAPPED == signalName )
 +    {
 +      controlImpl.EnableGestureDetection( Gesture::Tap );
 +      controlImpl.GetTapGestureDetector().DetectedSignal().Connect( tracker, functor );
 +    }
 +    else if( Toolkit::Control::SIGNAL_PANNED == signalName )
 +    {
 +      controlImpl.EnableGestureDetection( Gesture::Pan );
 +      controlImpl.GetPanGestureDetector().DetectedSignal().Connect( tracker, functor );
 +    }
 +    else if( Toolkit::Control::SIGNAL_PINCHED == signalName )
 +    {
 +      controlImpl.EnableGestureDetection( Gesture::Pinch );
 +      controlImpl.GetPinchGestureDetector().DetectedSignal().Connect( tracker, functor );
 +    }
 +    else if( Toolkit::Control::SIGNAL_LONG_PRESSED == signalName )
 +    {
 +      controlImpl.EnableGestureDetection( Gesture::LongPress );
 +      controlImpl.GetLongPressGestureDetector().DetectedSignal().Connect( tracker, functor );
 +    }
 +    else
 +    {
 +      // signalName does not match any signal
 +      connected = false;
 +    }
 +  }
 +  return connected;
 +}
 +
  void Control::DoStyleChange( Toolkit::StyleManager styleManager, StyleChange change )
  {
    if( change.themeChange )
@@@ -1330,11 -1280,6 +1330,6 @@@ void Control::SignalDisconnected( SlotO
    mImpl->SignalDisconnected( slotObserver, callback );
  }
  
- std::size_t Control::GetConnectionCount() const
- {
-   return mImpl->GetConnectionCount();
- }
- 
  Control::Control( ControlBehaviour behaviourFlags )
  : CustomActorImpl( behaviourFlags & REQUIRES_TOUCH_EVENTS ),
    mImpl(new Impl(*this))

diff --combined base/dali-toolkit/public-api/controls/control-impl.h
index 71ffabc,fb2d062..fdcc05f
--- 1/base/dali-toolkit/public-api/controls/control-impl.h
--- 2/base/dali-toolkit/public-api/controls/control-impl.h
+++ b/base/dali-toolkit/public-api/controls/control-impl.h
@@@ -179,17 -179,6 +179,17 @@@ public
    static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes);
  
    /**
 +   * Connects a callback function with the object's signals.
 +   * @param[in] object The object providing the signal.
 +   * @param[in] tracker Used to disconnect the signal.
 +   * @param[in] signalName The signal to connect to.
 +   * @param[in] functor A newly allocated FunctorDelegate.
 +   * @return True if the signal was connected.
 +   * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor.
 +   */
 +  static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 +
 +  /**
     * @brief If deriving classes wish to fine tune pinch gesture
     * detection then they can access the gesture detector through this
     * API and modify the detection.
@@@ -649,11 -638,6 +649,6 @@@ public
     */
    virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback );
  
-   /**
-    * @copydoc ConnectionTrackerInterface::GetConnectionCount
-    */
-   virtual std::size_t GetConnectionCount() const;
- 
  protected:
  
    /**