clear code and update copyrights

Change-Id: I5e7e2da89d3266c2a6318786d00259858bedab81

diff --git a/AUTHORS b/AUTHORS
index 2bb03d8eb21cdac2b647e6d28df7cd4203c49eef..66fe17e05ee7d5cff2b280ec697a946655525a1d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,2 @@
-Chuneon Park <chuneon.park@samsung.com>
+Hermet Park <chuneon.park@samsung.com>
 Woochan Lee <wc0917.lee@samsung.com>

diff --git a/inc/main.h b/inc/main.h
index 4cf5095ae611e6047473917ce5f63a835e8138a1..9624a714241501b28dd617bee96cd4f56ed89575 100644 (file)
--- a/inc/main.h
+++ b/inc/main.h
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
  *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
-
 #include <app.h>
 #include <system_settings.h>
 #include <dlog.h>

diff --git a/src/efl/efl_viewmgr.h b/src/efl/efl_viewmgr.h
index 7dc04b27dab073129049b8161a1cf49df32f5cf5..7a6c43baeddda5ad252d04ebbd5da5e6626b30dd 100644 (file)
--- a/src/efl/efl_viewmgr.h
+++ b/src/efl/efl_viewmgr.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #include "ui_viewmgr.h"
 #include "ui_controller.h"
 #include "ui_view.h"

diff --git a/src/efl/mobile/efl_viewmgr.h b/src/efl/mobile/efl_viewmgr.h
index b2389bd62cb1aa37df6b8f6884547d61648106b2..23fb3c3c955e30a7a4e6e48d485517e0d447a5ab 100644 (file)
--- a/src/efl/mobile/efl_viewmgr.h
+++ b/src/efl/mobile/efl_viewmgr.h
@@ -1 +1,17 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #include "ui_basic_view.h"

diff --git a/src/efl/mobile/ui_basic_view.cpp b/src/efl/mobile/ui_basic_view.cpp
index 64b32d5909d08dde18f16bdecf4904da2ffd2da0..20e62bdb7280657f536ca428c474427d665fb34e 100644 (file)
--- a/src/efl/mobile/ui_basic_view.cpp
+++ b/src/efl/mobile/ui_basic_view.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #include "efl_viewmgr.h"
 
 using namespace efl;

diff --git a/src/efl/mobile/ui_basic_view.h b/src/efl/mobile/ui_basic_view.h
index 9104886cad76f5fcbce400a85eb05bae932273b3..cbefb472136ba3632da2204b4573ce8588c47baa 100644 (file)
--- a/src/efl/mobile/ui_basic_view.h
+++ b/src/efl/mobile/ui_basic_view.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #ifndef UI_BASIC_VIEW
 #define UI_BASIC_VIEW
 

diff --git a/src/efl/ui_controller.cpp b/src/efl/ui_controller.cpp
index d195cc0fe2d7c3dbcd8b8e0a3d8da2b218a63cec..58e56f137168d13e80d28b3646d0e3e31169478d 100644 (file)
--- a/src/efl/ui_controller.cpp
+++ b/src/efl/ui_controller.cpp
@@ -1,9 +1,24 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #include "efl_viewmgr.h"
 
 using namespace efl;
 
-ui_view *
-ui_controller::get_view()
+ui_view * ui_controller::get_view()
 {
        ui_view_base *view = ui_controller_base::get_view();
        if (!view) return NULL;

diff --git a/src/efl/ui_controller.h b/src/efl/ui_controller.h
index d9de73ef2bb5280b482e2aea5b4ecb3af8910296..9f032aebf8ee809feeb3fef27666716e654c71f4 100644 (file)
--- a/src/efl/ui_controller.h
+++ b/src/efl/ui_controller.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #ifndef UI_CONTROLLER
 #define UI_CONTROLLER
 

diff --git a/src/efl/ui_view.cpp b/src/efl/ui_view.cpp
index 4f0dda0b62cad984bf773b9dc8f6786408a69e67..6ae7399f5dac1e16e3b901ae1150d7d18cfc735e 100644 (file)
--- a/src/efl/ui_view.cpp
+++ b/src/efl/ui_view.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #include "efl_viewmgr.h"
 
 using namespace efl;

diff --git a/src/efl/ui_view.h b/src/efl/ui_view.h
index 51ffd629454a0a9e503c30f5ec57b6ae64157320..3ec530dd523f49c19658c45fbf85384c88d759ea 100644 (file)
--- a/src/efl/ui_view.h
+++ b/src/efl/ui_view.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #ifndef UI_VIEW
 #define UI_VIEW
 

diff --git a/src/efl/ui_viewmgr.cpp b/src/efl/ui_viewmgr.cpp
index 8e0bc2d7992c858711c8da99b554552348667ca1..dd7e4bf0cae9e27a487095430e7f50ee9dd35bce 100644 (file)
--- a/src/efl/ui_viewmgr.cpp
+++ b/src/efl/ui_viewmgr.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #include "efl_viewmgr.h"
 
 using namespace efl;

diff --git a/src/efl/ui_viewmgr.h b/src/efl/ui_viewmgr.h
index c76a2ce0293fb26cc98289ce4325625523939ddf..4bb927362b21b80be1480877133a66ee773d4b07 100644 (file)
--- a/src/efl/ui_viewmgr.h
+++ b/src/efl/ui_viewmgr.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #ifndef UI_VIEWMGR
 #define UI_VIEWMGR
 

diff --git a/src/interface/ui_controller_base.cpp b/src/interface/ui_controller_base.cpp
index b751a22599249504804f201b7db511939ddc19ef..1fa7901a33cfd38e3300daf0de69fa4f204ceabd 100644 (file)
--- a/src/interface/ui_controller_base.cpp
+++ b/src/interface/ui_controller_base.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #include "ui_viewmgr.h"
 
 void ui_controller_base::set_view(ui_view_base *view)

diff --git a/src/interface/ui_controller_base.h b/src/interface/ui_controller_base.h
index d48ba7caddbea0c4fce52a8611f749a2443267b3..b4902c28d5c3c1de0bf41dc21d7cbd3cbe29fb3e 100644 (file)
--- a/src/interface/ui_controller_base.h
+++ b/src/interface/ui_controller_base.h
@@ -1,11 +1,19 @@
 /*
- * ui_controller_base.h
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- *  Created on: Jan 15, 2016
- *  Author: Hermet Park <chuneon.park@samsung.com>
- *  Author: woochan lee <wc0917.lee@samsung.com>
  */
-
 #ifndef UI_CONTROLLER_BASE_H_
 #define UI_CONTROLLER_BASE_H_
 

diff --git a/src/interface/ui_view_base.cpp b/src/interface/ui_view_base.cpp
index 4c6e4dd73f86338a7a292eb5d3b8b3a223c9eb9d..1d0ed03b5b5f1038be0b6bbe7282699ae1a72f53 100644 (file)
--- a/src/interface/ui_view_base.cpp
+++ b/src/interface/ui_view_base.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #include "ui_viewmgr.h"
 
 void ui_view_base::set_event_block(bool block)

diff --git a/src/interface/ui_view_base.h b/src/interface/ui_view_base.h
index 5280e7d0d92e386daaa1b430b5c383c28e6183a7..d7b5cd27a61f8a9a2ae17b47ab0a6ccd6f396af2 100644 (file)
--- a/src/interface/ui_view_base.h
+++ b/src/interface/ui_view_base.h
@@ -1,11 +1,19 @@
 /*
- * ui_view_base.h
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- *  Created on: Jan 15, 2016
- *  Author: Hermet Park <chuneon.park@samsung.com>
- *  Author: woochan lee <wc0917.lee@samsung.com>
  */
-
 #ifndef UI_VIEW_BASE_H_
 #define UI_VIEW_BASE_H_
 

diff --git a/src/interface/ui_viewmgr.h b/src/interface/ui_viewmgr.h
index 3a966219389c2fafbc1cc7461db0ce68a4847dc2..512525fc8300ccd71e4bdc41f9a4a1cb51364c6e 100644 (file)
--- a/src/interface/ui_viewmgr.h
+++ b/src/interface/ui_viewmgr.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #include <app.h>
 #include <dlog.h>
 

diff --git a/src/interface/ui_viewmgr_base.cpp b/src/interface/ui_viewmgr_base.cpp
index 34ef0a01be4bd5b180424e38c0ede905d4ae036b..a72906e7cfb977864e3933ffc3e7df26114f0901 100644 (file)
--- a/src/interface/ui_viewmgr_base.cpp
+++ b/src/interface/ui_viewmgr_base.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 #include "ui_viewmgr.h"
 
 bool ui_viewmgr_base::_connect_view(ui_view_base *view)

diff --git a/src/interface/ui_viewmgr_base.h b/src/interface/ui_viewmgr_base.h
index 1b3d676932ea83eab74735975680b45cf337d621..772e7ea12f0352f193aa03678cae00588d3df57a 100644 (file)
--- a/src/interface/ui_viewmgr_base.h
+++ b/src/interface/ui_viewmgr_base.h
@@ -1,11 +1,19 @@
 /*
- * ui_viewmgr_base.h
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  *
- *  Created on: Jan 15, 2016
- *  Author: Hermet Park <chuneon.park@samsung.com>
- *  Author: woochan lee <wc0917.lee@samsung.com>
  */
-
 #ifndef UI_WINDOW_BASE_H_
 #define UI_WINDOW_BASE_H_
 

diff --git a/src/main.cpp b/src/main.cpp
index 2288b7b6e16326df3e8b0731d7e4082f9163329e..368fd3b400aa93b1e7843c36e11be79f00f90431 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  *  limitations under the License.
  *
  */
-
 #include "main.h"
 #include "page4_controller.h"
 #include "page3_controller.h"
@@ -68,7 +67,7 @@ static void create_base_gui(appdata_s *ad)
        //FIXME: Hide this creation.
        ad->viewmgr = new ui_viewmgr(PACKAGE);
 
-       page1_controller *page1 = new page1_controller(ad);
+       page1(ad);
 
        ad->viewmgr->activate();
 }

diff --git a/src/page1_controller.h b/src/page1_controller.h
index 2cc33a0cfaf95de179230b138a504e01735e8f7c..031eed6e9123b34313d7374e460006f9e98c2449 100644 (file)
--- a/src/page1_controller.h
+++ b/src/page1_controller.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 class page1_controller: public ui_controller
 {
 private:
@@ -31,9 +47,15 @@ public:
                        [](void *data, Evas_Object *obj, void *event_info) -> void
                        {
                                appdata_s *ad = static_cast<appdata_s *>(data);
-                               page2_controller *controller = new page2_controller(ad);
-                       }, this->ad);
+                               page2(ad);
+                       },
+                       this->ad);
 
                view->set_content(content, "Title");
        }
 };
+
+void page1(appdata_s *ad)
+{
+       new page1_controller(ad);
+}

diff --git a/src/page2_controller.h b/src/page2_controller.h
index 64c2eac7921485e17e3db88c56b199a4f8b145b9..a1ee6d8dbaebc37d8e27c11f74aeb49b7a92b125 100644 (file)
--- a/src/page2_controller.h
+++ b/src/page2_controller.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 class page2_controller: public ui_controller
 {
 private:
@@ -31,8 +47,9 @@ public:
                        [](void *data, Evas_Object *obj, void *event_info) -> void
                        {
                                appdata_s *ad = static_cast<appdata_s *>(data);
-                               page3_controller *controller = new page3_controller(ad);
-                       }, this->ad);
+                               page3(ad);
+                       },
+                       this->ad);
 
                //Title left button
                Evas_Object *left_title_btn = elm_button_add(view->get_base());
@@ -46,3 +63,8 @@ public:
                view->set_content(content, "Title Buttons", NULL, NULL, left_title_btn, right_title_btn);
        }
 };
+
+void page2(appdata_s *ad)
+{
+       new page2_controller(ad);
+}

diff --git a/src/page3_controller.h b/src/page3_controller.h
index 3726c18c2ecc09e8b7f44372a62478a766b3afef..0eebfe46d8d68aed54187471a855d51ff34d1fc3 100644 (file)
--- a/src/page3_controller.h
+++ b/src/page3_controller.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 class page3_controller: public ui_controller
 {
 private:
@@ -32,10 +48,16 @@ public:
                        [](void *data, Evas_Object *obj, void *event_info) -> void
                        {
                                appdata_s *ad = static_cast<appdata_s *>(data);
-                               page4_controller *controller = new page4_controller(ad);
-                       }, this->ad);
+                               page4(ad);
+                       },
+                       this->ad);
 
                //Arguments: content, title, subtitle, icon, title left button, title right button
                view->set_content(content, "Title", "Subtitle", NULL, NULL, NULL);
        }
 };
+
+void page3(appdata_s *ad)
+{
+       new page3_controller(ad);
+}

diff --git a/src/page4_controller.h b/src/page4_controller.h
index 268ec63ee2b92fb281de73d5e9dd90fd326f72da..17a5aec92916be0a84992928311b050a1b2f124d 100644 (file)
--- a/src/page4_controller.h
+++ b/src/page4_controller.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *               http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 class page4_controller: public ui_controller
 {
 private:
@@ -40,3 +56,8 @@ public:
                view->set_title_badge("999+");
        }
 };
+
+void page4(appdata_s *ad)
+{
+       new page4_controller(ad);
+}