Fix the Coding rule

Change-Id: I581cfe0dcd8bdb7cb261d0dcf3d2012a34b1e46c
Signed-off-by: cookie <cookie@samsung.com>

diff --git a/services/BookmarkFlowUI/BookmarkFlowUI.cpp b/services/BookmarkFlowUI/BookmarkFlowUI.cpp
index 138afeba546f57d8a35399826366b4089be05f0d..42c3885323cc5b7164dabfd9d799cf21986af264 100755 (executable)
--- a/services/BookmarkFlowUI/BookmarkFlowUI.cpp
+++ b/services/BookmarkFlowUI/BookmarkFlowUI.cpp
@@ -75,7 +75,7 @@ BookmarkFlowUI::~BookmarkFlowUI()
     evas_object_smart_callback_del(m_cancel_button, "clicked", _cancel_clicked);
     evas_object_smart_callback_del(m_entry, "focused", _entry_focused);
     evas_object_smart_callback_del(m_entry, "unfocused", _entry_unfocused);
-    evas_object_smart_callback_del(m_entry, "changed,user",_entry_changed);
+    evas_object_smart_callback_del(m_entry, "changed,user", _entry_changed);
     evas_object_smart_callback_del(m_input_cancel_button, "clicked", _inputCancel_clicked);
     evas_object_smart_callback_del(m_folder_button, "clicked", _folder_clicked);
     evas_object_smart_callback_del(m_remove_button, "clicked", _remove_clicked);
@@ -92,14 +92,14 @@ BookmarkFlowUI::~BookmarkFlowUI()
     evas_object_del(m_folder_button);
     evas_object_del(m_contents_area);
 
-    if(m_folder_custom_item_class)
+    if (m_folder_custom_item_class)
         elm_gengrid_item_class_free(m_folder_custom_item_class);
-    if(m_folder_selected_item_class)
+    if (m_folder_selected_item_class)
         elm_gengrid_item_class_free(m_folder_selected_item_class);
 #else
-    if(m_folder_new_item_class)
+    if (m_folder_new_item_class)
         elm_gengrid_item_class_free(m_folder_new_item_class);
-    if(m_folder_custom_item_class)
+    if (m_folder_custom_item_class)
         elm_gengrid_item_class_free(m_folder_custom_item_class);
 
     elm_gengrid_clear(m_gengrid);
@@ -199,8 +199,7 @@ void BookmarkFlowUI::setState(bool state)
         elm_object_signal_emit(m_contents_area, "show_remove", "ui");
         elm_object_translatable_part_text_set(m_title_area, "title_area_text", _("IDS_BR_HEADER_EDIT_BOOKMARK"));
         evas_object_show(m_remove_button);
-    }
-    else {
+    } else {
         elm_object_signal_emit(m_contents_area, "hide_remove", "ui");
         elm_object_translatable_part_text_set(m_title_area, "title_area_text", _("IDS_BR_OPT_ADD_BOOKMARK"));
         evas_object_hide(m_remove_button);
@@ -215,8 +214,7 @@ void BookmarkFlowUI::setTitle(const std::string& title)
     if (title.empty()) {
         elm_object_disabled_set(m_save_button, EINA_TRUE);
         elm_object_signal_emit(m_save, "text_dissabled", "ui");
-    }
-    else {
+    } else {
         elm_object_disabled_set(m_save_button, EINA_FALSE);
         elm_object_signal_emit(m_save, "text_enabled", "ui");
     }
@@ -267,8 +265,9 @@ void BookmarkFlowUI::resetContent()
             evas_object_show(m_genlist);
             evas_object_show(elm_object_part_content_get(m_contents_area, "dropdown_swallow"));
         }
-    } else
+    } else {
         BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
+    }
 }
 
 void BookmarkFlowUI::_save_clicked(void * data, Evas_Object *, void *)
@@ -320,7 +319,7 @@ void BookmarkFlowUI::createContentsArea()
 
     evas_object_smart_callback_add(m_entry, "focused", _entry_focused, this);
     evas_object_smart_callback_add(m_entry, "unfocused", _entry_unfocused, this);
-    evas_object_smart_callback_add(m_entry, "changed,user",_entry_changed, this);
+    evas_object_smart_callback_add(m_entry, "changed,user", _entry_changed, this);
 
     m_input_cancel_button = elm_button_add(m_contents_area);
     elm_object_style_set(m_input_cancel_button, "invisible_button");
@@ -489,7 +488,7 @@ void BookmarkFlowUI::_folder_dropdown_clicked(void* data, Evas_Object*, void*)
                 count = bookmarkFlowUI->m_max_items;
             elm_object_signal_emit(bookmarkFlowUI->m_contents_area, (boost::format("%s_%u") % "dropdown_swallow_show" % count).str().c_str(), "ui");
             evas_object_show(bookmarkFlowUI->m_genlist);
-            evas_object_show(elm_object_part_content_get(bookmarkFlowUI->m_contents_area,"dropdown_swallow"));
+            evas_object_show(elm_object_part_content_get(bookmarkFlowUI->m_contents_area, "dropdown_swallow"));
         } else {
             elm_object_signal_emit(bookmarkFlowUI->m_contents_area, "dropdown_swallow_hide", "ui");
             evas_object_hide(bookmarkFlowUI->m_genlist);

diff --git a/services/BookmarkManagerUI/BookmarkManagerUI.cpp b/services/BookmarkManagerUI/BookmarkManagerUI.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 031cb80..bb3b806
--- a/services/BookmarkManagerUI/BookmarkManagerUI.cpp
+++ b/services/BookmarkManagerUI/BookmarkManagerUI.cpp
@@ -63,17 +63,17 @@ BookmarkManagerUI::~BookmarkManagerUI()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 
-    if(m_folder_all_item_class)
+    if (m_folder_all_item_class)
         elm_gengrid_item_class_free(m_folder_all_item_class);
 
-    if(m_folder_custom_item_class)
+    if (m_folder_custom_item_class)
         elm_gengrid_item_class_free(m_folder_custom_item_class);
 
 #if PROFILE_MOBILE
-    if(m_folder_new_item_class)
+    if (m_folder_new_item_class)
         elm_gengrid_item_class_free(m_folder_new_item_class);
 #endif
-    if(m_folder_mobile_item_class)
+    if (m_folder_mobile_item_class)
         elm_gengrid_item_class_free(m_folder_mobile_item_class);
 }
 
@@ -167,8 +167,9 @@ char* BookmarkManagerUI::_grid_all_folder_title_text_get(void *data, Evas_Object
         const int part_name1_len = strlen(part_name1);
         if (!strncmp(part_name1, part, part_name1_len))
             return strdup((boost::format("%s  (%d)") % _("IDS_BR_BODY_ALL") % folderData->count).str().c_str());
-    } else
+    } else {
         BROWSER_LOGE("[%s:%d] Data or part is null", __PRETTY_FUNCTION__, __LINE__);
+    }
     return strdup("");
 }
 
@@ -181,8 +182,9 @@ char* BookmarkManagerUI::_grid_folder_title_text_get(void *data, Evas_Object *,
         const int part_name1_len = strlen(part_name1);
         if (!strncmp(part_name1, part, part_name1_len))
             return strdup((boost::format("%s  (%d)") % folderData->name.c_str() % folderData->count).str().c_str());
-    } else
+    } else {
         BROWSER_LOGE("[%s:%d] Data or part is null", __PRETTY_FUNCTION__, __LINE__);
+    }
     return strdup("");
 }
 
@@ -333,8 +335,9 @@ void BookmarkManagerUI::orientationChanged()
                                       ELM_SCALE_SIZE(GENGRID_ITEM_HEIGHT));
             elm_object_signal_emit(b_mm_layout, "switch_vertical", "ui");
         }
-    } else
+    } else {
         BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
+    }
 }
 #endif
 
@@ -366,8 +369,8 @@ void BookmarkManagerUI::addCustomFolders(std::vector<std::shared_ptr<tizen_brows
             int count = 0;
 
             for (auto it2 = items.begin(); it2 != items.end(); ++it2) {
-                BROWSER_LOGD("%d %d %d",(*it2)->is_folder(),(*it2)->getDir(),(*it)->getId());
-                if (!(*it2)->is_folder() && (*it2)->getDir()==(*it)->getId()) {
+                BROWSER_LOGD("%d %d %d", (*it2)->is_folder(), (*it2)->getDir(), (*it)->getId());
+                if (!(*it2)->is_folder() && (*it2)->getDir() == (*it)->getId()) {
                     count++;
                 }
             }
@@ -378,7 +381,7 @@ void BookmarkManagerUI::addCustomFolders(std::vector<std::shared_ptr<tizen_brows
             addCustomFolder(folderData);
         }
     }
-    elm_object_part_content_set(b_mm_layout, "elm.swallow.grid",m_gengrid);
+    elm_object_part_content_set(b_mm_layout, "elm.swallow.grid", m_gengrid);
     evas_object_show(m_gengrid);
 }
 

diff --git a/services/QuickAccess/DetailPopup.cpp b/services/QuickAccess/DetailPopup.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 5ead9b8..2dfcf09
--- a/services/QuickAccess/DetailPopup.cpp
+++ b/services/QuickAccess/DetailPopup.cpp
@@ -160,9 +160,8 @@ void DetailPopup::_history_url_click(void* data, Evas_Object*, void* event_info)
     auto it = std::find_if(dp->m_prevItems->begin(),
                            dp->m_prevItems->end(),
                            [item] (const std::shared_ptr<services::HistoryItem> i)
-                           { return i.get() == item; }
-                          );
-    std::shared_ptr<services::HistoryItem> itemPtr= *it;
+                           { return i.get() == item; });
+    std::shared_ptr<services::HistoryItem> itemPtr = *it;
     dp->openURL(itemPtr, dp->m_quickAccess->isDesktopMode());
     dp->hide();
 }

diff --git a/services/QuickAccess/QuickAccess.cpp b/services/QuickAccess/QuickAccess.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 1823e2c..a3c3ef8
--- a/services/QuickAccess/QuickAccess.cpp
+++ b/services/QuickAccess/QuickAccess.cpp
@@ -154,7 +154,7 @@ void QuickAccess::createQuickAccessLayout(Evas_Object* parent)
     m_layout = elm_layout_add(parent);
     elm_layout_file_set(m_layout, edjFilePath.c_str(), "main_layout");
     evas_object_size_hint_weight_set(m_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set (m_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_align_set(m_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show(m_layout);
 
 #if !PROFILE_MOBILE
@@ -220,7 +220,7 @@ void QuickAccess::createMostVisitedView(Evas_Object * parent)
     m_mostVisitedView = elm_layout_add(parent);
     elm_layout_file_set(m_mostVisitedView, edjFilePath.c_str(), "page_layout");
     evas_object_size_hint_weight_set(m_mostVisitedView, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set (m_mostVisitedView, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_align_set(m_mostVisitedView, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show(m_mostVisitedView);
 
 #if PROFILE_MOBILE
@@ -228,7 +228,7 @@ void QuickAccess::createMostVisitedView(Evas_Object * parent)
 
     m_verticalScroller = elm_scroller_add(m_mostVisitedView);
     evas_object_size_hint_weight_set(m_verticalScroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set (m_verticalScroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_align_set(m_verticalScroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
     elm_scroller_policy_set(m_verticalScroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
     elm_scroller_bounce_set(m_verticalScroller, EINA_FALSE, EINA_FALSE);
     elm_object_part_content_set(m_mostVisitedView, "center_swallow", m_verticalScroller);
@@ -237,13 +237,13 @@ void QuickAccess::createMostVisitedView(Evas_Object * parent)
     m_centerLayout = elm_layout_add(m_verticalScroller);
     elm_layout_file_set(m_centerLayout, edjFilePath.c_str(), "center_layout");
     evas_object_size_hint_weight_set(m_centerLayout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set (m_centerLayout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_align_set(m_centerLayout, EVAS_HINT_FILL, EVAS_HINT_FILL);
     elm_object_content_set(m_verticalScroller, m_centerLayout);
     evas_object_show(m_centerLayout);
 #endif
 }
 
-void QuickAccess::createBookmarksView (Evas_Object * parent)
+void QuickAccess::createBookmarksView(Evas_Object * parent)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 
@@ -302,7 +302,7 @@ Evas_Object* QuickAccess::createBookmarkGengrid(Evas_Object *parent)
 }
 
 #if !PROFILE_MOBILE
-Evas_Object* QuickAccess::createTopButtons (Evas_Object *parent)
+Evas_Object* QuickAccess::createTopButtons(Evas_Object *parent)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 
@@ -459,7 +459,7 @@ void QuickAccess::addMostVisitedItem(std::shared_ptr<services::HistoryItem> hi)
     else
         elm_object_style_set(tile, "small_tile");
     evas_object_size_hint_weight_set(tile, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set (tile, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_align_set(tile, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show(tile);
 #if PROFILE_MOBILE
     elm_object_part_content_set(m_centerLayout, TILES_NAMES[tileNumber].c_str(), tile);
@@ -607,8 +607,7 @@ Evas_Object * QuickAccess::_grid_bookmark_content_get(void *data, Evas_Object*,
         if (itemData->item->getThumbnail()) {
                 Evas_Object * thumb = itemData->item->getThumbnail()->getEvasImage(itemData->quickAccess->m_parent);
                 return thumb;
-        }
-        else {
+        } else {
                 return nullptr;
         }
     }
@@ -758,7 +757,7 @@ void QuickAccess::showNoMostVisitedLabel()
 void QuickAccess::setEmptyView(bool empty)
 {
     BROWSER_LOGD("[%s:%d], empty: %d", __PRETTY_FUNCTION__, __LINE__, empty);
-    if(empty) {
+    if (empty) {
         showNoMostVisitedLabel();
     } else {
 #if PROFILE_MOBILE

diff --git a/services/SimpleUI/ContentPopup_mob.cpp b/services/SimpleUI/ContentPopup_mob.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 09b7e34..5557be3
--- a/services/SimpleUI/ContentPopup_mob.cpp
+++ b/services/SimpleUI/ContentPopup_mob.cpp
@@ -76,8 +76,7 @@ void ContentPopup::_response_cb(void* data,
     auto it = std::find_if(self->m_buttons.begin(),
                         self->m_buttons.end(),
                         [obj] (const Button& i)
-                        { return i.m_evasObject == obj; }
-                        );
+                        { return i.m_evasObject == obj; });
 
     if (it == self->m_buttons.end()) {
         BROWSER_LOGW("[%s:%d] Button not found!", __PRETTY_FUNCTION__, __LINE__);

diff --git a/services/SimpleUI/CustomPopup.cpp b/services/SimpleUI/CustomPopup.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 2dbf838..60cdfc9
--- a/services/SimpleUI/CustomPopup.cpp
+++ b/services/SimpleUI/CustomPopup.cpp
@@ -6,7 +6,6 @@ CustomPopup::CustomPopup(Evas_Object* main_layout) :
     m_content(NULL),
     m_mainLayout(main_layout)
 {
-
 }
 
 CustomPopup::CustomPopup(Evas_Object *main_layout, Evas_Object *content, const char *message, char* title, char* okButtonText, char* cancelButtonText) :
@@ -18,7 +17,6 @@ CustomPopup::CustomPopup(Evas_Object *main_layout, Evas_Object *content, const c
     m_okButtonText(okButtonText),
     m_cancelButtonText(cancelButtonText)
 {
-
 }
 
 void CustomPopup::setTitle(const std::string& title)
@@ -53,7 +51,7 @@ void CustomPopup::show()
     edjePath.append("SimpleUI/CustomPopup.edj");
     elm_theme_extension_add(0, edjePath.c_str());
     m_popup = elm_layout_add(m_mainLayout);
-    if(m_content)
+    if (m_content)
         elm_layout_file_set(m_popup, edjePath.c_str(), "own_popup_long");
     else
         elm_layout_file_set(m_popup, edjePath.c_str(), "own_popup");
@@ -89,7 +87,7 @@ void CustomPopup::show()
         evas_object_show(btn2);
     }
 
-    if(!m_message.empty())
+    if (!m_message.empty())
         elm_object_part_text_set(m_popup, "elm.text", m_message.c_str());
 
     evas_object_show(buttonsBox);

diff --git a/services/SimpleUI/CustomPopup.h b/services/SimpleUI/CustomPopup.h
old mode 100644 (file)
new mode 100755 (executable)
index e9f518c..bf352dc
--- a/services/SimpleUI/CustomPopup.h
+++ b/services/SimpleUI/CustomPopup.h
@@ -5,7 +5,6 @@
 #include <boost/signals2.hpp>
 
 class CustomPopup{
-
 public:
     CustomPopup(Evas_Object *main_layout);
     CustomPopup(Evas_Object *main_layout, Evas_Object *content, const char *message, char *title, char* okButtonText, char* cancelButtonText);
@@ -21,8 +20,8 @@ public:
 
     void show();
     void hide();
-    boost::signals2::signal<void (Evas_Object *)> on_ok;
-    boost::signals2::signal<void (Evas_Object *)> on_cancel;
+    boost::signals2::signal<void(Evas_Object *)> on_ok;
+    boost::signals2::signal<void(Evas_Object *)> on_cancel;
 
 private:
     static void popup_ok_cb(void *data, Evas_Object *btn, void*);

diff --git a/services/SimpleUI/NotificationPopup.cpp b/services/SimpleUI/NotificationPopup.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 7c216d1..753854a
--- a/services/SimpleUI/NotificationPopup.cpp
+++ b/services/SimpleUI/NotificationPopup.cpp
@@ -59,11 +59,10 @@ void NotificationPopup::dismiss()
 {
     BROWSER_LOGD("[%s,%d]", __func__, __LINE__);
     float pendingTime = ecore_timer_pending_get(m_timer);
-    if(pendingTime > DEFAULT_POPUP_INTERVAL-1) {
+    if (pendingTime > DEFAULT_POPUP_INTERVAL-1) {
         ecore_timer_interval_set(m_timer, 1.0);
         ecore_timer_reset(m_timer);
-    }
-    else {
+    } else {
         elm_object_part_content_unset(m_parent, "popup_content");
         evas_object_hide(m_layout);
         ecore_timer_del(m_timer);

diff --git a/services/SimpleUI/SimplePopup.cpp b/services/SimpleUI/SimplePopup.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 9e88961..068397a
--- a/services/SimpleUI/SimplePopup.cpp
+++ b/services/SimpleUI/SimplePopup.cpp
@@ -60,7 +60,7 @@ void SimplePopup::show()
     elm_object_part_text_set(popup, "title,text", title.c_str());
 
     int buttonsCounter = 1;
-    for(std::list<PopupButtons>::iterator it = buttons.begin(); it != buttons.end(); ++it)
+    for (std::list<PopupButtons>::iterator it = buttons.begin(); it != buttons.end(); ++it)
     {
         Evas_Object *btn1 = elm_button_add(popup);
         elm_object_text_set(btn1, buttonsTranslations[*it].c_str());

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index 15dc76052187af773694652a4815e6ee02d1c518..53c528ef59388970e54d0fb0c2485a6ce99ab0e0 100755 (executable)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -116,13 +116,14 @@ SimpleUI::SimpleUI()
         elm_win_wm_rotation_available_rotations_set(main_window, rots, (sizeof(rots) / sizeof(int)));
         evas_object_smart_callback_add(main_window, "wm,rotation,changed", __orientation_changed, this);
         enableManualRotation(false);
-    } else
+    } else {
         BROWSER_LOGW("[%s:%d] Device does not support rotation.", __PRETTY_FUNCTION__, __LINE__);
+    }
 
     // TODO Unify the virtual keyboard behavior. For now webview entry and url entry have the separate ways to
     // determine if keyboard has been shown. I think it is possible to unify it with below callbacks.
     evas_object_smart_callback_add(m_viewManager.getConformant(), "virtualkeypad,state,on", onUrlIMEOpened, this);
-    evas_object_smart_callback_add(m_viewManager.getConformant(), "virtualkeypad,state,off",onUrlIMEClosed, this);
+    evas_object_smart_callback_add(m_viewManager.getConformant(), "virtualkeypad,state,off", onUrlIMEClosed, this);
 #endif
 }
 
@@ -176,7 +177,7 @@ int SimpleUI::exec(const std::string& _url, const std::string& _caller)
     std::string url = _url;
     m_caller = _caller;
 
-    if(!m_initialised){
+    if (!m_initialised){
         if (m_window.get()) {
             m_tabLimit = boost::any_cast <int> (tizen_browser::config::Config::getInstance().get("TAB_LIMIT"));
             m_favoritesLimit = boost::any_cast <int> (tizen_browser::config::Config::getInstance().get("FAVORITES_LIMIT"));
@@ -249,47 +250,47 @@ void SimpleUI::loadUIServices()
 
     m_webPageUI =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::WebPageUI,tizen_browser::core::AbstractService>
+        <tizen_browser::base_ui::WebPageUI, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.webpageui"));
 
     m_quickAccess =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::QuickAccess,tizen_browser::core::AbstractService>
+        <tizen_browser::base_ui::QuickAccess, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.quickaccess"));
 
     m_tabUI =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::TabUI,tizen_browser::core::AbstractService>
+        <tizen_browser::base_ui::TabUI, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.tabui"));
 
     m_historyUI =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::HistoryUI,tizen_browser::core::AbstractService>
+        <tizen_browser::base_ui::HistoryUI, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.historyui"));
 
     m_settingsUI =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::SettingsUI,tizen_browser::core::AbstractService>
+        <tizen_browser::base_ui::SettingsUI, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.settingsui"));
 
     m_moreMenuUI =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::MoreMenuUI,tizen_browser::core::AbstractService>
+        <tizen_browser::base_ui::MoreMenuUI, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.moremenuui"));
 
     m_bookmarkDetailsUI =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::BookmarkDetailsUI,tizen_browser::core::AbstractService>
+        <tizen_browser::base_ui::BookmarkDetailsUI, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.bookmarkdetailsui"));
 #if PROFILE_MOBILE
     m_bookmarkFlowUI =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::BookmarkFlowUI,tizen_browser::core::AbstractService>
+        <tizen_browser::base_ui::BookmarkFlowUI, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.bookmarkflowui"));
 
     m_findOnPageUI =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::FindOnPageUI,tizen_browser::core::AbstractService>
+        <tizen_browser::base_ui::FindOnPageUI, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.findonpageui"));
 #else
     m_zoomUI =
@@ -299,7 +300,7 @@ void SimpleUI::loadUIServices()
 #endif
     m_bookmarkManagerUI =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::BookmarkManagerUI,tizen_browser::core::AbstractService>
+        <tizen_browser::base_ui::BookmarkManagerUI, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.bookmarkmanagerui"));
 }
 
@@ -354,8 +355,8 @@ void SimpleUI::connectUISignals()
     M_ASSERT(m_tabUI.get());
     m_tabUI->closeTabUIClicked.connect(boost::bind(&SimpleUI::closeTabUI, this));
     m_tabUI->newTabClicked.connect(boost::bind(&SimpleUI::newTabClicked, this));
-    m_tabUI->tabClicked.connect(boost::bind(&SimpleUI::tabClicked, this,_1));
-    m_tabUI->closeTabsClicked.connect(boost::bind(&SimpleUI::closeTabsClicked, this,_1));
+    m_tabUI->tabClicked.connect(boost::bind(&SimpleUI::tabClicked, this, _1));
+    m_tabUI->closeTabsClicked.connect(boost::bind(&SimpleUI::closeTabsClicked, this, _1));
     m_tabUI->isIncognito.connect(boost::bind(&SimpleUI::isIncognito, this, _1));
 #if PROFILE_MOBILE
     m_tabUI->isLandscape.connect(boost::bind(&SimpleUI::isLandscape, this));
@@ -374,7 +375,7 @@ void SimpleUI::connectUISignals()
 
     M_ASSERT(m_settingsUI.get());
     m_settingsUI->closeSettingsUIClicked.connect(boost::bind(&SimpleUI::closeSettingsUI, this));
-    m_settingsUI->deleteSelectedDataClicked.connect(boost::bind(&SimpleUI::settingsDeleteSelectedData, this,_1));
+    m_settingsUI->deleteSelectedDataClicked.connect(boost::bind(&SimpleUI::settingsDeleteSelectedData, this, _1));
     m_settingsUI->resetMostVisitedClicked.connect(boost::bind(&SimpleUI::settingsResetMostVisited, this));
     m_settingsUI->resetBrowserClicked.connect(boost::bind(&SimpleUI::settingsResetBrowser, this));
 #if PROFILE_MOBILE
@@ -445,33 +446,32 @@ void SimpleUI::loadModelServices()
 
     m_webEngine =
         std::dynamic_pointer_cast
-        <basic_webengine::AbstractWebEngine<Evas_Object>,tizen_browser::core::AbstractService>
+        <basic_webengine::AbstractWebEngine<Evas_Object>, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.webengineservice"));
 
     m_storageService =
         std::dynamic_pointer_cast
-        <tizen_browser::services::StorageService,tizen_browser::core::AbstractService>
+        <tizen_browser::services::StorageService, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.storageservice"));
 
     m_favoriteService =
         std::dynamic_pointer_cast
-        <tizen_browser::interfaces::AbstractFavoriteService,tizen_browser::core::AbstractService>
+        <tizen_browser::interfaces::AbstractFavoriteService, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.favoriteservice"));
 
     m_historyService =
         std::dynamic_pointer_cast
-        <tizen_browser::services::HistoryService,tizen_browser::core::AbstractService>
+        <tizen_browser::services::HistoryService, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.historyservice"));
 
     m_tabService = std::dynamic_pointer_cast<
-            tizen_browser::services::TabService,
-            tizen_browser::core::AbstractService>(
+            tizen_browser::services::TabService, tizen_browser::core::AbstractService>(
             tizen_browser::core::ServiceManager::getInstance().getService(
                     "org.tizen.browser.tabservice"));
 
     m_platformInputManager =
         std::dynamic_pointer_cast
-        <tizen_browser::services::PlatformInputManager,tizen_browser::core::AbstractService>
+        <tizen_browser::services::PlatformInputManager, tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.platforminputmanager"));
 
     m_certificateContents =
@@ -560,13 +560,13 @@ void SimpleUI::connectModelSignals()
     m_webEngine->backwardEnableChanged.connect(boost::bind(&WebPageUI::setBackButtonEnabled, m_webPageUI.get(), _1));
     m_webEngine->forwardEnableChanged.connect(boost::bind(&WebPageUI::setForwardButtonEnabled, m_webPageUI.get(), _1));
     m_webEngine->loadStarted.connect(boost::bind(&SimpleUI::loadStarted, this));
-    m_webEngine->loadProgress.connect(boost::bind(&SimpleUI::progressChanged,this,_1));
+    m_webEngine->loadProgress.connect(boost::bind(&SimpleUI::progressChanged, this, _1));
     m_webEngine->loadFinished.connect(boost::bind(&SimpleUI::loadFinished, this));
     m_webEngine->loadStop.connect(boost::bind(&SimpleUI::loadFinished, this));
     m_webEngine->loadError.connect(boost::bind(&SimpleUI::loadError, this));
     m_webEngine->tabCreated.connect(boost::bind(&SimpleUI::tabCreated, this));
     m_webEngine->checkIfCreate.connect(boost::bind(&SimpleUI::checkIfCreate, this));
-    m_webEngine->tabClosed.connect(boost::bind(&SimpleUI::tabClosed,this,_1));
+    m_webEngine->tabClosed.connect(boost::bind(&SimpleUI::tabClosed, this, _1));
     m_webEngine->IMEStateChanged.connect(boost::bind(&SimpleUI::setwvIMEStatus, this, _1));
     m_webEngine->switchToWebPage.connect(boost::bind(&SimpleUI::switchViewToWebPage, this));
     m_webEngine->titleChanged.connect(boost::bind(&SimpleUI::titleChanged, this, _1));
@@ -589,10 +589,10 @@ void SimpleUI::connectModelSignals()
     m_webEngine->unsecureConnection.connect(boost::bind(&SimpleUI::showUnsecureConnectionPopup, this));
 #endif
 
-    m_favoriteService->bookmarkAdded.connect(boost::bind(&SimpleUI::onBookmarkAdded, this,_1));
+    m_favoriteService->bookmarkAdded.connect(boost::bind(&SimpleUI::onBookmarkAdded, this, _1));
     m_favoriteService->bookmarkDeleted.connect(boost::bind(&SimpleUI::onBookmarkRemoved, this, _1));
 
-    m_historyService->historyDeleted.connect(boost::bind(&SimpleUI::onHistoryRemoved, this,_1));
+    m_historyService->historyDeleted.connect(boost::bind(&SimpleUI::onHistoryRemoved, this, _1));
 
     m_tabService->generateThumb.connect(boost::bind(&SimpleUI::onGenerateThumb, this, _1));
 
@@ -658,7 +658,7 @@ void SimpleUI::unregisterHWKeyCallback()
 void SimpleUI::switchViewToWebPage()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if(m_webEngine->isSuspended())
+    if (m_webEngine->isSuspended())
         m_webEngine->resume();
     m_webPageUI->switchViewToWebPage(m_webEngine->getLayout(), m_webEngine->getURI());
     m_webPageUI->toIncognito(m_webEngine->isPrivateMode(m_webEngine->currentTabId()));
@@ -667,11 +667,11 @@ void SimpleUI::switchViewToWebPage()
 void SimpleUI::switchToTab(const tizen_browser::basic_webengine::TabId& tabId)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if(m_webEngine->currentTabId() != tabId) {
+    if (m_webEngine->currentTabId() != tabId) {
         BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
         m_webEngine->switchToTab(tabId);
     }
-    if(m_webEngine->isLoadError()){
+    if (m_webEngine->isLoadError()){
         BROWSER_LOGD("[%s:%d] LOAD ERROR!", __PRETTY_FUNCTION__, __LINE__);
         loadError();
     return;
@@ -737,14 +737,13 @@ void SimpleUI::closeTab(const tizen_browser::basic_webengine::TabId& id)
 bool SimpleUI::checkBookmark()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if(m_webPageUI->stateEquals(WPUState::QUICK_ACCESS))
+    if (m_webPageUI->stateEquals(WPUState::QUICK_ACCESS))
         return false;
 
-    if(m_favoriteService->bookmarkExists(m_webEngine->getURI())) {
+    if (m_favoriteService->bookmarkExists(m_webEngine->getURI())) {
         BROWSER_LOGD("[%s] There is bookmark for this site [%s], set indicator on!", __func__, m_webEngine->getURI().c_str());
         return true;
-    }
-    else {
+    } else {
         BROWSER_LOGD("[%s] There is no bookmark for this site [%s], set indicator off", __func__, m_webEngine->getURI().c_str());
         return false;
     }
@@ -754,7 +753,7 @@ void SimpleUI::onBookmarkAdded(std::shared_ptr<tizen_browser::services::Bookmark
 {
     if (m_moreMenuUI) {
         m_moreMenuUI->changeBookmarkStatus(true);
-        m_moreMenuUI->createToastPopup( (std::string(m_webEngine->getTitle()) + std::string(" added to bookmark")).c_str() );
+        m_moreMenuUI->createToastPopup((std::string(m_webEngine->getTitle()) + std::string(" added to bookmark")).c_str());
     }
 }
 
@@ -763,7 +762,7 @@ void SimpleUI::onBookmarkRemoved(const std::string& uri)
     BROWSER_LOGD("[%s] deleted %s", __func__, uri.c_str());
     if (m_moreMenuUI) {
         m_moreMenuUI->changeBookmarkStatus(false);
-        m_moreMenuUI->createToastPopup( (std::string(m_webEngine->getTitle()) + std::string(" removed from bookmark")).c_str() );
+        m_moreMenuUI->createToastPopup((std::string(m_webEngine->getTitle()) + std::string(" removed from bookmark")).c_str());
     }
 }
 
@@ -784,9 +783,9 @@ void SimpleUI::onOpenURL(const std::string& url, const std::string& title, bool
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     if (m_webPageUI) {
         popStackTo(m_webPageUI.get());
-        if (tabsCount() == 0 || m_webPageUI->stateEquals(WPUState::QUICK_ACCESS))
+        if (tabsCount() == 0 || m_webPageUI->stateEquals(WPUState::QUICK_ACCESS)) {
             openNewTab(url, title, boost::none, desktopMode, false, basic_webengine::TabOrigin::QUICKACCESS);
-        else {
+        } else {
             m_webPageUI->switchViewToWebPage(m_webEngine->getLayout(), title);
             m_webEngine->setURI(url);
             m_webPageUI->getURIEntry().clearFocus();
@@ -833,9 +832,9 @@ void SimpleUI::onBookmarkClicked(std::shared_ptr<tizen_browser::services::Bookma
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     std::string bookmarkAddress = bookmarkItem->getAddress();
 
-    if (tabsCount() == 0)
+    if (tabsCount() == 0) {
         openNewTab(bookmarkAddress);
-    else {
+    } else {
         std::string bookmarkTitle = bookmarkItem->getTitle();
         m_webPageUI->switchViewToWebPage(m_webEngine->getLayout(), bookmarkAddress);
         m_webEngine->setURI(bookmarkAddress);
@@ -1039,9 +1038,9 @@ void SimpleUI::onBackPressed()
         closeFindOnPageUI();
     else
 #else
-    if (m_zoomUI->isVisible()) {
+    if (m_zoomUI->isVisible())
         m_zoomUI->escapeZoom();
-    } else
+    else
 #endif
     if (m_wvIMEStatus) {    // if IME opened
         return;
@@ -1192,7 +1191,7 @@ void SimpleUI::downloadStarted(int status)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     NotificationPopup *popup = NotificationPopup::createNotificationPopup(m_viewManager.getContent());
 
-    switch(status)
+    switch (status)
     {
         case DOWNLOAD_UNABLE_TO_DOWNLOAD:
             popup->show(_("IDS_BR_HEADER_UNABLE_TO_DOWNLOAD_ABB"), false);
@@ -1267,16 +1266,12 @@ void SimpleUI::filterURL(const std::string& url)
     //if there will be more addresses may be we should
     //create some kind of std::man<std::string url, bool *(doSomethingWithUrl)()>
     //and then just map[url]() ? m_webEngine->setURI(url) : /*do nothing*/;;
-    if(/*url.empty() ||*/ url == HomePageURL){
+    if (/*url.empty() ||*/ url == HomePageURL){
         m_webPageUI->getURIEntry().changeUri("");
     } else if (!url.empty()){
-
     //check if url is in favorites
-
     //check if url is in blocked
-
     //no filtering
-
         if (m_webPageUI->stateEquals(WPUState::QUICK_ACCESS))
             openNewTab(url, "", boost::none, false, false, basic_webengine::TabOrigin::QUICKACCESS);
         else
@@ -1316,7 +1311,7 @@ void SimpleUI::onYellowKeyPressed()
 void SimpleUI::showZoomUI()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if(! m_webPageUI->stateEquals(WPUState::QUICK_ACCESS)) {
+    if (!m_webPageUI->stateEquals(WPUState::QUICK_ACCESS)) {
         popStackTo(m_webPageUI.get());
         m_webPageUI->showTabUI.connect(boost::bind(&SimpleUI::closeZoomUI, this));
         m_webPageUI->showMoreMenu.connect(boost::bind(&SimpleUI::closeZoomUI, this));
@@ -1579,9 +1574,9 @@ void SimpleUI::showMoreMenu()
 
 #if PROFILE_MOBILE
     M_ASSERT(m_webPageUI);
-    if (m_moreMenuUI->isVisible())
+    if (m_moreMenuUI->isVisible()) {
         m_moreMenuUI->hideUI();
-    else {
+    } else {
         m_moreMenuUI->shouldShowFindOnPage(!m_webEngine->getURI().empty());
         m_moreMenuUI->blockThumbnails(m_webPageUI->stateEquals(WPUState::QUICK_ACCESS));
         m_webEngine->moreKeyPressed();
@@ -1597,8 +1592,7 @@ void SimpleUI::showMoreMenu()
         m_moreMenuUI->setFavIcon(m_webEngine->getFavicon());
         m_moreMenuUI->setWebTitle(m_webEngine->getTitle());
         m_moreMenuUI->setURL(m_webEngine->getURI());
-    }
-    else {
+    } else {
         m_moreMenuUI->setHomePageInfo();
     }
 #endif
@@ -1658,7 +1652,7 @@ void SimpleUI::showBookmarkFlowUI(bool state)
     m_bookmarkFlowUI->setURL(uri);
     m_bookmarkFlowUI->setState(state);
     tizen_browser::services::BookmarkItem item;
-    if(m_favoriteService->bookmarkExists(uri) && m_favoriteService->getItem(uri, &item))
+    if (m_favoriteService->bookmarkExists(uri) && m_favoriteService->getItem(uri, &item))
         m_bookmarkFlowUI->setTitle(item.getTitle());
     else
         m_bookmarkFlowUI->setTitle(m_webEngine->getTitle());
@@ -1749,7 +1743,7 @@ void SimpleUI::settingsDeleteSelectedData(const std::string& str)
 {
     BROWSER_LOGD("[%s]: Deleting selected data", __func__);
     M_ASSERT(m_viewManager);
-    if((str.find("CACHE")    != std::string::npos)  ||
+    if ((str.find("CACHE")    != std::string::npos)  ||
        (str.find("COOKIES")  != std::string::npos)  ||
        (str.find("HISTORY")  != std::string::npos)  ||
        (str.find("PASSWORD") != std::string::npos)  ||
@@ -1775,7 +1769,7 @@ void SimpleUI::settingsDeleteSelectedData(const std::string& str)
 void SimpleUI::onDeleteSelectedDataButton(const PopupButtons& button, const std::string& dataText)
 {
     BROWSER_LOGD("[%s]: TYPE : %s", __func__, dataText.c_str());
-    if(button == OK){
+    if (button == OK){
         NotificationPopup *popup = NotificationPopup::createNotificationPopup(m_viewManager.getContent());
         popup->show("Delete Web Browsing Data");
 
@@ -1883,8 +1877,7 @@ void SimpleUI::settingsOverrideUseragent(const std::string& userAgent)
         inputPopup->popupShown.connect(boost::bind(&SimpleUI::showPopup, this, _1));
         inputPopup->popupDismissed.connect(boost::bind(&SimpleUI::dismissPopup, this, _1));
         inputPopup->show();
-    }
-    else {
+    } else {
         onOverrideUseragentButton(userAgent);
     }
 }
@@ -1938,9 +1931,9 @@ bool SimpleUI::checkIfCreate()
         popup->popupDismissed.connect(boost::bind(&SimpleUI::dismissPopup, this, _1));
         popup->show();
         return false;
-    }
-    else
+    } else {
         return true;
+    }
 }
 
 void SimpleUI::updateView() {

diff --git a/services/SimpleUI/TextPopup_mob.cpp b/services/SimpleUI/TextPopup_mob.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 6c3943b..991a733
--- a/services/SimpleUI/TextPopup_mob.cpp
+++ b/services/SimpleUI/TextPopup_mob.cpp
@@ -76,8 +76,7 @@ void TextPopup::_response_cb(void* data,
     auto it = std::find_if(self->m_buttons.begin(),
                         self->m_buttons.end(),
                         [obj] (const Button& i)
-                        { return i.m_evasObject == obj; }
-                        );
+                        { return i.m_evasObject == obj; });
 
     if (it == self->m_buttons.end()) {
         BROWSER_LOGW("[%s:%d] Button not found!", __PRETTY_FUNCTION__, __LINE__);

diff --git a/services/SimpleUI/ViewManager.cpp b/services/SimpleUI/ViewManager.cpp
index bbd629340acfbddcc809f675555309bd6c4b6e87..4805b9c6d232f7e5ccd5d0158295b60a956d2ece 100755 (executable)
--- a/services/SimpleUI/ViewManager.cpp
+++ b/services/SimpleUI/ViewManager.cpp
@@ -59,7 +59,7 @@ void ViewManager::init(Evas_Object* parentWindow)
 
     m_mainLayout = elm_layout_add(bx);
     evas_object_size_hint_weight_set(m_mainLayout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set (m_mainLayout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_size_hint_align_set(m_mainLayout, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_show(m_mainLayout);
     elm_box_pack_end(bx, m_mainLayout);
 
@@ -68,7 +68,7 @@ void ViewManager::init(Evas_Object* parentWindow)
                                         + std::string("SimpleUI/ViewManager.edj")).c_str(),
                                         "main_layout");
     if (!ret)
-        BROWSER_LOGD("[%s:%d]  elm_layout_file_set falied !!!",__PRETTY_FUNCTION__, __LINE__);
+        BROWSER_LOGD("[%s:%d]  elm_layout_file_set falied !!!", __PRETTY_FUNCTION__, __LINE__);
 
     elm_object_content_set(m_conformant, bx);
 }
@@ -86,7 +86,7 @@ void ViewManager::popStackTo(interfaces::AbstractUIComponent* view)
     M_ASSERT(view);
     interfaces::AbstractUIComponent* previousView = m_viewStack.top();
 
-    while(!m_viewStack.empty() && m_viewStack.top() != view)
+    while (!m_viewStack.empty() && m_viewStack.top() != view)
     {
         m_viewStack.pop();
     }
@@ -97,7 +97,7 @@ void ViewManager::popStackTo(interfaces::AbstractUIComponent* view)
 void ViewManager::popTheStack()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if(!m_viewStack.empty())
+    if (!m_viewStack.empty())
     {
         interfaces::AbstractUIComponent* previousView = m_viewStack.top();
         m_viewStack.pop();
@@ -146,10 +146,8 @@ void ViewManager::updateLayout(interfaces::AbstractUIComponent* previousView)
         evas_object_show(elm_layout_content_get(m_mainLayout, "content"));
 
         topOfStack()->showUI();
-    }
-    else
-    {
-        BROWSER_LOGD("[%s:%d] Stack is empty!!!",__PRETTY_FUNCTION__, __LINE__);
+    } else {
+        BROWSER_LOGD("[%s:%d] Stack is empty!!!", __PRETTY_FUNCTION__, __LINE__);
         elm_layout_content_unset(m_mainLayout, "content");
         if (previousView)
         {
@@ -172,7 +170,7 @@ Evas_Object* ViewManager::getConformant() {
 
 interfaces::AbstractUIComponent* ViewManager::topOfStack()
 {
-    if(!m_viewStack.empty())
+    if (!m_viewStack.empty())
         return m_viewStack.top();
     else
         return nullptr;

diff --git a/services/TabUI/TabUI.cpp b/services/TabUI/TabUI.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 1c9871a..17ce65f
--- a/services/TabUI/TabUI.cpp
+++ b/services/TabUI/TabUI.cpp
@@ -126,7 +126,7 @@ Evas_Object* TabUI::getContent()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_parent);
-    if(!m_tab_layout)
+    if (!m_tab_layout)
         createTabUILayout();
     return m_tab_layout;
 }
@@ -308,8 +308,9 @@ void TabUI::orientationChanged()
             elm_gengrid_item_size_set(m_gengrid, ELM_SCALE_SIZE(GENGRID_ITEM_WIDTH), ELM_SCALE_SIZE(GENGRID_ITEM_HEIGHT));
             elm_object_signal_emit(m_gengrid_layout, "switch_vertical", "ui");
         }
-    } else
+    } else {
         BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
+    }
 }
 #endif
 
@@ -349,7 +350,6 @@ void TabUI::_newtab_clicked(void * data, Evas_Object*, void*)
         tabUI->editMode = false;
         tabUI->onOtherDevicesSwitch = false;
     }
-
 }
 
 void TabUI::_openedtabs_clicked(void* data, Evas_Object*, void*)
@@ -357,7 +357,7 @@ void TabUI::_openedtabs_clicked(void* data, Evas_Object*, void*)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     if (data) {
         TabUI* tabUI = static_cast<TabUI*>(data);
-        if(tabUI->onOtherDevicesSwitch) {
+        if (tabUI->onOtherDevicesSwitch) {
             tabUI->onOtherDevicesSwitch = false;
             evas_object_show(tabUI->m_gengrid);
             elm_layout_text_set(elm_layout_content_get(tabUI->m_tab_layout, "action_bar"), "closetabs_text", "Close Tabs");
@@ -372,7 +372,7 @@ void TabUI::_onotherdevices_clicked(void* data, Evas_Object*, void*)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     if (data) {
         TabUI* tabUI = static_cast<TabUI*>(data);
-        if(!tabUI->onOtherDevicesSwitch) {
+        if (!tabUI->onOtherDevicesSwitch) {
             tabUI->onOtherDevicesSwitch = true;
             evas_object_hide(tabUI->m_gengrid);
             elm_layout_text_set(elm_layout_content_get(tabUI->m_tab_layout, "action_bar"), "closetabs_text", "Close Tabs");
@@ -499,7 +499,7 @@ Evas_Object * TabUI::_tab_grid_content_get(void *data, Evas_Object *obj, const c
                 return button;
 #else
                 Evas_Object *incognitoImage = elm_image_add(obj);
-                if (elm_image_file_set(incognitoImage,itemData->tabUI->m_edjFilePath.c_str() , "incognito_icon")) {
+                if (elm_image_file_set(incognitoImage, itemData->tabUI->m_edjFilePath.c_str() , "incognito_icon")) {
                     return incognitoImage;
                 }
 #endif
@@ -630,7 +630,7 @@ void TabUI::_focus_in(void* data, Evas*, Evas_Object*, void* event_info)
     int x, y;
     TabUI* tabUI = static_cast<TabUI*>(data);
     Elm_Object_Item* it = elm_gengrid_at_xy_item_get(tabUI->m_gengrid, ee->canvas.x, ee->canvas.y, &x, &y);
-    if(it && tabUI->editMode)
+    if (it && tabUI->editMode)
         elm_object_item_signal_emit(it, "selected", "over3");
 }
 

diff --git a/services/WebEngineService/WebEngineService.cpp b/services/WebEngineService/WebEngineService.cpp
index 1133884a54354f225112db841d79005502be4e59..5712714d2cc04931c3fe35c7c70bf101a06b24e8 100755 (executable)
--- a/services/WebEngineService/WebEngineService.cpp
+++ b/services/WebEngineService/WebEngineService.cpp
@@ -77,7 +77,7 @@ Evas_Object * WebEngineService::getLayout()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return nullptr;
     }
     return m_currentWebView->getLayout();
@@ -202,7 +202,7 @@ int WebEngineService::createTabId()
 
 void WebEngineService::onTabIdCreated(int tabId)
 {
-    m_tabIdCreated= tabId;
+    m_tabIdCreated = tabId;
 }
 
 void WebEngineService::setURI(const std::string & uri)
@@ -210,7 +210,7 @@ void WebEngineService::setURI(const std::string & uri)
     BROWSER_LOGD("[%s:%d] uri=%s", __PRETTY_FUNCTION__, __LINE__, uri.c_str());
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_stopped = false;
@@ -244,8 +244,9 @@ std::string WebEngineService::getTitle() const
             return m_currentWebView->getURI();
         else
             return m_currentWebView->getTitle();
-    } else
+    } else {
         return std::string("");
+    }
 }
 
 TabOrigin WebEngineService::getOrigin() const
@@ -261,7 +262,7 @@ std::string WebEngineService::getUserAgent() const
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return std::string();
     }
     return m_currentWebView->getUserAgent();
@@ -272,7 +273,7 @@ void WebEngineService::setUserAgent(const std::string& ua)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_currentWebView->setUserAgent(ua);
@@ -283,10 +284,10 @@ void WebEngineService::suspend()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
-    if (tabsCount()>0) {
+    if (tabsCount() > 0) {
         m_currentWebView->suspend();
 #if PROFILE_MOBILE
         unregisterHWKeyCallback();
@@ -299,10 +300,10 @@ void WebEngineService::resume()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
-    if (tabsCount()>0) {
+    if (tabsCount() > 0) {
         M_ASSERT(m_currentWebView);
         m_currentWebView->resume();
 #if PROFILE_MOBILE
@@ -316,7 +317,7 @@ bool WebEngineService::isSuspended() const
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return false;
     }
     return m_currentWebView->isSuspended();
@@ -327,7 +328,7 @@ void WebEngineService::stopLoading(void)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_stopped = true;
@@ -339,7 +340,7 @@ void WebEngineService::reload(void)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_stopped = false;
@@ -351,7 +352,7 @@ void WebEngineService::back(void)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_stopped = false;
@@ -366,7 +367,7 @@ void WebEngineService::forward(void)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_stopped = false;
@@ -381,7 +382,7 @@ bool WebEngineService::isBackEnabled() const
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return false;
     }
     return m_currentWebView->isBackEnabled();
@@ -392,7 +393,7 @@ bool WebEngineService::isForwardEnabled() const
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return false;
     }
     return m_currentWebView->isForwardEnabled();
@@ -403,7 +404,7 @@ bool WebEngineService::isLoading() const
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return false;
     }
     return m_currentWebView->isLoading();
@@ -602,8 +603,7 @@ bool WebEngineService::closeTab(TabId id) {
     }
     if (m_tabs.size() == 0) {
         m_currentTabId = TabId::NONE;
-    }
-    else if (closingTabId == m_currentTabId && m_mostRecentTab.size()){
+    } else if (closingTabId == m_currentTabId && m_mostRecentTab.size()) {
         res = switchToTab(m_mostRecentTab.back());
     }
 
@@ -659,7 +659,7 @@ void WebEngineService::setFocus()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_currentWebView->setFocus();
@@ -670,7 +670,7 @@ void WebEngineService::clearFocus()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_currentWebView->clearFocus();
@@ -681,7 +681,7 @@ bool WebEngineService::hasFocus() const
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return false;
     }
     return m_currentWebView->hasFocus();
@@ -696,8 +696,9 @@ std::shared_ptr<tizen_browser::tools::BrowserImage> WebEngineService::getFavicon
             return std::make_shared<tizen_browser::tools::BrowserImage>();
         else
             return m_currentWebView->getFavicon();
-    } else
+    } else {
         return std::make_shared<tizen_browser::tools::BrowserImage>();
+    }
 }
 
 #if PROFILE_MOBILE
@@ -732,7 +733,6 @@ int WebEngineService::getZoomFactor() const
     if (!m_currentWebView)
         return 0;
     return static_cast<int>(m_currentWebView->getZoomFactor()*100);
-
 }
 
 void WebEngineService::setZoomFactor(int zoomFactor)
@@ -740,43 +740,42 @@ void WebEngineService::setZoomFactor(int zoomFactor)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_currentWebView->setZoomFactor(0.01*zoomFactor);
-
 }
 
 void WebEngineService::clearCache()
 {
-    for(std::map<TabId, WebViewPtr>::const_iterator it = m_tabs.begin(); it != m_tabs.end(); ++it){
+    for (std::map<TabId, WebViewPtr>::const_iterator it = m_tabs.begin(); it != m_tabs.end(); ++it){
             it->second->clearCache();
         }
 }
 
 void WebEngineService::clearCookies()
 {
-    for(std::map<TabId, WebViewPtr>::const_iterator it = m_tabs.begin(); it != m_tabs.end(); ++it){
+    for (std::map<TabId, WebViewPtr>::const_iterator it = m_tabs.begin(); it != m_tabs.end(); ++it){
             it->second->clearCookies();
         }
 }
 
 void WebEngineService::clearPrivateData()
 {
-    for(std::map<TabId, WebViewPtr>::const_iterator it = m_tabs.begin(); it != m_tabs.end(); ++it){
+    for (std::map<TabId, WebViewPtr>::const_iterator it = m_tabs.begin(); it != m_tabs.end(); ++it){
             it->second->clearPrivateData();
         }
 }
 void WebEngineService::clearPasswordData()
 {
-    for(std::map<TabId, WebViewPtr>::const_iterator it = m_tabs.begin(); it != m_tabs.end(); ++it){
+    for (std::map<TabId, WebViewPtr>::const_iterator it = m_tabs.begin(); it != m_tabs.end(); ++it){
             it->second->clearPasswordData();
         }
 }
 
 void WebEngineService::clearFormData()
 {
-    for(std::map<TabId, WebViewPtr>::const_iterator it = m_tabs.begin(); it != m_tabs.end(); ++it){
+    for (std::map<TabId, WebViewPtr>::const_iterator it = m_tabs.begin(); it != m_tabs.end(); ++it){
             it->second->clearFormData();
         }
 }
@@ -786,7 +785,7 @@ void WebEngineService::searchOnWebsite(const std::string & searchString, int fla
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_currentWebView->searchOnWebsite(searchString, flags);
@@ -863,7 +862,7 @@ void WebEngineService::moreKeyPressed()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
 
@@ -881,7 +880,7 @@ void WebEngineService::backButtonClicked()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
 
@@ -913,7 +912,7 @@ void WebEngineService::switchToDesktopMode()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_currentWebView->switchToDesktopMode();
@@ -924,7 +923,7 @@ void WebEngineService::switchToMobileMode()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_currentWebView->switchToMobileMode();
@@ -935,7 +934,7 @@ bool WebEngineService::isDesktopMode() const
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return false;
     }
     return m_currentWebView->isDesktopMode();
@@ -946,7 +945,7 @@ void WebEngineService::scrollView(const int& dx, const int& dy)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_currentWebView);
     if (!m_currentWebView) {
-        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__,"m_currentWebView is null");
+        BROWSER_LOGD("[%s:%d:%s] ", __PRETTY_FUNCTION__, __LINE__, "m_currentWebView is null");
         return;
     }
     m_currentWebView->scrollView(dx, dy);
@@ -965,7 +964,7 @@ bool WebEngineService::getSettingsParam(WebEngineSettings param) {
 
 void WebEngineService::setSettingsParam(WebEngineSettings param, bool value) {
     m_settings[param] = value;
-    for(auto it = m_tabs.cbegin(); it != m_tabs.cend(); ++it) {
+    for (auto it = m_tabs.cbegin(); it != m_tabs.cend(); ++it) {
         switch (param) {
         case WebEngineSettings::PAGE_OVERVIEW:
             it->second->ewkSettingsAutoFittingSet(value);

diff --git a/services/WebEngineService/WebView.cpp b/services/WebEngineService/WebView.cpp
index 010975e4f11c5051e71f9456dee9a0d19c20d4de..6315af99da81bc5744a3879fb6639903fa0631a9 100755 (executable)
--- a/services/WebEngineService/WebView.cpp
+++ b/services/WebEngineService/WebView.cpp
@@ -56,7 +56,7 @@
 #define APPLICATION_NAME_FOR_USER_AGENT_MOBILE "Mozilla/5.0 (Linux; Tizen 3.0; tm1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.69 Mobile safari/537.36"
 
 #if PROFILE_MOBILE
-Ecore_Timer* m_haptic_timer_id =NULL;
+Ecore_Timer* m_haptic_timer_id = NULL;
 haptic_device_h m_haptic_handle;
 haptic_effect_h m_haptic_effect;
 
@@ -246,7 +246,6 @@ void WebView::registerCallbacks()
 
     evas_object_smart_callback_add(m_ewkView, "rotate,prepared", __rotate_prepared_cb, this);
 #endif
-
 }
 
 void WebView::unregisterCallbacks()
@@ -279,7 +278,7 @@ void WebView::unregisterCallbacks()
     evas_object_smart_callback_del_full(m_ewkView, "load,provisional,redirect", __load_provisional_redirect, this);
 
 #if PROFILE_MOBILE
-    evas_object_smart_callback_del_full(m_ewkView, "contextmenu,customize", __contextmenu_customize_cb,this);
+    evas_object_smart_callback_del_full(m_ewkView, "contextmenu,customize", __contextmenu_customize_cb, this);
     evas_object_smart_callback_del_full(m_ewkView, "contextmenu,selected", __contextmenu_selected_cb, this);
     evas_object_smart_callback_del_full(m_ewkView, "fullscreen,enterfullscreen", __fullscreen_enter_cb, this);
     evas_object_smart_callback_del_full(m_ewkView, "fullscreen,exitfullscreen", __fullscreen_exit_cb, this);
@@ -317,8 +316,9 @@ std::map<std::string, std::vector<std::string> > WebView::parse_uri(const char *
                 if (pos == std::string::npos)
                     argsVector.push_back(argsString.substr(i, argsString.length()));
             }
-        } else
+        } else {
             argsVector.push_back(argsString.substr(i, argsString.length()));
+       }
 
         const char *valueDelimiter = "=";
         const char *itemsDelimiter = ";";
@@ -338,8 +338,9 @@ std::map<std::string, std::vector<std::string> > WebView::parse_uri(const char *
                         if (pos2 == std::string::npos)
                             uri_parts[key].push_back(value.substr(j, value.length()));
                     }
-                } else
+                } else {
                     uri_parts[key].push_back(value);
+                }
             }
         }
     } else {
@@ -353,44 +354,37 @@ Eina_Bool WebView::handle_scheme(const char *uri)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 
-    if (!strncmp(uri, HTTP_SCHEME, strlen(HTTP_SCHEME)))
+    if (!strncmp(uri, HTTP_SCHEME, strlen(HTTP_SCHEME))) {
         return EINA_FALSE;
-    else if (!strncmp(uri, HTTPS_SCHEME, strlen(HTTPS_SCHEME)))
+    } else if (!strncmp(uri, HTTPS_SCHEME, strlen(HTTPS_SCHEME))) {
         return EINA_FALSE;
-    else if (!strncmp(uri, FILE_SCHEME, strlen(FILE_SCHEME)))
+    } else if (!strncmp(uri, FILE_SCHEME, strlen(FILE_SCHEME))) {
         return EINA_FALSE;
-    else if (!strncmp(uri, TIZENSTORE_SCHEME, strlen(TIZENSTORE_SCHEME))) {
+    } else if (!strncmp(uri, TIZENSTORE_SCHEME, strlen(TIZENSTORE_SCHEME))) {
         launch_tizenstore(uri);
         return EINA_TRUE;
-    }
-    else if (!strncmp(uri, MAILTO_SCHEME, strlen(MAILTO_SCHEME))) {
+    } else if (!strncmp(uri, MAILTO_SCHEME, strlen(MAILTO_SCHEME))) {
         launch_email(uri);
         return EINA_TRUE;
-    }
-    else if (!strncmp(uri, TEL_SCHEME, strlen(TEL_SCHEME))) {
+    } else if (!strncmp(uri, TEL_SCHEME, strlen(TEL_SCHEME))) {
         launch_dialer(uri);
         return EINA_TRUE;
-    }
-    else if (!strncmp(uri, TELTO_SCHEME, strlen(TELTO_SCHEME))) {
+    } else if (!strncmp(uri, TELTO_SCHEME, strlen(TELTO_SCHEME))) {
         std::string request_uri = std::string(TEL_SCHEME) + std::string(uri + strlen(TELTO_SCHEME));
         launch_dialer(request_uri.c_str());
         return EINA_TRUE;
-    }
-    else if (!strncmp(uri, CALLTO_SCHEME, strlen(CALLTO_SCHEME))) {
+    } else if (!strncmp(uri, CALLTO_SCHEME, strlen(CALLTO_SCHEME))) {
         std::string request_uri = std::string(TEL_SCHEME) + std::string(uri + strlen(CALLTO_SCHEME));
         launch_dialer(request_uri.c_str());
         return EINA_TRUE;
-    }
-    else if (!strncmp(uri, SMS_SCHEME, strlen(SMS_SCHEME))) {
+    } else if (!strncmp(uri, SMS_SCHEME, strlen(SMS_SCHEME))) {
         launch_message(uri);
         return EINA_TRUE;
-    }
-    else if (!strncmp(uri, SMSTO_SCHEME, strlen(SMSTO_SCHEME))) {
+    } else if (!strncmp(uri, SMSTO_SCHEME, strlen(SMSTO_SCHEME))) {
         std::string request_uri = std::string(SMS_SCHEME) + std::string(uri + strlen(SMSTO_SCHEME));
         launch_message(request_uri.c_str());
         return EINA_TRUE;
     }
-
     return EINA_FALSE;
 }
 
@@ -416,8 +410,9 @@ Eina_Bool WebView::launch_email(const char *uri)
             app_control_destroy(app_control);
             return EINA_FALSE;
         }
-    } else
+    } else {
         return EINA_FALSE;
+    }
 
     it = uri_parts.find("subject");
     if (it != uri_parts.end()) {
@@ -440,7 +435,7 @@ Eina_Bool WebView::launch_email(const char *uri)
         size_t size = it->second.size();
         const char* cc[size];
         int i = 0;
-        for(auto item : it->second) {
+        for (auto item : it->second) {
             cc[i] = item.c_str();
             ++i;
         }
@@ -455,7 +450,7 @@ Eina_Bool WebView::launch_email(const char *uri)
         size_t size = it->second.size();
         const char* bcc[size];
         int i = 0;
-        for(auto item : it->second) {
+        for (auto item : it->second) {
             bcc[i] = item.c_str();
             ++i;
         }
@@ -511,8 +506,9 @@ Eina_Bool WebView::launch_contact(const char *uri, const char *protocol)
                 app_control_destroy(app_control);
                 return EINA_FALSE;
             }
-        } else
+        } else {
             BROWSER_LOGE("Not supported protocol!");
+        }
     }
     if (app_control_send_launch_request(app_control, NULL, NULL) < 0) {
         BROWSER_LOGE("Fail to launch app_control operation");
@@ -576,8 +572,9 @@ Eina_Bool WebView::launch_message(const char *uri)
             return EINA_FALSE;
         }
     }
-    else
+    else {
         return EINA_FALSE;
+    }
 
     it = uri_parts.find("subject");
     if (it != uri_parts.end()) {
@@ -712,13 +709,12 @@ void WebView::stopLoading(void)
 void WebView::reload(void)
 {
     m_isLoading = true;
-    if(m_loadError)
-    {
+    if (m_loadError) {
         m_loadError = false;
         ewk_view_url_set(m_ewkView, ewk_view_url_get(m_ewkView));
-    }
-    else
+    } else {
         ewk_view_reload(m_ewkView);
+    }
 }
 
 void WebView::back(void)
@@ -766,11 +762,11 @@ void WebView::confirmationResult(WebConfirmationPtr confirmation)
         Ewk_Certificate_Policy_Decision *request = m_confirmationCertificatenMap[cert];
         Eina_Bool result;
 
-        if (cert->getResult() == WebConfirmation::ConfirmationResult::Confirmed)
+        if (cert->getResult() == WebConfirmation::ConfirmationResult::Confirmed) {
             result = EINA_TRUE;
-        else if (cert->getResult() == WebConfirmation::ConfirmationResult::Rejected)
+        } else if (cert->getResult() == WebConfirmation::ConfirmationResult::Rejected) {
             result = EINA_FALSE;
-        else {
+        } else {
             BROWSER_LOGE("Wrong ConfirmationResult");
             return;
         }
@@ -815,8 +811,7 @@ tools::BrowserImagePtr WebView::captureSnapshot(int targetWidth, int targetHeigh
         area.y = 0;
         area.w = vh*getZoomFactor()*snapshotProportions;
         area.h = vh*getZoomFactor();
-    }
-    else {
+    } else {
         area.x = 0;
         area.y = 0;
         area.w = vw*getZoomFactor();
@@ -836,7 +831,7 @@ tools::BrowserImagePtr WebView::captureSnapshot(int targetWidth, int targetHeigh
             BROWSER_LOGD("[%s:%d] ewk_view_screenshot_contents_get_async API failed", __func__, __LINE__);
     } else {
         Evas_Object *snapshot = ewk_view_screenshot_contents_get(m_ewkView, area, scale, evas_object_evas_get(m_ewkView));
-        BROWSER_LOGD("[%s:%d] Snapshot (screenshot) catched, evas pointer: %p",__func__, __LINE__, snapshot);
+        BROWSER_LOGD("[%s:%d] Snapshot (screenshot) catched, evas pointer: %p", __func__, __LINE__, snapshot);
         if (snapshot)
             return std::make_shared<tools::BrowserImage>(snapshot);
     }
@@ -862,7 +857,7 @@ void WebView::__newWindowRequest(void *data, Evas_Object *, void *out)
     std::shared_ptr<basic_webengine::AbstractWebEngine<Evas_Object>>  m_webEngine;
     m_webEngine = std::dynamic_pointer_cast
     <
-        basic_webengine::AbstractWebEngine<Evas_Object>,tizen_browser::core::AbstractService
+        basic_webengine::AbstractWebEngine<Evas_Object>, tizen_browser::core::AbstractService
     >
     (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.webengineservice"));
     M_ASSERT(m_webEngine);
@@ -893,7 +888,7 @@ void WebView::__closeWindowRequest(void *data, Evas_Object *, void *)
     WebView * self = reinterpret_cast<WebView *>(data);
     std::shared_ptr<AbstractWebEngine<Evas_Object>> m_webEngine =
                 std::dynamic_pointer_cast
-                <basic_webengine::AbstractWebEngine<Evas_Object>,tizen_browser::core::AbstractService>
+                <basic_webengine::AbstractWebEngine<Evas_Object>, tizen_browser::core::AbstractService>
                 (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.webengineservice"));
     m_webEngine->closeTab(self->getTabId());
 }
@@ -960,14 +955,11 @@ void WebView::__loadError(void* data, Evas_Object * obj, void* ewkError)
 
     BROWSER_LOGD("[%s:%d] emiting signal ", __PRETTY_FUNCTION__, __LINE__);
     int errorCode = ewk_error_code_get(error);
-    if(errorCode == EWK_ERROR_NETWORK_STATUS_CANCELLED)
-    {
+    if (errorCode == EWK_ERROR_NETWORK_STATUS_CANCELLED) {
         BROWSER_LOGD("Stop signal emitted");
         BROWSER_LOGD("Error description: %s", ewk_error_description_get(error));
         evas_object_smart_callback_call(obj, "load,stop", nullptr);
-    }
-    else
-    {
+    } else {
         self->loadError();
         self->m_loadError=true;
     }
@@ -1002,10 +994,10 @@ void WebView::__backForwardListChanged(void * data, Evas_Object * /* obj */, voi
 
 void WebView::__faviconChanged(void* data, Evas_Object*, void*)
 {
-    if(data)
+    if (data)
     {
         WebView * self = static_cast<WebView *>(data);
-        Evas_Object * favicon = ewk_context_icon_database_icon_object_add(self->m_ewkContext, ewk_view_url_get(self->m_ewkView),evas_object_evas_get(self->m_ewkView));
+        Evas_Object * favicon = ewk_context_icon_database_icon_object_add(self->m_ewkContext, ewk_view_url_get(self->m_ewkView), evas_object_evas_get(self->m_ewkView));
         if (favicon) {
             BROWSER_LOGD("[%s:%d] Favicon received", __PRETTY_FUNCTION__, __LINE__);
             self->m_faviconImage = std::make_shared<tools::BrowserImage>(favicon);
@@ -1145,7 +1137,7 @@ context_menu_type WebView::_get_menu_type(Ewk_Context_Menu *menu)
         return TEXT_LINK;
     if (image && !link)
         return IMAGE_ONLY;
-    if(selection_mode && image && link)
+    if (selection_mode && image && link)
         return TEXT_IMAGE_LINK;
     if (image && link)
         return IMAGE_LINK;
@@ -1167,7 +1159,7 @@ void WebView::_show_context_menu_text_link(Ewk_Context_Menu *menu)
     /* Open */
     ewk_context_menu_item_append_as_action(menu, EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK, _("IDS_BR_OPT_OPEN"), true);
     /* Open in new window */
-    ewk_context_menu_item_append_as_action(menu, EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_NEW_WINDOW,_("IDS_BR_OPT_OPEN_IN_NEW_WINDOW_ABB"), true);   //TODO: missing translation
+    ewk_context_menu_item_append_as_action(menu, EWK_CONTEXT_MENU_ITEM_TAG_OPEN_LINK_IN_NEW_WINDOW, _("IDS_BR_OPT_OPEN_IN_NEW_WINDOW_ABB"), true);   //TODO: missing translation
     /* Copy link text */
     //ewk_context_menu_item_append_as_action(menu, EWK_CONTEXT_MENU_ITEM_TAG_COPY_LINK_DATA, _("IDS_BR_OPT_COPY_TO_CLIPBOARD"), true);             //TODO: missing translation
     /* Copy link address */
@@ -1484,10 +1476,10 @@ double WebView::getZoomFactor() const
 
 void WebView::setZoomFactor(double zoomFactor)
 {
-    if(m_ewkView) {
+    if (m_ewkView) {
         //using zoomFactor = 0 sets zoom "fit to screen"
 
-        if(zoomFactor != getZoomFactor())
+        if (zoomFactor != getZoomFactor())
             ewk_view_page_zoom_set(m_ewkView, zoomFactor);
     }
 }