usergreen
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Pull Requests Activity

eolian-cxx: Disable example and fix new naming standard 

Fixed naming standard in some tests and disabled the callback test
while Ecore Eo API is still rapidly changing
This commit is contained in:
Felipe Magno de Almeida 2016-05-08 12:19:48 -03:00
parent 2c563e3f0a
commit 3e8db298f7
6 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/examples/eolian_cxx/Makefile.am
View File

@ -69,21 +69,21 @@ LDADD = \
$(top_builddir)/src/lib/ecore_evas/libecore_evas.la $(top_builddir)/src/lib/ecore_evas/libecore_evas.la
GENERATED = \ GENERATED = \
colourable.eo.c \ ns_colourable.eo.c \
colourable.eo.h \ ns_colourable.eo.h \
colourable.eo.hh \ ns_colourable.eo.hh \
colourable.eo.impl.hh \ ns_colourable.eo.impl.hh \
colourablesquare.eo.c \ ns_colourablesquare.eo.c \
colourablesquare.eo.h \ ns_colourablesquare.eo.h \
colourablesquare.eo.hh \ ns_colourablesquare.eo.hh \
colourablesquare.eo.impl.hh ns_colourablesquare.eo.impl.hh
BUILT_SOURCES = $(GENERATED) BUILT_SOURCES = $(GENERATED)
CLEANFILES += $(BUILT_SOURCES) CLEANFILES += $(BUILT_SOURCES)
ECXX_EXAMPLE_EOS = \ ECXX_EXAMPLE_EOS = \
colourable.eo \ ns_colourable.eo \
colourablesquare.eo ns_colourablesquare.eo
IMPL = \ IMPL = \
colourable.c \ colourable.c \

9
src/examples/eolian_cxx/eolian_cxx_callbacks_01.cc
View File

@ -1,3 +1,6 @@
// Disabled test while Ecore Eo API is still rapidly changing
#if 0
#include <iostream> #include <iostream>
#include <thread> #include <thread>
#include <cassert> #include <cassert>
@ -56,4 +59,8 @@ int main()
return 0; return 0;
} }
#else
int main()
{
}
#endif

16
src/examples/eolian_cxx/eolian_cxx_inherit_01.cc
View File

@ -6,24 +6,24 @@
# include <config.h> # include <config.h>
#endif #endif
#include "colourable.eo.hh" #include "ns_colourable.eo.hh"
#include "colourablesquare.eo.hh" #include "ns_colourablesquare.eo.hh"
#include <eo_inherit.hh> #include <eo_inherit.hh>
using namespace efl; using namespace efl;
struct ColourableCircle struct ColourableCircle
: efl::eo::inherit<ColourableCircle, ::colourable> : efl::eo::inherit<ColourableCircle, ::ns::Colourable>
{ {
ColourableCircle(int rgb) ColourableCircle(int rgb)
: inherit_base(::colourable::rgb_24bits_constructor(rgb)) : inherit_base(::ns::Colourable::rgb_24bits_constructor(rgb))
{} {}
int colour_get() int colour_get()
{ {
int rgb = 0; int rgb = 0;
rgb = ::colourable_colour_get(eo_super(_eo_ptr(), _eo_class())); rgb = ::ns_colourable_colour_get(eo_super(_eo_ptr(), _eo_class()));
std::cout << "ColourableCircle::colour_get(" << this << ") ==> " std::cout << "ColourableCircle::colour_get(" << this << ") ==> "
<< std::hex << rgb << std::endl; << std::hex << rgb << std::endl;
return rgb; return rgb;
@ -43,16 +43,16 @@ struct ColourableFoo
};*/ };*/
struct ColourableBar struct ColourableBar
: efl::eo::inherit<ColourableBar, ::colourablesquare> : efl::eo::inherit<ColourableBar, ::ns::ColourableSquare>
{ {
ColourableBar() ColourableBar()
: inherit_base(::colourable::rgb_24bits_constructor(0)) : inherit_base(::ns::Colourable::rgb_24bits_constructor(0))
{} {}
int colour_get() int colour_get()
{ {
int rgb = 0; int rgb = 0;
rgb = ::colourable_colour_get(eo_super(_eo_ptr(), _eo_class())); rgb = ::ns_colourable_colour_get(eo_super(_eo_ptr(), _eo_class()));
std::cout << "ColourableBar::colour_get(" << this << ") ==> " std::cout << "ColourableBar::colour_get(" << this << ") ==> "
<< std::hex << rgb << std::endl; << std::hex << rgb << std::endl;
return rgb; return rgb;

12
src/examples/eolian_cxx/eolian_cxx_simple_01.cc
View File

@ -7,8 +7,8 @@
# include <config.h> # include <config.h>
#endif #endif
#include "colourable.eo.hh" #include "ns_colourable.eo.hh"
#include "colourablesquare.eo.hh" #include "ns_colourablesquare.eo.hh"
int int
main() main()
@ -18,21 +18,21 @@ main()
eina_log_domain_level_set("colourablesquare", EINA_LOG_LEVEL_DBG); eina_log_domain_level_set("colourablesquare", EINA_LOG_LEVEL_DBG);
int r, g, b; int r, g, b;
::colourable obj1( ::ns::Colourable obj1(
obj1.rgb_24bits_constructor(0x123456) obj1.rgb_24bits_constructor(0x123456)
); );
obj1.colour_set(0xc0ffee); obj1.colour_set(0xc0ffee);
obj1.composite_colour_get(&r, &g, &b); obj1.composite_colour_get(&r, &g, &b);
::colourablesquare obj2( ::ns::ColourableSquare obj2(
obj2.size_constructor(10) obj2.size_constructor(10)
); );
obj2.composite_colour_set(r, g, b); obj2.composite_colour_set(r, g, b);
obj2.size_set(11); obj2.size_set(11);
assert(obj1.colour_get() == obj2.colour_get()); assert(obj1.colour_get() == obj2.colour_get());
efl::eo::wref<::colourable> ref = obj1; efl::eo::wref< ::ns::Colourable> ref = obj1;
efl::eina::optional<::colourable> obj3 = ref.lock(); efl::eina::optional< ::ns::Colourable> obj3 = ref.lock();
assert(obj3); assert(obj3);
obj3->colour_set(0x00); obj3->colour_set(0x00);

2
src/examples/eolian_cxx/colourable.eo → src/examples/eolian_cxx/ns_colourable.eo
View File

@ -1,4 +1,4 @@
class Colourable (Eo.Base) class Ns.Colourable (Eo.Base)
{ {
[[Colourable class.]] [[Colourable class.]]
legacy_prefix: legacy; legacy_prefix: legacy;

2
src/examples/eolian_cxx/colourablesquare.eo → src/examples/eolian_cxx/ns_colourablesquare.eo
View File

@ -1,4 +1,4 @@
class ColourableSquare (Colourable) class Ns.ColourableSquare (Ns.Colourable)
{ {
legacy_prefix: legacy; legacy_prefix: legacy;
data: ColourableSquare_Data; data: ColourableSquare_Data;