summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-09-25 10:31:35 +0100
committerTom Hacohen <tom@stosb.com>2014-09-25 10:46:04 +0100
commit86e6b8bc5ba8e7939a18e14fe9e37d80d2699fe8 (patch)
tree2ea9191dc77e07ba5d2a06396d3fd829ce2d0887 /src/lib
parent56aa60364aea6824d216182e77315a6765a5de54 (diff)
Eo: Get rid of eo_add_custom.
This has been deprecated for a while and is now completely dropped.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elm_app_client.c13
-rw-r--r--src/lib/elm_app_client.eo1
-rw-r--r--src/lib/elm_app_server.c11
-rw-r--r--src/lib/elm_app_server.eo1
-rw-r--r--src/lib/elm_win.c7
5 files changed, 6 insertions, 27 deletions
diff --git a/src/lib/elm_app_client.c b/src/lib/elm_app_client.c
index d4085d19a..c5bb56047 100644
--- a/src/lib/elm_app_client.c
+++ b/src/lib/elm_app_client.c
@@ -37,7 +37,7 @@ _sub_path_process(Elm_App_Client *eo, Eldbus_Message_Iter *obj_iter, Elm_App_Cli
37 if (view) 37 if (view)
38 continue; 38 continue;
39 39
40 view = eo_add_custom(ELM_APP_CLIENT_VIEW_CLASS, eo, 40 view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo,
41 elm_app_client_view_constructor(obj_path)); 41 elm_app_client_view_constructor(obj_path));
42 eina_hash_add(data->views, obj_path, view); 42 eina_hash_add(data->views, obj_path, view);
43 if (!loading_list) 43 if (!loading_list)
@@ -162,8 +162,6 @@ _elm_app_client_constructor(Eo *eo, Elm_App_Client_Data *data, const char *pkg)
162 162
163 EINA_SAFETY_ON_NULL_GOTO(pkg, error); 163 EINA_SAFETY_ON_NULL_GOTO(pkg, error);
164 164
165 eo_do_super(eo, MY_CLASS, eo_constructor());
166
167 data->views = eina_hash_string_small_new(NULL); 165 data->views = eina_hash_string_small_new(NULL);
168 166
169 path = _dbus_package_to_path(pkg); 167 path = _dbus_package_to_path(pkg);
@@ -221,7 +219,7 @@ _create_view_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
221 view = eina_hash_find(cdata->views, view_path); 219 view = eina_hash_find(cdata->views, view_path);
222 if (!view) 220 if (!view)
223 { 221 {
224 view = eo_add_custom(ELM_APP_CLIENT_VIEW_CLASS, eo, 222 view = eo_add(ELM_APP_CLIENT_VIEW_CLASS, eo,
225 elm_app_client_view_constructor(view_path)); 223 elm_app_client_view_constructor(view_path));
226 eina_hash_add(cdata->views, view_path, view); 224 eina_hash_add(cdata->views, view_path, view);
227 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED, 225 eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_EVENT_VIEW_CREATED,
@@ -308,13 +306,6 @@ _elm_app_client_view_open_cancel(Eo *eo EINA_UNUSED, Elm_App_Client_Data *_pd EI
308} 306}
309 307
310EOLIAN static void 308EOLIAN static void
311_elm_app_client_eo_base_constructor(Eo *obj, Elm_App_Client_Data *_pd EINA_UNUSED)
312{
313 eo_error_set(obj);
314 ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME);
315}
316
317EOLIAN static void
318_elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data) 309_elm_app_client_eo_base_destructor(Eo *eo, Elm_App_Client_Data *data)
319{ 310{
320 Eldbus_Object *obj; 311 Eldbus_Object *obj;
diff --git a/src/lib/elm_app_client.eo b/src/lib/elm_app_client.eo
index d54264a23..c2b4bdd1e 100644
--- a/src/lib/elm_app_client.eo
+++ b/src/lib/elm_app_client.eo
@@ -51,7 +51,6 @@ class Elm_App_Client (Eo.Base)
51 } 51 }
52 } 52 }
53 implements { 53 implements {
54 Eo.Base.constructor;
55 Eo.Base.destructor; 54 Eo.Base.destructor;
56 } 55 }
57 constructors { 56 constructors {
diff --git a/src/lib/elm_app_server.c b/src/lib/elm_app_server.c
index 4acc022b9..e5dc559ce 100644
--- a/src/lib/elm_app_server.c
+++ b/src/lib/elm_app_server.c
@@ -205,8 +205,6 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
205 EINA_SAFETY_ON_NULL_GOTO(data->create_view_cb, error); 205 EINA_SAFETY_ON_NULL_GOTO(data->create_view_cb, error);
206 EINA_SAFETY_ON_TRUE_GOTO(!pkg, error); 206 EINA_SAFETY_ON_TRUE_GOTO(!pkg, error);
207 207
208 eo_do_super(obj, MY_CLASS, eo_constructor());
209
210 data->views = eina_hash_string_small_new(NULL); 208 data->views = eina_hash_string_small_new(NULL);
211 data->PID = getpid(); 209 data->PID = getpid();
212 data->title = eina_stringshare_add(""); 210 data->title = eina_stringshare_add("");
@@ -257,7 +255,7 @@ _elm_app_server_constructor(Eo *obj, Elm_App_Server_Data *data, const char *pkg,
257 new_events = elm_app_server_view_props_new_events_get(view_eet_props); 255 new_events = elm_app_server_view_props_new_events_get(view_eet_props);
258 progress = elm_app_server_view_props_progress_get(view_eet_props); 256 progress = elm_app_server_view_props_progress_get(view_eet_props);
259 257
260 view = eo_add_custom(ELM_APP_SERVER_VIEW_CLASS, obj, 258 view = eo_add(ELM_APP_SERVER_VIEW_CLASS, obj,
261 elm_app_server_view_constructor(view_id)); 259 elm_app_server_view_constructor(view_id));
262 if (!view) 260 if (!view)
263 continue; 261 continue;
@@ -446,11 +444,4 @@ _elm_app_server_eo_base_destructor(Eo *obj, Elm_App_Server_Data *data)
446 eo_do_super(obj, MY_CLASS, eo_destructor()); 444 eo_do_super(obj, MY_CLASS, eo_destructor());
447} 445}
448 446
449EOLIAN static void
450_elm_app_server_eo_base_constructor(Eo *obj, Elm_App_Server_Data *_pd EINA_UNUSED)
451{
452 eo_error_set(obj);
453 ERR("Only custom constructor can be used with '%s' class", MY_CLASS_NAME);
454}
455
456#include "elm_app_server.eo.c" 447#include "elm_app_server.eo.c"
diff --git a/src/lib/elm_app_server.eo b/src/lib/elm_app_server.eo
index bd7748eb0..a15ebcabf 100644
--- a/src/lib/elm_app_server.eo
+++ b/src/lib/elm_app_server.eo
@@ -89,7 +89,6 @@ class Elm_App_Server (Eo.Base)
89 } 89 }
90 } 90 }
91 implements { 91 implements {
92 Eo.Base.constructor;
93 Eo.Base.destructor; 92 Eo.Base.destructor;
94 } 93 }
95 constructors { 94 constructors {
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index e3b05650d..54d1853d7 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2864,7 +2864,7 @@ elm_win_add(Evas_Object *parent,
2864 const char *name, 2864 const char *name,
2865 Elm_Win_Type type) 2865 Elm_Win_Type type)
2866{ 2866{
2867 Evas_Object *obj = eo_add_custom(MY_CLASS, parent, elm_obj_win_constructor(name, type)); 2867 Evas_Object *obj = eo_add(MY_CLASS, parent, elm_obj_win_constructor(name, type));
2868 eo_unref(obj); 2868 eo_unref(obj);
2869 return obj; 2869 return obj;
2870} 2870}
@@ -3505,10 +3505,9 @@ _elm_win_constructor(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_Type t
3505} 3505}
3506 3506
3507EOLIAN static void 3507EOLIAN static void
3508_elm_win_eo_base_constructor(Eo *obj, Elm_Win_Data *_pd EINA_UNUSED) 3508_elm_win_eo_base_constructor(Eo *obj EINA_UNUSED, Elm_Win_Data *_pd EINA_UNUSED)
3509{ 3509{
3510 eo_error_set(obj); 3510 /* Do nothing. */
3511 ERR("only custom constructor can be used with '%s' class", MY_CLASS_NAME);
3512} 3511}
3513 3512
3514EOLIAN static Elm_Win_Type 3513EOLIAN static Elm_Win_Type