Use ELM_MAIN macro for main function 52/99152/1
authorKyungwook Tak <k.tak@samsung.com>
Tue, 22 Nov 2016 05:20:54 +0000 (14:20 +0900)
committerKyungwook Tak <k.tak@samsung.com>
Tue, 22 Nov 2016 05:20:54 +0000 (14:20 +0900)
ELM_MAIN() macro is highly recommended instead of code main function
manually

Change-Id: I0a837302d56901e771d566b038a49b2c2f76d029
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
src/framework/ui/popup/main.cpp

index 435a954..a3f257f 100644 (file)
@@ -49,35 +49,15 @@ void updateLanguage(void)
        setlocale(LC_ALL, "");
 }
 
-struct ElmRaii {
-       ElmRaii(int argc, char **argv)
-       {
-               DEBUG("elm_init()");
-               elm_init(argc, argv);
-       }
-
-       virtual ~ElmRaii()
-       {
-               DEBUG("elm_shutdown()");
-               /* TODO: do shutdown.
-                *   shutdown generates segmentation fault by unknown reason.
-                */
-               //      elm_shutdown();
-       }
-};
-
 } // namespace anonymous
 
-int main(int argc, char **argv)
+int elm_main(int, char **)
 {
        try {
                Csr::Audit::Logger::setTag("CSR_POPUP");
 
                INFO("CSR popup service start!");
 
-               /* init/shutdown elm automatically */
-               ElmRaii elmRaii(argc, argv);
-
                std::signal(SIGTERM, [](int signal) {
                        WARN("Popup is terminated by signal[" << strsignal(signal) << "]");
                        /* cleanup and close up stuff here */
@@ -101,3 +81,4 @@ int main(int argc, char **argv)
                return -1;
        }
 }
+ELM_MAIN()