Resolved build issues

Change-Id: I5bb037761641d9707f09ede2f695b95939c70998

diff --git a/lib-apps-common/src/Ui/Control.cpp b/lib-apps-common/src/Ui/Control.cpp
index ff9e73a63cc6d10b6e66b12bb5162bbfde0eed59..b1439643a4b273454dee6c92e3ee04a5889e307d 100644 (file)
--- a/lib-apps-common/src/Ui/Control.cpp
+++ b/lib-apps-common/src/Ui/Control.cpp
@@ -16,6 +16,7 @@
 
 #include "Ui/Control.h"
 #include "Utils/Callback.h"
+#include<efl_object.eo.h>
 
 #define EVENT_TYPE_CHECK "type_check"
 
@@ -112,7 +113,7 @@ Control *Control::findParent(Evas_Object *object, const std::type_info &type)
                if (auto control = getControl(object, type)) {
                        return control;
                }
-               eo_do(object, object = eo_parent_get());
+               object = elm_object_parent_widget_get(object);
        }
 
        return nullptr;

diff --git a/memo-app/src/Input/EntryItem.cpp b/memo-app/src/Input/EntryItem.cpp
index f335b328bf7616a80884315ba19e3e0795e2759d..e3428886d02d5d3c89cc58f276b121423ce1ad60 100644 (file)
--- a/memo-app/src/Input/EntryItem.cpp
+++ b/memo-app/src/Input/EntryItem.cpp
@@ -92,7 +92,7 @@ void EntryItem::setGuideText(const char *text)
 
 int EntryItem::getTextLength() const
 {
-       Evas_Textblock *textblock = elm_entry_textblock_get(m_Entry);
+       Evas_Object *textblock = elm_entry_textblock_get(m_Entry);
        Evas_Textblock_Cursor *cursor = evas_object_textblock_cursor_new(textblock);
        evas_textblock_cursor_paragraph_last(cursor);
        int length = evas_textblock_cursor_pos_get(cursor);
@@ -220,7 +220,7 @@ Evas_Object *EntryItem::onCreate(Evas_Object *parent)
 
 Evas_Textblock_Cursor *EntryItem::cloneCursor()
 {
-       Evas_Textblock *textblock = elm_entry_textblock_get(m_Entry);
+       Evas_Object *textblock = elm_entry_textblock_get(m_Entry);
        Evas_Textblock_Cursor *cursor = evas_object_textblock_cursor_get(textblock);
        Evas_Textblock_Cursor *clone = evas_object_textblock_cursor_new(textblock);
        evas_textblock_cursor_copy(cursor, clone);
@@ -229,7 +229,7 @@ Evas_Textblock_Cursor *EntryItem::cloneCursor()
 
 void EntryItem::splitText(Evas_Textblock_Cursor *cursor, char **textBefore, char **textAfter)
 {
-       Evas_Textblock *textblock = elm_entry_textblock_get(m_Entry);
+       Evas_Object *textblock = elm_entry_textblock_get(m_Entry);
        if (textBefore) {
                Evas_Textblock_Cursor *begin = evas_object_textblock_cursor_new(textblock);
                evas_textblock_cursor_paragraph_first(begin);
@@ -390,7 +390,7 @@ bool EntryItem::parseImageIndex(const Evas_Object_Textblock_Node_Format *formatN
 
 void EntryItem::updateImageSizes()
 {
-       Evas_Textblock *textblock = elm_entry_textblock_get(m_Entry);
+       Evas_Object *textblock = elm_entry_textblock_get(m_Entry);
        Evas_Textblock_Cursor *cursor = evas_object_textblock_cursor_new(textblock);
 
        auto node = evas_textblock_node_format_first_get(textblock);
@@ -486,7 +486,7 @@ void EntryItem::onBackspacePressed()
                return;
        }
 
-       Evas_Textblock *textblock = elm_entry_textblock_get(m_Entry);
+       Evas_Object *textblock = elm_entry_textblock_get(m_Entry);
        Evas_Textblock_Cursor *cursor = evas_object_textblock_cursor_new(textblock);
        evas_textblock_cursor_paragraph_char_last(cursor);
        removeLineFeed(cursor);
@@ -562,7 +562,7 @@ int EntryItem::getTextLimit()
 
 bool EntryItem::hasImage(int imageIndex)
 {
-       const Evas_Textblock_Node_Format *node = evas_textblock_node_format_first_get(elm_entry_textblock_get(m_Entry));
+       const Evas_Object_Textblock_Node_Format *node = evas_textblock_node_format_first_get(elm_entry_textblock_get(m_Entry));
        std::string imageFormat = TAG_HREF_ATTR + std::to_string(imageIndex);
 
        while (node) {