reorganized a way of file links to prevent exposing of class declarations.

Change-Id: I4c75dffa531549eb4cb2668adceedfba2e8aa0ab

diff --git a/src/include/efl/mobile/c/_ui_private.h b/src/include/efl/mobile/c/_ui_private.h
new file mode 100644 (file)
index 0000000..7c92efb
--- /dev/null
+++ b/src/include/efl/mobile/c/_ui_private.h
@@ -0,0 +1,22 @@
+/*
+ * 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_PRIVATE_H_
+#define _UI_PRIVATE_H_
+
+#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+
+#endif /* _UI_PRIVATE_H_ */

diff --git a/src/include/efl/mobile/c/_ui_private_view.h b/src/include/efl/mobile/c/_ui_private_view.h
new file mode 100644 (file)
index 0000000..68e24f3
--- /dev/null
+++ b/src/include/efl/mobile/c/_ui_private_view.h
@@ -0,0 +1,44 @@
+/*
+ * 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_PRIVATE_VIEW_H_
+#define _UI_PRIVATE_VIEW_H_
+
+namespace efl_viewmanager
+{
+
+class ui_view_event_attr
+{
+public:
+       ui_view_lifecycle_callback_s lifecycle_callback;
+       ui_view_event_callback_s event_callback;
+       void *lifecycle_data;
+       void *event_data;
+
+       ui_view_event_attr() : lifecycle_data(NULL), event_data(NULL)
+       {
+               this->lifecycle_callback = {0, };
+               this->event_callback = {0, };
+       }
+
+       ~ui_view_event_attr()
+       {
+       }
+};
+
+}
+
+#endif /* _UI_PRIVATE_VIEW_H_ */

diff --git a/src/include/efl/mobile/c/ui_application.h b/src/include/efl/mobile/c/ui_application.h
index 4d4de901cf9191b872e9a72cecc56d935c75476b..762a497f94d6c81df31485c8751c97311612aa6e 100644 (file)
--- a/src/include/efl/mobile/c/ui_application.h
+++ b/src/include/efl/mobile/c/ui_application.h
@@ -1,5 +1,5 @@
-#ifndef _UI_TIZEN_APP_CAPI_H_
-#define _UI_TIZEN_APP_CAPI_H_
+#ifndef _UI_APPLICATION_CAPI_H_
+#define _UI_APPLICATION_CAPI_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,4 +48,4 @@ bool ui_application_term(void);
 }
 #endif
 
-#endif /* _UI_TIZEN_APP_CAPI_H_ */
+#endif /* _UI_APPLICATION_CAPI_H_ */

diff --git a/src/include/efl/mobile/c/ui_mobile_viewmanager.h b/src/include/efl/mobile/c/ui_mobile_viewmanager.h
index 3dc470a2f507d839b91611490cbf6963266af9b5..f65c1dfa48c28e8c4b0cb1f4ce91667331414718 100644 (file)
--- a/src/include/efl/mobile/c/ui_mobile_viewmanager.h
+++ b/src/include/efl/mobile/c/ui_mobile_viewmanager.h
@@ -30,11 +30,10 @@
 #define Elm_Ctxpopup Evas_Object
 #endif
 
-//FIXME: totally temporary.
-#define ui_viewmgr void
-#define ui_view void
-#define ui_menu void
-#define ui_popup void
+typedef struct ui_viewmgr_s ui_viewmgr;
+typedef struct ui_view_s ui_view;
+typedef struct ui_menu_s ui_menu;
+typedef struct ui_popup_s ui_popup;
 
 //FIXME: better way?
 #include "../../../interface/ui_iface_types.h"

diff --git a/src/include/efl/mobile/c/ui_private.h b/src/include/efl/mobile/c/ui_private.h
deleted file mode 100644 (file)
index c4fb255..0000000
--- a/src/include/efl/mobile/c/ui_private.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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_CAPI_PRIVATE_H_
-#define _UI_CAPI_PRIVATE_H_
-
-namespace efl_viewmanager
-{
-
-class ui_view_event_attr
-{
-public:
-       ui_view_lifecycle_callback_s lifecycle_callback;
-       ui_view_event_callback_s event_callback;
-       void *lifecycle_data;
-       void *event_data;
-
-       ui_view_event_attr() : lifecycle_data(NULL), event_data(NULL)
-       {
-               this->lifecycle_callback = {0, };
-               this->event_callback = {0, };
-       }
-
-       ~ui_view_event_attr()
-       {
-       }
-};
-
-}
-
-#endif /* _UI_CAPI_PRIVATE_H_ */

diff --git a/src/include/efl/mobile/c/ui_view.h b/src/include/efl/mobile/c/ui_view.h
index f2d0094088fbec46e6268eb83a409edb8cde1bd6..9e88547ac5d846350a02df3c2b49767d46534415 100644 (file)
--- a/src/include/efl/mobile/c/ui_view.h
+++ b/src/include/efl/mobile/c/ui_view.h
@@ -5,6 +5,7 @@
 extern "C" {
 #endif
 
+
 /**
  *  @brief ui_view's lifecycle callback function signature.
  */
@@ -57,6 +58,7 @@ typedef struct
        ui_view_event_menu_cb menu;
 } ui_view_event_callback_s;
 
+
 /**
  *  @brief A constructor for an ui_view.
  *

diff --git a/src/lib/efl/mobile/c/ui_application.cpp b/src/lib/efl/mobile/c/ui_application.cpp
index 05d27d5a05af4b113490ffba263afb767e01ff22..6c5ffa5e0b0171d64a074dd67b5adb406fee875e 100644 (file)
--- a/src/lib/efl/mobile/c/ui_application.cpp
+++ b/src/lib/efl/mobile/c/ui_application.cpp
@@ -1,5 +1,5 @@
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
-#include "../../../../include/efl/mobile/c/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/_ui_private.h"
+#include "../../../../include/efl/mobile/c/ui_application.h"
 
 using namespace efl_viewmanager;
 

diff --git a/src/lib/efl/mobile/c/ui_menu.cpp b/src/lib/efl/mobile/c/ui_menu.cpp
index c72b9d70ba2d1b1fcb3182ef29b0b1a83fd2847b..28e392dca6842cf3a8bc3af9649183b7575d798e 100644 (file)
--- a/src/lib/efl/mobile/c/ui_menu.cpp
+++ b/src/lib/efl/mobile/c/ui_menu.cpp
@@ -1,8 +1,13 @@
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/_ui_private.h"
 #include "../../../../include/efl/mobile/c/ui_menu.h"
 
 using namespace efl_viewmanager;
 
+struct ui_menu_s
+{
+       ui_menu *p;
+};
+
 bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup)
 {
        if (!menu)

diff --git a/src/lib/efl/mobile/c/ui_popup.cpp b/src/lib/efl/mobile/c/ui_popup.cpp
index 6ab5388269ce4099e1e79b78447c56d64b29a7ec..6950ae4166006229c8fdbf49a2edaa4fdbef63a7 100644 (file)
--- a/src/lib/efl/mobile/c/ui_popup.cpp
+++ b/src/lib/efl/mobile/c/ui_popup.cpp
@@ -1,8 +1,13 @@
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/_ui_private.h"
 #include "../../../../include/efl/mobile/c/ui_popup.h"
 
 using namespace efl_viewmanager;
 
+struct ui_popup_s
+{
+       ui_popup *p;
+};
+
 ui_popup *ui_popup_create(ui_view *view)
 {
        return new ui_popup(view);

diff --git a/src/lib/efl/mobile/c/ui_standard_view.cpp b/src/lib/efl/mobile/c/ui_standard_view.cpp
index a36dacce32f5e40615be8496f508e6da03300bb9..c7f8ad98091782416f1fd65c22a0841e31daac06 100644 (file)
--- a/src/lib/efl/mobile/c/ui_standard_view.cpp
+++ b/src/lib/efl/mobile/c/ui_standard_view.cpp
@@ -1,7 +1,7 @@
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/_ui_private.h"
 #include "../../../../include/efl/mobile/c/ui_view.h"
 #include "../../../../include/efl/mobile/c/ui_standard_view.h"
-#include "../../../../include/efl/mobile/c/ui_private.h"
+#include "../../../../include/efl/mobile/c/_ui_private_view.h"
 
 using namespace efl_viewmanager;
 
@@ -126,6 +126,11 @@ public:
        }
 };
 
+struct ui_standard_view_s
+{
+       ui_standard_view_capi *p;
+};
+
 ui_view* ui_standard_view_create(const char *name)
 {
        return new ui_standard_view_capi(name);

diff --git a/src/lib/efl/mobile/c/ui_view.cpp b/src/lib/efl/mobile/c/ui_view.cpp
index fb69dc4f996f81e470876869741dad87e522c0fa..7d862e1dd38f33f77a8f279eabbf4195d2e2c236 100644 (file)
--- a/src/lib/efl/mobile/c/ui_view.cpp
+++ b/src/lib/efl/mobile/c/ui_view.cpp
@@ -1,6 +1,6 @@
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/_ui_private.h"
 #include "../../../../include/efl/mobile/c/ui_view.h"
-#include "../../../../include/efl/mobile/c/ui_private.h"
+#include "../../../../include/efl/mobile/c/_ui_private_view.h"
 
 using namespace efl_viewmanager;
 
@@ -125,6 +125,11 @@ public:
        }
 };
 
+struct ui_view_s
+{
+       ui_view_capi *p;
+};
+
 bool ui_view_lifecycle_callbacks_set(ui_view *view, ui_view_lifecycle_callback_s *lifecycle_callback, void *data)
 {
        if (!view)

diff --git a/src/lib/efl/mobile/c/ui_viewmgr.cpp b/src/lib/efl/mobile/c/ui_viewmgr.cpp
index 19fe2d85b9f46072e029a7dda25c33b7be45a3ae..aca72351446292f8c0af4f63d2dd95d5cbd6af3c 100644 (file)
--- a/src/lib/efl/mobile/c/ui_viewmgr.cpp
+++ b/src/lib/efl/mobile/c/ui_viewmgr.cpp
@@ -1,8 +1,13 @@
-#include "../../../../include/efl/mobile/ui_mobile_viewmanager.h"
+#include "../../../../include/efl/mobile/c/_ui_private.h"
 #include "../../../../include/efl/mobile/c/ui_viewmgr.h"
 
 using namespace efl_viewmanager;
 
+struct ui_viewmgr_s
+{
+       ui_viewmgr *p;
+};
+
 ui_view *ui_viewmgr_view_push(ui_viewmgr *viewmgr, ui_view *view)
 {
        if (!viewmgr || !view)