Remove popup dependency from wrt-commons

[platform/framework/web/wrt-plugins-common.git] / src / wrt-popup / wrt / popup-bin / YesNoPopup.cpp

diff --git a/src/wrt-popup/wrt/popup-bin/YesNoPopup.cpp b/src/wrt-popup/wrt/popup-bin/YesNoPopup.cpp
index 10235fe..9f7646b 100644 (file)
--- a/src/wrt-popup/wrt/popup-bin/YesNoPopup.cpp
+++ b/src/wrt-popup/wrt/popup-bin/YesNoPopup.cpp
@@ -23,7 +23,7 @@
 #include "YesNoPopup.h"
 #include <memory>
 #include <string.h>
-#include <dpl/popup/popup_manager.h>
+#include "popup_manager.h"
 #include "PopupSerializer.h"
 
 namespace {
@@ -36,8 +36,6 @@ const int POPUP_NO_VALUE = 2;
 namespace Wrt {
 namespace Popup {
 
-using namespace DPL::Popup;
-
 void YesNoPopup::show(DPL::BinaryQueueAutoPtr data, WrtPopup* parent)
 {
     LogDebug("Entered");
@@ -48,29 +46,30 @@ void YesNoPopup::show(DPL::BinaryQueueAutoPtr data, WrtPopup* parent)
 
     m_parent = parent;
 
-    CtrlPopupPtr popup = PopupControllerSingleton::Instance().CreatePopup();
+    Renderer::CtrlPopupPtr popup =
+        Renderer::PopupControllerSingleton::Instance().CreatePopup();
 
     popup->SetTitle(title);
-    popup->Append(new PopupObject::Label(message));
+    popup->Append(new Renderer::PopupObject::Label(message));
 
-    popup->Append(new PopupObject::Button(YES_LABEL, POPUP_YES_VALUE));
-    popup->Append(new PopupObject::Button(NO_LABEL, POPUP_NO_VALUE));
+    popup->Append(new Renderer::PopupObject::Button(YES_LABEL, POPUP_YES_VALUE));
+    popup->Append(new Renderer::PopupObject::Button(NO_LABEL, POPUP_NO_VALUE));
 
     ListenForAnswer(popup);
 
-    ShowPopupEventShort event(popup,
-                              MakeAnswerCallback(
-                                     this,
-                                     &YesNoPopup::responseCallback));
+    Renderer::ShowPopupEventShort event(popup,
+                                        MakeAnswerCallback(
+                                            this,
+                                            &YesNoPopup::responseCallback));
 
-    CONTROLLER_POST_EVENT(PopupController,
+    CONTROLLER_POST_EVENT(Renderer::PopupController,
                           event);
 
     LogDebug("Exited");
     return;
 }
 
-void YesNoPopup::responseCallback(const DPL::Popup::AnswerCallbackData &answer)
+void YesNoPopup::responseCallback(const Renderer::AnswerCallbackData &answer)
 {
     bool result = (POPUP_YES_VALUE == answer.buttonAnswer);
     DPL::BinaryQueue retValue;