summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdeel Kazmi <adeel.kazmi@samsung.com>2015-03-03 09:14:21 +0000
committerAdeel Kazmi <adeel.kazmi@samsung.com>2015-03-03 12:12:22 +0000
commitfc66e673529d1efdf9a91b7ac91774b48f2435e0 (patch)
tree1f09093074f8fca57f8d5bdd097a503bfbb71988
parent59f4f73512ea99e5b6ddba6dec06bc01206c5254 (diff)
downloaddali-demo-fc66e673529d1efdf9a91b7ac91774b48f2435e0.tar.gz
dali-demo-fc66e673529d1efdf9a91b7ac91774b48f2435e0.tar.bz2
dali-demo-fc66e673529d1efdf9a91b7ac91774b48f2435e0.zip
Remove dependency on boost
Change-Id: I820263d4ae6973dd0a28bffb278de3b422c804ce
-rw-r--r--builder/dali-builder.cpp2
-rw-r--r--examples/blocks/blocks-example.cpp2
-rw-r--r--examples/builder/examples.cpp2
-rw-r--r--examples/new-window/new-window-example.cpp2
-rwxr-xr-xpackaging/com.samsung.dali-demo.spec1
5 files changed, 1 insertions, 8 deletions
diff --git a/builder/dali-builder.cpp b/builder/dali-builder.cpp
index 9f70d71f..1ce2ec44 100644
--- a/builder/dali-builder.cpp
+++ b/builder/dali-builder.cpp
@@ -35,9 +35,7 @@
#include <string>
#include <fstream>
#include <streambuf>
-#include <boost/scoped_ptr.hpp>
-//#include <boost/regex.hpp>
#include "sys/stat.h"
#include <ctime>
diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp
index e9a9b9ad..9cf43958 100644
--- a/examples/blocks/blocks-example.cpp
+++ b/examples/blocks/blocks-example.cpp
@@ -21,8 +21,6 @@
#include <map>
#include <algorithm>
-#include <boost/any.hpp>
-#include <boost/function.hpp>
#include <dali/dali.h>
#include <dali-toolkit/dali-toolkit.h>
#include "shared/view.h"
diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp
index 569aa830..bac5840b 100644
--- a/examples/builder/examples.cpp
+++ b/examples/builder/examples.cpp
@@ -30,12 +30,10 @@
#include <fstream>
#include <streambuf>
#include <sstream>
-#include <boost/scoped_ptr.hpp>
#include <dirent.h>
#include <stdio.h>
#include <iostream>
-//#include <boost/regex.hpp>
#include "sys/stat.h"
#include <ctime>
diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp
index c0642acd..59523083 100644
--- a/examples/new-window/new-window-example.cpp
+++ b/examples/new-window/new-window-example.cpp
@@ -182,7 +182,7 @@ void NewWindowController::Destroy( Application& app )
bool NewWindowController::OnLoseContextButtonClicked( Toolkit::Button button )
{
// Add as an idle callback to avoid ProcessEvents being recursively called.
- mApplication.AddIdle(NewWindowController::NewWindow);
+ mApplication.AddIdle( MakeCallback( NewWindowController::NewWindow ) );
return true;
}
diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index b2a65fde..23c798e4 100755
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -15,7 +15,6 @@ Requires: dali
Requires: dali-adaptor
Requires: dali-toolkit
BuildRequires: cmake
-BuildRequires: boost-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig(capi-appfw-application)
BuildRequires: pkgconfig(capi-media-player)