Updates following boost::function removal from adaptor

Still to do - Remove boost::function from builder

Change-Id: Ica46c381bbd03f1bab3fd664b24b4a15b503f5e9

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
index 799b5d5..6a4b122 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-manager.h
@@ -23,7 +23,6 @@
 
 // EXTERNAL INCLUDES
 #include <string>
-#include <boost/function.hpp>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal.h>
 #include <dali/public-api/events/touch-point.h>

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
index 8ffff96..0532266 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
@@ -17,8 +17,6 @@
 
 #include "toolkit-application.h"
 
-#include <boost/any.hpp>
-
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/signals/dali-signal.h>
 #include <dali/public-api/adaptor-framework/orientation.h>

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
index 470db7e..0aee8ec 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
@@ -19,7 +19,6 @@
 #include "toolkit-imf-manager.h"
 
 // EXTERNAL INCLUDES
-#include <boost/bind.hpp>
 #include <dali/public-api/object/base-object.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/events/key-event-integ.h>

diff --git a/docs/content/main-page.h b/docs/content/main-page.h
index b7b86be..f742f01 100644 (file)
--- a/docs/content/main-page.h
+++ b/docs/content/main-page.h
@@ -54,8 +54,6 @@
  * - \link script-hello Hello World in script \endlink
  *
  * - \link handle-body-idiom Handle – body idiom \endlink
- * - \link boost-library Boost Library \endlink
- * - \link boost-function Boost function usage \endlink
  *
  * \section Rendering
  * - \link viewing-modes Viewing modes \endlink

diff --git a/docs/content/programming-guide/boost-function.h b/docs/content/programming-guide/boost-function.h
deleted file mode 100644 (file)
index 2d1392d..0000000
--- a/docs/content/programming-guide/boost-function.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*! \page boost-function Boost function usage
-<h2 class="pg">Signal handler functions</h2>
- boost::function is mostly used to define callback function types in Dali.
- For example in text-actor.h:
- \code
-class TextActor : public RenderableActor
-{
-public:
-   ...
-   typedef boost::function<void (TextActor)> TextCallbackType;
-   typedef Signal<TextSignalType, TextCallbackType> TextSignal;
-
-public:
-     TextSignal SignalTextAvailable();
-    ...
- }
- \endcode
-
- \p "boost::function<void (TextActor)>" specifies a function type which has no return value and takes \p TextActor as an argument.
- The application can set a function of this type to be called when the text available signal is emitted.
-
- <h2 class="pg">Specifying custom functions (eg. sorting)</h2>
- Dali::Layer::SetSortFunction() is an example where the developer should use a boost function in order to specify the sorting algorithm.\n
- This API accepts both standalone functions or class methods.\n
- Standalone functions can be simply given as:
- \code
- static float TestSortFunction(const Vector3& position, float sortModifier)
- {
-   // do something
- }
-
- void TestApp::SetRootSort()
- {
-   Layer root = Stage::GetCurrent().GetLayer( 0 );
-   root.SetSortFunction(TestSortFunction);
- }
- \endcode
- For member functions \b binding needs to be done:
- \code
- float TestApp::TestSortFunction(const Vector3& position, float sortModifier)
- {
-   // do something
- }
-
- void TestApp::SetRootSort()
- {
-   Layer root = Stage::GetCurrent().GetLayer( 0 );
-   root.SetSortFunction(boost::bind(&TestApp::TestSortFunction, this));
- }
- \endcode
- \n\n
- For more information please see <a href="http://www.boost.org/doc/">the boost project documentation</a>.
-
- */
-

diff --git a/docs/content/programming-guide/boost-library.h b/docs/content/programming-guide/boost-library.h
deleted file mode 100644 (file)
index 84b5453..0000000
--- a/docs/content/programming-guide/boost-library.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*! \page boost-library Boost Library
-
-  Boost is a set of free software libraries that extend the functionality of C++.
-
-  Dali API uses the following aspects of boost:
-  - \link boost-function Boost functions\endlink
-
-  For more information on the Boost library check the project's <a href="http://www.boost.org/doc/">website</a>.
- */

diff --git a/docs/content/programming-guide/script-howto.h b/docs/content/programming-guide/script-howto.h
index 9a1632b..b9d3da0 100644 (file)
--- a/docs/content/programming-guide/script-howto.h
+++ b/docs/content/programming-guide/script-howto.h
@@ -41,7 +41,7 @@
  *   return MyActor::New();
  * }
  *
- * Dali::Connection MyActor::DoConnectSignalCustom(BaseObject* object, const std::string& signalName, SignalCallback callback)
+ * Dali::Connection MyActor::DoConnectSignalCustom(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor)
  * {
  *   Dali::Connection connection ;
  *
@@ -49,7 +49,7 @@
  *
  *   if(actor && "page-changed" == signalName)
  *   {
- *     connection = return actor->SignalPageChanged().Connect((boost::lambda::bind(callback)));
+ *     connection = return actor->PageChangedSignal().Connect( tracker, functor );
  *   }
  *
  *   return connection ;