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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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