Remove noexcept keyword

Change-Id: Icc32ff08efa6b697a1c7d44d3075c49ad122c170
Signed-off-by: yeji01kim <yeji01.kim@samsung.com>

diff --git a/src/gui.cpp b/src/gui.cpp
index 91f2eae..f66ffa1 100755 (executable)
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -135,7 +135,7 @@ void GraphicWorkbench::onWorkbenchAction(Evas_Object *obj, WorkbenchActionDelega
        ::elm_genlist_item_selected_set((Elm_Object_Item *) event, EINA_FALSE);
 }
 
-void GraphicWorkbench::onPolicySelected(Evas_Object *obj, AbstractPolicy *policy, void *event) noexcept
+void GraphicWorkbench::onPolicySelected(Evas_Object *obj, AbstractPolicy *policy, void *event)
 {
        // Called after the Policy group is selected.
        ::elm_genlist_item_selected_set((Elm_Object_Item *) event, EINA_FALSE);
@@ -154,7 +154,7 @@ void GraphicWorkbench::onPageDelete(Widget *widget)
        ::dlog_print(DLOG_DEBUG, LOG_TAG, "Item pop");
 }
 
-void GraphicWorkbench::createContents() noexcept
+void GraphicWorkbench::createContents()
 {
        // Create main view.
        window = new ConformantWindow(pkgName);

diff --git a/src/gui.h b/src/gui.h
index f5760a5..fc7c113 100755 (executable)
--- a/src/gui.h
+++ b/src/gui.h
@@ -49,10 +49,10 @@ public:
        int showConfirmPopup(const std::string& title, const std::string& msg);
 
 private:
-       void createContents() noexcept;
+       void createContents();
 
        void onWorkbenchAction(Evas_Object *obj, WorkbenchActionDelegate *action, void *event);
-       void onPolicySelected(Evas_Object *obj, AbstractPolicy *data, void *event) noexcept;
+       void onPolicySelected(Evas_Object *obj, AbstractPolicy *data, void *event);
        void onPageDelete(Widget *widget);
 
 private:

diff --git a/src/main.cpp b/src/main.cpp
index 4821f70..fa0e49e 100755 (executable)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,7 +22,7 @@
 
 int main(int argc, char *argv[])
 {
-       int ret;
+       int ret = 0;
        char *nullCheck =::strrchr(argv[0], '/');
        std::unique_ptr<Workbench> workbench = NULL;
        std::string name;
@@ -35,6 +35,7 @@ int main(int argc, char *argv[])
 
        try {
                workbench.reset(WorkbenchFactory::createInstance(name));
+               ret = workbench->run(argc, argv);
        }
        catch(runtime::Exception & e) {
                ::dlog_print(DLOG_ERROR, LOG_TAG, "%s", e.what());
@@ -42,7 +43,6 @@ int main(int argc, char *argv[])
                return -1;
        }
 
-       ret = workbench->run(argc, argv);
        PolicyCleaner::deletePolicies();
 
        return ret;