From c8fee7e69df1ab2bdb5ae06071320542472aaf8e Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 3 Mar 2015 09:40:07 +0000 Subject: [PATCH] Updates following boost::function removal from adaptor Still to do - Remove boost::function from builder Change-Id: Ica46c381bbd03f1bab3fd664b24b4a15b503f5e9 --- .../toolkit-accessibility-manager.h | 1 - .../toolkit-application.cpp | 2 - .../toolkit-imf-manager.cpp | 1 - docs/content/main-page.h | 2 - docs/content/programming-guide/boost-function.h | 55 ---------------------- docs/content/programming-guide/boost-library.h | 9 ---- docs/content/programming-guide/script-howto.h | 4 +- 7 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 docs/content/programming-guide/boost-function.h delete mode 100644 docs/content/programming-guide/boost-library.h 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 --- 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 -#include #include #include #include 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 --- 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 - #include #include #include 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 --- 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 #include #include #include diff --git a/docs/content/main-page.h b/docs/content/main-page.h index b7b86be..f742f01 100644 --- 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 index 2d1392d..0000000 --- a/docs/content/programming-guide/boost-function.h +++ /dev/null @@ -1,55 +0,0 @@ -/*! \page boost-function Boost function usage -

Signal handler functions

- 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 TextCallbackType; - typedef Signal TextSignal; - -public: - TextSignal SignalTextAvailable(); - ... - } - \endcode - - \p "boost::function" 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. - -

Specifying custom functions (eg. sorting)

- 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 the boost project documentation. - - */ - diff --git a/docs/content/programming-guide/boost-library.h b/docs/content/programming-guide/boost-library.h deleted file mode 100644 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 website. - */ diff --git a/docs/content/programming-guide/script-howto.h b/docs/content/programming-guide/script-howto.h index 9a1632b..b9d3da0 100644 --- 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 ; -- 2.7.4