Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-demo.git] / examples / scripting / launcher.cpp

diff --git a/examples/scripting/launcher.cpp b/examples/scripting/launcher.cpp
index 9c48b3f..2362696 100644 (file)
--- a/examples/scripting/launcher.cpp
+++ b/examples/scripting/launcher.cpp
@@ -48,7 +48,6 @@ Launcher::Launcher( Dali::Application application, std::string layoutFileName, s
   mJSONFileName(layoutFileName ),
   mJavaScriptFileName( scriptFileName )
 {
-
   mApplication.InitSignal().Connect( this, &Launcher::Create );
 }
 
@@ -58,8 +57,6 @@ Launcher::~Launcher()
 
 void Launcher::Create( Dali::Application& application )
 {
-  DemoHelper::RequestThemeChange();
-
   TextLabel textActor = TextLabel::New( "JSON & JavaScript Launcher..." );
 
   // Reposition the actor
@@ -82,9 +79,9 @@ void Launcher::Create( Dali::Application& application )
     mBuilder = Toolkit::Builder::New();
 
     Property::Map defaultDirs;
-    defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ]  = DALI_IMAGE_DIR;
-    defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ]  = DALI_MODEL_DIR;
-    defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR;
+    defaultDirs[ TOKEN_STRING(DEMO_IMAGE_DIR) ]  = DEMO_IMAGE_DIR;
+    defaultDirs[ TOKEN_STRING(DEMO_MODEL_DIR) ]  = DEMO_MODEL_DIR;
+    defaultDirs[ TOKEN_STRING(DEMO_SCRIPT_DIR) ] = DEMO_SCRIPT_DIR;
     mBuilder.AddConstants( defaultDirs );
 
     std::string json_data(GetFileContents( mJSONFileName ));