aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ecore/efl_io_copier.c
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-01-09 19:58:48 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-01-15 15:20:40 +0100
commit4fa559b3922d55ddc1ca8af96b8bb284a6167184 (patch)
tree84096503e7e2ae8e55799c92b669031a53f38893 /src/lib/ecore/efl_io_copier.c
parentemile+ tgv saver - stop using deprecated lz4 functions to remove warnings (diff)
downloadefl-devs/xartigas/turn-closer-into-interface.tar.gz
Make Efl.Ui.Closer an interface instead of mixindevs/xartigas/turn-closer-into-interface
Summary: It is a mixin only because of the setter method for the "closed" property, otherwise, it would be a pure interface. Nobody is setting that property, so let's just remove the setter (leaving only the getter) and make this class an interface. This should clear the scenario for languages currently having issues with mixins (like C#). Related to https://phab.enlightenment.org/T7601. Test Plan: Nothing changes. Make check and examples still work. Reviewers: zmike, bu5hm4n Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7570
Diffstat (limited to 'src/lib/ecore/efl_io_copier.c')
-rw-r--r--src/lib/ecore/efl_io_copier.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/ecore/efl_io_copier.c b/src/lib/ecore/efl_io_copier.c
index a03168807c..dbedfcf959 100644
--- a/src/lib/ecore/efl_io_copier.c
+++ b/src/lib/ecore/efl_io_copier.c
@@ -55,7 +55,7 @@ static void _efl_io_copier_read(Eo *o, Efl_Io_Copier_Data *pd);
efl_ref_count(pd->source), \
efl_io_reader_can_read_get(pd->source), \
efl_io_reader_eos_get(pd->source), \
- efl_isa(pd->source, EFL_IO_CLOSER_MIXIN) ? \
+ efl_isa(pd->source, EFL_IO_CLOSER_INTERFACE) ? \
efl_io_closer_closed_get(pd->source) : 0); \
if (!pd->destination) \
DBG("destination=NULL"); \
@@ -65,7 +65,7 @@ static void _efl_io_copier_read(Eo *o, Efl_Io_Copier_Data *pd);
efl_class_name_get(efl_class_get(pd->destination)), \
efl_ref_count(pd->destination), \
efl_io_writer_can_write_get(pd->destination), \
- efl_isa(pd->destination, EFL_IO_CLOSER_MIXIN) ? \
+ efl_isa(pd->destination, EFL_IO_CLOSER_INTERFACE) ? \
efl_io_closer_closed_get(pd->destination) : 0); \
} \
} \
@@ -418,7 +418,7 @@ _efl_io_copier_source_set(Eo *o, Efl_Io_Copier_Data *pd, Efl_Io_Reader *source)
_efl_io_copier_source_resized, o);
pd->progress.total = 0;
}
- if (efl_isa(pd->source, EFL_IO_CLOSER_MIXIN))
+ if (efl_isa(pd->source, EFL_IO_CLOSER_INTERFACE))
{
efl_event_callback_del(pd->source, EFL_IO_CLOSER_EVENT_CLOSED,
_efl_io_copier_source_closed, o);
@@ -441,7 +441,7 @@ _efl_io_copier_source_set(Eo *o, Efl_Io_Copier_Data *pd, Efl_Io_Reader *source)
_efl_io_copier_source_size_apply(o, pd);
}
- if (efl_isa(pd->source, EFL_IO_CLOSER_MIXIN))
+ if (efl_isa(pd->source, EFL_IO_CLOSER_INTERFACE))
{
efl_io_closer_close_on_exec_set(pd->source, efl_io_closer_close_on_exec_get(o));
efl_io_closer_close_on_invalidate_set(pd->source, efl_io_closer_close_on_invalidate_get(o));
@@ -505,7 +505,7 @@ _efl_io_copier_destination_set(Eo *o, Efl_Io_Copier_Data *pd, Efl_Io_Writer *des
if (pd->destination)
{
efl_event_callback_array_del(pd->destination, destination_cbs(), o);
- if (efl_isa(pd->destination, EFL_IO_CLOSER_MIXIN))
+ if (efl_isa(pd->destination, EFL_IO_CLOSER_INTERFACE))
{
efl_event_callback_del(pd->destination, EFL_IO_CLOSER_EVENT_CLOSED,
_efl_io_copier_destination_closed, o);
@@ -520,7 +520,7 @@ _efl_io_copier_destination_set(Eo *o, Efl_Io_Copier_Data *pd, Efl_Io_Writer *des
pd->destination = efl_ref(destination);
efl_event_callback_array_add(pd->destination, destination_cbs(), o);
- if (efl_isa(pd->destination, EFL_IO_CLOSER_MIXIN))
+ if (efl_isa(pd->destination, EFL_IO_CLOSER_INTERFACE))
{
efl_io_closer_close_on_exec_set(pd->destination, efl_io_closer_close_on_exec_get(o));
efl_io_closer_close_on_invalidate_set(pd->destination, efl_io_closer_close_on_invalidate_get(o));
@@ -656,7 +656,7 @@ _efl_io_copier_efl_io_closer_close(Eo *o, Efl_Io_Copier_Data *pd)
pd->progress.total = 0;
}
efl_event_callback_array_del(pd->source, source_cbs(), o);
- if (efl_isa(pd->source, EFL_IO_CLOSER_MIXIN) &&
+ if (efl_isa(pd->source, EFL_IO_CLOSER_INTERFACE) &&
!efl_io_closer_closed_get(pd->source))
{
efl_event_callback_del(pd->source, EFL_IO_CLOSER_EVENT_CLOSED,
@@ -668,7 +668,7 @@ _efl_io_copier_efl_io_closer_close(Eo *o, Efl_Io_Copier_Data *pd)
if (pd->destination)
{
efl_event_callback_array_del(pd->destination, destination_cbs(), o);
- if (efl_isa(pd->destination, EFL_IO_CLOSER_MIXIN) &&
+ if (efl_isa(pd->destination, EFL_IO_CLOSER_INTERFACE) &&
!efl_io_closer_closed_get(pd->destination))
{
efl_event_callback_del(pd->destination, EFL_IO_CLOSER_EVENT_CLOSED,
@@ -793,10 +793,10 @@ _efl_io_copier_done_get(const Eo *o, Efl_Io_Copier_Data *pd)
pd->source,
pd->source ? efl_class_name_get(pd->source) : "",
pd->source ? efl_io_reader_eos_get(pd->source) : 1,
- pd->source ? (efl_isa(pd->source, EFL_IO_CLOSER_MIXIN) ? efl_io_closer_closed_get(pd->source) : 0) : 1,
+ pd->source ? (efl_isa(pd->source, EFL_IO_CLOSER_INTERFACE) ? efl_io_closer_closed_get(pd->source) : 0) : 1,
pd->destination,
pd->destination ? efl_class_name_get(pd->destination) : "",
- pd->destination ? (efl_isa(pd->destination, EFL_IO_CLOSER_MIXIN) ? efl_io_closer_closed_get(pd->destination) : 0) : 1);
+ pd->destination ? (efl_isa(pd->destination, EFL_IO_CLOSER_INTERFACE) ? efl_io_closer_closed_get(pd->destination) : 0) : 1);
return pd->done;
}
@@ -896,10 +896,10 @@ _efl_io_copier_efl_io_closer_close_on_exec_set(Eo *o EINA_UNUSED, Efl_Io_Copier_
if (pd->close_on_exec == close_on_exec) return EINA_TRUE;
pd->close_on_exec = close_on_exec;
- if (pd->source && efl_isa(pd->source, EFL_IO_CLOSER_MIXIN))
+ if (pd->source && efl_isa(pd->source, EFL_IO_CLOSER_INTERFACE))
efl_io_closer_close_on_exec_set(pd->source, close_on_exec);
- if (pd->destination && efl_isa(pd->destination, EFL_IO_CLOSER_MIXIN))
+ if (pd->destination && efl_isa(pd->destination, EFL_IO_CLOSER_INTERFACE))
efl_io_closer_close_on_exec_set(pd->destination, close_on_exec);
return EINA_TRUE;
@@ -917,10 +917,10 @@ _efl_io_copier_efl_io_closer_close_on_invalidate_set(Eo *o EINA_UNUSED, Efl_Io_C
if (pd->close_on_invalidate == close_on_invalidate) return;
pd->close_on_invalidate = close_on_invalidate;
- if (pd->source && efl_isa(pd->source, EFL_IO_CLOSER_MIXIN))
+ if (pd->source && efl_isa(pd->source, EFL_IO_CLOSER_INTERFACE))
efl_io_closer_close_on_invalidate_set(pd->source, close_on_invalidate);
- if (pd->destination && efl_isa(pd->destination, EFL_IO_CLOSER_MIXIN))
+ if (pd->destination && efl_isa(pd->destination, EFL_IO_CLOSER_INTERFACE))
efl_io_closer_close_on_invalidate_set(pd->destination, close_on_invalidate);
}