Removed dead code from SimpleUI

[Issue#:]   https://bugs.tizen.org/jira/browse/TT-157
[Problem:]  SimpleUI contains dead code. Lots of unimplemented and
            unused methods in class definition.
[Cause:]    N/A
[Solution:] Remove dead code and unused method definitions.
[Verify:]   Changes builds and doesn't breaks anything.

Change-Id: Id1e0df1abe445d8c2575b915e1a906d70bb1b741

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index c5b7ad3..4827b3d 100644 (file)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -56,16 +56,18 @@ EXPORT_SERVICE(SimpleUI, "org.tizen.browser.simpleui")
 const std::string HomePageURL = "about:home";
 const int ROOT_FOLDER = 0;
 
+
 SimpleUI::SimpleUI()
     : AbstractMainWindow()
     , m_popup(nullptr)
+    , m_webPageUI()
     , m_moreMenuUI()
-    , m_tabUI()
     , m_bookmarkManagerUI()
     , m_mainUI()
+    , m_historyUI()
+    , m_settingsUI()
+    , m_tabUI()
     , m_initialised(false)
-    , items_vector()
-    , m_networkErrorPopup(0)
     , m_wvIMEStatus(false)
     , m_ewkContext(ewk_context_new())
 {
@@ -383,7 +385,6 @@ void SimpleUI::connectModelSignals()
     m_favoriteService->bookmarkAdded.connect(boost::bind(&SimpleUI::onBookmarkAdded, this,_1));
     m_favoriteService->bookmarkDeleted.connect(boost::bind(&SimpleUI::onBookmarkRemoved, this, _1));
 
-    m_historyService->historyAdded.connect(boost::bind(&SimpleUI::onHistoryAdded, this,_1));
     m_historyService->historyDeleted.connect(boost::bind(&SimpleUI::onHistoryRemoved, this,_1));
 
     m_platformInputManager->returnPressed.connect(boost::bind(&elm_exit));
@@ -401,18 +402,6 @@ void SimpleUI::createActions()
     m_settingPrivateBrowsing->setCheckable(true);
     m_settingPrivateBrowsing->setChecked(m_webEngine->isPrivateMode());
     m_settingPrivateBrowsing->setEnabled(true);
-
-    m_settingDeleteHistory = sharedAction(new Action("Delete history"));
-    m_settingDeleteHistory->setToolTip("Delete History");
-
-    m_settingDeleteData = sharedAction(new Action("Delete data"));
-    m_settingDeleteData->setToolTip("Delete Data");
-
-    m_settingDeleteFavorite = sharedAction(new Action("Delete favorite site"));
-    m_settingDeleteFavorite->setToolTip("Delete favorite site");
-
-    m_bookmarks_manager_BookmarkBar = sharedAction(new Action("Bookmark Bar"));
-    m_bookmarks_manager_BookmarkBar->setToolTip("show Bookmark bar");
 }
 
 void SimpleUI::connectActions()
@@ -516,7 +505,7 @@ bool SimpleUI::checkBookmark()
     }
 }
 // Consider removing these functions
-void SimpleUI::onBookmarkAdded(std::shared_ptr<tizen_browser::services::BookmarkItem> bookmarkItem)
+void SimpleUI::onBookmarkAdded(std::shared_ptr<tizen_browser::services::BookmarkItem>)
 {
     if (m_moreMenuUI) {
         m_moreMenuUI->changeBookmarkStatus(true);
@@ -533,10 +522,6 @@ void SimpleUI::onBookmarkRemoved(const std::string& uri)
     }
 }
 
-void SimpleUI::onHistoryAdded(std::shared_ptr<tizen_browser::services::HistoryItem> historyItem)
-{
-}
-
 void SimpleUI::onOpenURLInNewTab(std::shared_ptr<tizen_browser::services::HistoryItem> historyItem, bool desktopMode)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
@@ -615,27 +600,9 @@ void SimpleUI::stopEnable(bool enable)
     m_webPageUI->setStopButtonEnabled(enable);
 }
 
-void SimpleUI::addBookmarkEnable(bool enable)
-{
-}
-
-void SimpleUI::removeBookmarkEnable(bool enable)
-{
-}
-void SimpleUI::zoomEnable(bool enable)
-{
-    m_zoom_in->setEnabled(enable);
-}
-
-void SimpleUI::settingsButtonEnable(bool enable)
-{
-    m_webPageUI->setMoreMenuButtonEnabled(enable);
-}
-
 void SimpleUI::loadStarted()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    addBookmarkEnable(false);
     if(!m_webEngine->isPrivateMode()){
         m_currentSession.updateItem(m_webEngine->currentTabId().toString(), m_webEngine->getURI());
     }
@@ -651,8 +618,6 @@ void SimpleUI::loadFinished()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 
-    addBookmarkEnable(m_favoriteService->countBookmarks() < m_favoritesLimit);
-
     if(!m_webEngine->isPrivateMode()){
         m_historyService->addHistoryItem(std::make_shared<tizen_browser::services::HistoryItem> (m_webEngine->getURI(),
                                                                                                 m_webEngine->getTitle(),
@@ -689,7 +654,6 @@ void SimpleUI::filterURL(const std::string& url)
             m_webEngine->setURI(url);
     }
     m_webPageUI->getURIEntry().clearFocus();
-    //addBookmarkEnable(false);
 }
 
 void SimpleUI::webEngineURLChanged(const std::string url)
@@ -1041,29 +1005,10 @@ void SimpleUI::updateView() {
     m_webPageUI->setTabsNumber(tabs);
 }
 
-void SimpleUI::tabClosed(const tizen_browser::basic_webengine::TabId& id) {
+void SimpleUI::tabClosed(const tizen_browser::basic_webengine::TabId&) {
     updateView();
 }
 
-void SimpleUI::onNetworkError()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if (!m_networkErrorPopup) {
-        m_networkErrorPopup = SimplePopup::createPopup();
-        m_networkErrorPopup->setTitle("Network Error");
-        m_networkErrorPopup->addButton(CONNECT);
-        m_networkErrorPopup->addButton(CANCEL);
-        m_networkErrorPopup->setMessage("Network is disconnected. Please check the connection.");
-        m_networkErrorPopup->buttonClicked.connect(boost::bind(&SimpleUI::onNetErrorButtonPressed, this, _1, _2));
-        m_networkErrorPopup->show();
-    }
-}
-
-void SimpleUI::onNetErrorButtonPressed(PopupButtons, std::shared_ptr< PopupData >)
-{
-    m_networkErrorPopup = 0;
-}
-
 void SimpleUI::searchWebPage(std::string &text, int flags)
 {
     m_webEngine->searchOnWebsite(text, flags);

diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h
index 251ed47..40d836d 100644 (file)
--- a/services/SimpleUI/SimpleUI.h
+++ b/services/SimpleUI/SimpleUI.h
@@ -86,15 +86,9 @@ private:
     Evas_Object* createWebLayout(Evas_Object* parent);
     Evas_Object* createErrorLayout(Evas_Object* parent);
 
-
     void forwardEnable(bool enable);
     void stopEnable(bool enable);
     void reloadEnable(bool enable);
-    void addBookmarkEnable(bool enable);
-    void removeBookmarkEnable(bool enable);
-    void zoomEnable(bool enable);
-
-    void settingsButtonEnable(bool enable);
 
     void loadFinished();
     void progressChanged(double progress);
@@ -130,7 +124,6 @@ private:
     void onBookmarkClicked(std::shared_ptr<tizen_browser::services::BookmarkItem> bookmarkItem);
     void onBookmarkRemoved(const std::string& uri);
 
-    void onHistoryAdded(std::shared_ptr<tizen_browser::services::HistoryItem> historyItem);
     void onHistoryRemoved(const std::string& uri);
     void onOpenURLInNewTab(std::shared_ptr<tizen_browser::services::HistoryItem> historyItem, bool desktopMode);
     void onMostVisitedTileClicked(std::shared_ptr<tizen_browser::services::HistoryItem> historyItem, int itemsNumber);
@@ -145,17 +138,8 @@ private:
     void onActionTriggered(const Action& action);
     void setwvIMEStatus(bool status);
 
-    sharedAction m_share;
-    sharedAction m_zoom_in;
     sharedAction m_showBookmarkManagerUI;
-    sharedAction m_settingPointerMode;
     sharedAction m_settingPrivateBrowsing;
-    sharedAction m_settingDeleteHistory;
-    sharedAction m_settingDeleteData;
-    sharedAction m_settingDeleteFavorite;
-    sharedAction m_mostvisited;
-    sharedAction m_bookmarksvisited;
-    sharedAction m_bookmarks_manager_BookmarkBar;
 
     /**
      * \brief filters URL before it is passed to WebEngine.
@@ -207,14 +191,10 @@ private:
     void switchToDesktopMode();
     void showHistoryUI();
     void closeHistoryUI();
-    void showURIBar();
-    void hideURIBar();
-    void hideSettingsMenu();
     void showSettingsUI();
     void closeSettingsUI();
     void closeBookmarkManagerUI();
     void showBookmarkManagerUI();
-
     void showPopup(Evas_Object *content, char* btn1_text, char* btn2_text);
 
     void closeTab();
@@ -222,46 +202,37 @@ private:
 
     void settingsPointerModeSwitch(bool newState);
     void settingsPrivateModeSwitch(bool newState);
-    void settingsDeleteData();
-    void settingsDeleteFavorite();
     void settingsDeleteSelectedData(const std::string& str);
     void settingsResetMostVisited();
     void settingsResetBrowser();
     void onDeleteSelectedDataButton(PopupButtons button, std::shared_ptr<PopupData> popupData);
     void onDeleteMostVisitedButton(PopupButtons button, std::shared_ptr<PopupData> popupData);
     void onResetBrowserButton(PopupButtons button, std::shared_ptr<PopupData> popupData);
-    void onDeleteDataButton(PopupButtons button, std::shared_ptr<PopupData> popupData);
-    void onDeleteFavoriteButton(PopupButtons button, std::shared_ptr<PopupData> popupData);
     void tabLimitPopupButtonClicked(PopupButtons button, std::shared_ptr< PopupData > /*popupData*/);
-    void disableHistoryButton(bool flag);
     int tabsCount();
 
-    void onNetworkError();
-    void onNetErrorButtonPressed(PopupButtons, std::shared_ptr<PopupData>);
-
     void onReturnPressed(MenuButton *m);
     void onBackPressed();
 
+    void searchWebPage(std::string &text, int flags);
+
     std::string edjePath(const std::string &);
 
     Evas_Object *m_popup;
-    Evas_Object *m_entry;
-    Evas_Object *m_errorLayout;
 
     std::shared_ptr<WebPageUI> m_webPageUI;
     std::shared_ptr<basic_webengine::AbstractWebEngine<Evas_Object>>  m_webEngine;
-//     std::shared_ptr<tizen_browser::base_ui::URIEntry> m_simpleURI;
-    std::shared_ptr<tizen_browser::interfaces::AbstractFavoriteService> m_favoriteService;
-    std::shared_ptr<tizen_browser::services::HistoryService> m_historyService;
-    std::shared_ptr<tizen_browser::base_ui::MoreMenuUI> m_moreMenuUI;
-    std::shared_ptr<tizen_browser::base_ui::BookmarkManagerUI> m_bookmarkManagerUI;
-    std::shared_ptr<tizen_browser::base_ui::MainUI> m_mainUI;
-    std::shared_ptr<tizen_browser::base_ui::HistoryUI> m_historyUI;
-    std::shared_ptr<tizen_browser::base_ui::SettingsUI> m_settingsUI;
-    std::shared_ptr<tizen_browser::base_ui::TabUI> m_tabUI;
-    std::shared_ptr<tizen_browser::services::PlatformInputManager> m_platformInputManager;
-    std::shared_ptr<tizen_browser::services::SessionStorage> m_sessionService;
-    tizen_browser::Session::Session m_currentSession;
+    std::shared_ptr<interfaces::AbstractFavoriteService> m_favoriteService;
+    std::shared_ptr<services::HistoryService> m_historyService;
+    std::shared_ptr<MoreMenuUI> m_moreMenuUI;
+    std::shared_ptr<BookmarkManagerUI> m_bookmarkManagerUI;
+    std::shared_ptr<MainUI> m_mainUI;
+    std::shared_ptr<HistoryUI> m_historyUI;
+    std::shared_ptr<SettingsUI> m_settingsUI;
+    std::shared_ptr<TabUI> m_tabUI;
+    std::shared_ptr<services::PlatformInputManager> m_platformInputManager;
+    std::shared_ptr<services::SessionStorage> m_sessionService;
+    Session::Session m_currentSession;
     std::shared_ptr<BookmarksManager> m_bookmarks_manager;
     bool m_initialised;
     int m_tabLimit;
@@ -275,11 +246,6 @@ private:
     // consecutive webviews in the application, otherwise we would encounter a crash after creating
     // the first web view
     Ewk_Context *m_ewkContext;
-
-    std::vector<std::shared_ptr<tizen_browser::services::HistoryItem>> items_vector;
-    SimplePopup* m_networkErrorPopup;
-
-    void searchWebPage(std::string &text, int flags);
 };
 
 }