summaryrefslogtreecommitdiff
path: root/src/bin/edje
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-11-25 15:09:00 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-11-25 15:09:00 +0900
commitee0eb1336b0879351b9ff838adbd640f02d05527 (patch)
treebe3447e4c48c8267f76cf9f89a976fa0e795572d /src/bin/edje
parent26c943bac0d4b62bce63a6b575c58d15e5e6113f (diff)
edje - remove old script_only code that used embryo (not lua)
thjis was deprecated even before efl 1.0 by never removed. lua replaced it for script_only objects and you havent been able to compile an edje file with script_only enabled since 1.0, so no point having the code here. this cleans up that code and cruft.
Diffstat (limited to 'src/bin/edje')
-rw-r--r--src/bin/edje/edje_cc_handlers.c9
-rw-r--r--src/bin/edje/edje_convert.c1
-rw-r--r--src/bin/edje/edje_data_convert.c1
3 files changed, 4 insertions, 7 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 845aa53ab2..289708f032 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -214,7 +214,7 @@ static void st_collections_group_inherit(void);
214static void st_collections_group_program_source(void); 214static void st_collections_group_program_source(void);
215static void st_collections_group_part_remove(void); 215static void st_collections_group_part_remove(void);
216static void st_collections_group_program_remove(void); 216static void st_collections_group_program_remove(void);
217static void st_collections_group_script_only(void); 217static void st_collections_group_lua_script_only(void);
218static void st_collections_group_script_recursion(void); 218static void st_collections_group_script_recursion(void);
219static void st_collections_group_alias(void); 219static void st_collections_group_alias(void);
220static void st_collections_group_min(void); 220static void st_collections_group_min(void);
@@ -540,9 +540,8 @@ New_Statement_Handler statement_handlers[] =
540 {"collections.group.target_group", st_collections_group_target_group}, /* dup */ 540 {"collections.group.target_group", st_collections_group_target_group}, /* dup */
541 {"collections.group.part_remove", st_collections_group_part_remove}, 541 {"collections.group.part_remove", st_collections_group_part_remove},
542 {"collections.group.program_remove", st_collections_group_program_remove}, 542 {"collections.group.program_remove", st_collections_group_program_remove},
543 {"collections.group.script_only", st_collections_group_script_only}, 543 {"collections.group.lua_script_only", st_collections_group_lua_script_only},
544 {"collections.group.script_recursion", st_collections_group_script_recursion}, 544 {"collections.group.script_recursion", st_collections_group_script_recursion},
545 {"collections.group.lua_script_only", st_collections_group_script_only},
546 {"collections.group.alias", st_collections_group_alias}, 545 {"collections.group.alias", st_collections_group_alias},
547 {"collections.group.min", st_collections_group_min}, 546 {"collections.group.min", st_collections_group_min},
548 {"collections.group.max", st_collections_group_max}, 547 {"collections.group.max", st_collections_group_max},
@@ -3475,7 +3474,7 @@ st_collections_group_inherit(void)
3475/** 3474/**
3476 @page edcref 3475 @page edcref
3477 @property 3476 @property
3478 script_only 3477 lua_script_only
3479 @parameters 3478 @parameters
3480 [on/off] 3479 [on/off]
3481 @effect 3480 @effect
@@ -3484,7 +3483,7 @@ st_collections_group_inherit(void)
3484 @endproperty 3483 @endproperty
3485*/ 3484*/
3486static void 3485static void
3487st_collections_group_script_only(void) 3486st_collections_group_lua_script_only(void)
3488{ 3487{
3489 Edje_Part_Collection *pc; 3488 Edje_Part_Collection *pc;
3490 3489
diff --git a/src/bin/edje/edje_convert.c b/src/bin/edje/edje_convert.c
index 41e319b6b6..fc98722a7b 100644
--- a/src/bin/edje/edje_convert.c
+++ b/src/bin/edje/edje_convert.c
@@ -371,7 +371,6 @@ _edje_collection_convert(Eet_File *ef, Edje_Part_Collection_Directory_Entry *ce,
371 edc->prop.max = oedc->prop.max; 371 edc->prop.max = oedc->prop.max;
372 edc->script = oedc->script; 372 edc->script = oedc->script;
373 edc->part = oedc->part; 373 edc->part = oedc->part;
374 edc->script_only = oedc->script_only;
375 edc->lua_script_only = oedc->lua_script_only; 374 edc->lua_script_only = oedc->lua_script_only;
376 edc->checked = oedc->checked; 375 edc->checked = oedc->checked;
377 376
diff --git a/src/bin/edje/edje_data_convert.c b/src/bin/edje/edje_data_convert.c
index 0f72a296fe..3d451bb617 100644
--- a/src/bin/edje/edje_data_convert.c
+++ b/src/bin/edje/edje_data_convert.c
@@ -437,7 +437,6 @@ _edje_edd_old_init(void)
437 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "prop.max.w", prop.max.w, EET_T_INT); 437 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "prop.max.w", prop.max.w, EET_T_INT);
438 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "prop.max.h", prop.max.h, EET_T_INT); 438 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "prop.max.h", prop.max.h, EET_T_INT);
439 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "id", id, EET_T_INT); 439 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "id", id, EET_T_INT);
440 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "script_only", script_only, EET_T_UCHAR);
441 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "lua_script_only", lua_script_only, EET_T_UCHAR); 440 EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_collection, Old_Edje_Part_Collection, "lua_script_only", lua_script_only, EET_T_UCHAR);
442 441
443 { 442 {