Commit fc66e673529d1efdf9a91b7ac91774b48f2435e0
1 parent
59f4f735
Remove dependency on boost
Change-Id: I820263d4ae6973dd0a28bffb278de3b422c804ce
Showing
5 changed files
with
1 additions
and
8 deletions
builder/dali-builder.cpp
| @@ -35,9 +35,7 @@ | @@ -35,9 +35,7 @@ | ||
| 35 | #include <string> | 35 | #include <string> |
| 36 | #include <fstream> | 36 | #include <fstream> |
| 37 | #include <streambuf> | 37 | #include <streambuf> |
| 38 | -#include <boost/scoped_ptr.hpp> | ||
| 39 | 38 | ||
| 40 | -//#include <boost/regex.hpp> | ||
| 41 | #include "sys/stat.h" | 39 | #include "sys/stat.h" |
| 42 | #include <ctime> | 40 | #include <ctime> |
| 43 | 41 |
examples/blocks/blocks-example.cpp
| @@ -21,8 +21,6 @@ | @@ -21,8 +21,6 @@ | ||
| 21 | #include <map> | 21 | #include <map> |
| 22 | #include <algorithm> | 22 | #include <algorithm> |
| 23 | 23 | ||
| 24 | -#include <boost/any.hpp> | ||
| 25 | -#include <boost/function.hpp> | ||
| 26 | #include <dali/dali.h> | 24 | #include <dali/dali.h> |
| 27 | #include <dali-toolkit/dali-toolkit.h> | 25 | #include <dali-toolkit/dali-toolkit.h> |
| 28 | #include "shared/view.h" | 26 | #include "shared/view.h" |
examples/builder/examples.cpp
| @@ -30,12 +30,10 @@ | @@ -30,12 +30,10 @@ | ||
| 30 | #include <fstream> | 30 | #include <fstream> |
| 31 | #include <streambuf> | 31 | #include <streambuf> |
| 32 | #include <sstream> | 32 | #include <sstream> |
| 33 | -#include <boost/scoped_ptr.hpp> | ||
| 34 | #include <dirent.h> | 33 | #include <dirent.h> |
| 35 | #include <stdio.h> | 34 | #include <stdio.h> |
| 36 | #include <iostream> | 35 | #include <iostream> |
| 37 | 36 | ||
| 38 | -//#include <boost/regex.hpp> | ||
| 39 | #include "sys/stat.h" | 37 | #include "sys/stat.h" |
| 40 | #include <ctime> | 38 | #include <ctime> |
| 41 | 39 |
examples/new-window/new-window-example.cpp
| @@ -182,7 +182,7 @@ void NewWindowController::Destroy( Application& app ) | @@ -182,7 +182,7 @@ void NewWindowController::Destroy( Application& app ) | ||
| 182 | bool NewWindowController::OnLoseContextButtonClicked( Toolkit::Button button ) | 182 | bool NewWindowController::OnLoseContextButtonClicked( Toolkit::Button button ) |
| 183 | { | 183 | { |
| 184 | // Add as an idle callback to avoid ProcessEvents being recursively called. | 184 | // Add as an idle callback to avoid ProcessEvents being recursively called. |
| 185 | - mApplication.AddIdle(NewWindowController::NewWindow); | 185 | + mApplication.AddIdle( MakeCallback( NewWindowController::NewWindow ) ); |
| 186 | return true; | 186 | return true; |
| 187 | } | 187 | } |
| 188 | 188 |
packaging/com.samsung.dali-demo.spec
| @@ -15,7 +15,6 @@ Requires: dali | @@ -15,7 +15,6 @@ Requires: dali | ||
| 15 | Requires: dali-adaptor | 15 | Requires: dali-adaptor |
| 16 | Requires: dali-toolkit | 16 | Requires: dali-toolkit |
| 17 | BuildRequires: cmake | 17 | BuildRequires: cmake |
| 18 | -BuildRequires: boost-devel | ||
| 19 | BuildRequires: pkgconfig | 18 | BuildRequires: pkgconfig |
| 20 | BuildRequires: pkgconfig(capi-appfw-application) | 19 | BuildRequires: pkgconfig(capi-appfw-application) |
| 21 | BuildRequires: pkgconfig(capi-media-player) | 20 | BuildRequires: pkgconfig(capi-media-player) |