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

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / popup / confirmation-popup-impl.cpp

diff --git a/dali-toolkit/internal/controls/popup/confirmation-popup-impl.cpp b/dali-toolkit/internal/controls/popup/confirmation-popup-impl.cpp
index cb0c9e9..b521cff 100644 (file)
--- a/dali-toolkit/internal/controls/popup/confirmation-popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/confirmation-popup-impl.cpp
@@ -19,7 +19,6 @@
 #include "confirmation-popup-impl.h"
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/devel-api/object/type-registry-helper.h>
@@ -52,8 +51,8 @@ struct ControlDetailType
  *  the app-developer      | which will provide   | app developer choose which signal
  *  can connect to.        | the signal.          | within the control to connect to.    */
 const ControlDetailType ControlDetails[] = {
-  { "control-signal-ok",     "control-ok",          "connect-signal-ok-selected"     },
-  { "control-signal-cancel", "control-cancel",      "connect-signal-cancel-selected" },
+  { "controlSignalOk",       "controlOk",           "connectSignalOkSelected"     },
+  { "controlSignalCancel",   "controlCancel",       "connectSignalCancelSelected" },
 };
 const unsigned int ControlDetailsCount = sizeof( ControlDetails ) / sizeof( ControlDetails[0] );