[dali_1.2.61] Merge branch 'devel/master'

[platform/core/uifw/dali-demo.git] / examples / line-mesh / line-mesh-example.cpp

diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp
index d642450..24d1504 100644 (file)
--- a/examples/line-mesh/line-mesh-example.cpp
+++ b/examples/line-mesh/line-mesh-example.cpp
@@ -16,10 +16,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
 // INTERNAL INCLUDES
 #include "shared/view.h"
@@ -246,7 +243,7 @@ public:
 
       radio.SetProperty( Toolkit::Button::Property::LABEL,
                                  Property::Map()
-                                  .Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+                                  .Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
                                   .Add( Toolkit::TextVisual::Property::TEXT, labels[i] )
                                   .Add( Toolkit::TextVisual::Property::TEXT_COLOR, Vector4( 0.8f, 0.8f, 0.8f, 1.0f ) )
                                );
@@ -268,12 +265,12 @@ public:
     elementCountTableView.SetFitWidth( 1 );
     elementCountTableView.SetFitWidth( 2 );
     mMinusButton = Toolkit::PushButton::New();
-    mMinusButton.SetLabelText( "<<" );
+    mMinusButton.SetProperty( Toolkit::Button::Property::LABEL, "<<" );
     mMinusButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
     mMinusButton.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
 
     Toolkit::PushButton mPlusButton = Toolkit::PushButton::New();
-    mPlusButton.SetLabelText( ">>" );
+    mPlusButton.SetProperty( Toolkit::Button::Property::LABEL, ">>" );
     mPlusButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
     mPlusButton.SetAnchorPoint( AnchorPoint::CENTER_RIGHT );
 
@@ -394,20 +391,10 @@ private:
   int      mMaxIndexCount;
 };
 
-void RunTest( Application& application )
-{
-  ExampleController test( application );
-
-  application.MainLoop();
-}
-
-// Entry point for Linux & SLP applications
-//
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv );
-
-  RunTest( application );
-
+  ExampleController test( application );
+  application.MainLoop();
   return 0;
 }