andreas pushed a commit to branch master.

http://git.enlightenment.org/bindings/cxx/eflxx.git/commit/?id=429212c67ef9439d4897879c235f9b29973f217f

commit 429212c67ef9439d4897879c235f9b29973f217f
Author: Andreas Volz <andreas.v...@tux-style.com>
Date:   Sat Mar 26 14:11:14 2016 +0100

    change List reference parameter to pointer
---
 elementaryxx/include/elementaryxx/List.h | 2 +-
 elementaryxx/src/List.cpp                | 4 ++--
 evasxx/src/Object.cpp                    | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/elementaryxx/include/elementaryxx/List.h 
b/elementaryxx/include/elementaryxx/List.h
index 290234f..ffb335b 100644
--- a/elementaryxx/include/elementaryxx/List.h
+++ b/elementaryxx/include/elementaryxx/List.h
@@ -41,7 +41,7 @@ public:
 
   Elm_Object_Item *append (const std::string &label, void (*func) (void *data, 
Evas_Object *obj, void *event_info), const void *data);
 
-  Elm_Object_Item *append (const std::string &label, const Evasxx::Object 
&icon, const Evasxx::Object &end, void (*func) (void *data, Evas_Object *obj, 
void *event_info), const void *data);
+  Elm_Object_Item *append (const std::string &label, const Evasxx::Object 
*icon, const Evasxx::Object *end, void (*func) (void *data, Evas_Object *obj, 
void *event_info), const void *data);
 
 protected:
   // allow only construction for child classes
diff --git a/elementaryxx/src/List.cpp b/elementaryxx/src/List.cpp
index 243ec8c..95192fa 100644
--- a/elementaryxx/src/List.cpp
+++ b/elementaryxx/src/List.cpp
@@ -67,9 +67,9 @@ Elm_Object_Item *List::append (const std::string &label, void 
(*func) (void *dat
   return elm_list_item_append (o, label.c_str (), NULL, NULL, func, data);
 }
 
-Elm_Object_Item *List::append (const std::string &label, const Evasxx::Object 
&icon, const Evasxx::Object &end, void (*func) (void *data, Evas_Object *obj, 
void *event_info), const void *data)
+Elm_Object_Item *List::append (const std::string &label, const Evasxx::Object 
*icon, const Evasxx::Object *end, void (*func) (void *data, Evas_Object *obj, 
void *event_info), const void *data)
 {
-  return elm_list_item_append (o, label.c_str (), icon.obj (), end.obj (), 
func, data);
+  return elm_list_item_append (o, label.c_str (), icon ? icon->obj() : NULL, 
end ? end->obj() : NULL, func, data);
 }
 
 } // end namespace Elmxx
diff --git a/evasxx/src/Object.cpp b/evasxx/src/Object.cpp
index ea4b131..d46d3f3 100644
--- a/evasxx/src/Object.cpp
+++ b/evasxx/src/Object.cpp
@@ -44,14 +44,16 @@ void Object::init ()
 }
 
 Object::~Object()
-{
-  Dout( dc::notice, *this << " Object::~Object" );
+{  
+  //cout << " Object::~Object: " << getName() << endl;
+  
   unregisterCallbacks ();
 }
 
 const std::string Object::getName() const
 {
-  return evas_object_name_get( o );
+  const char *name = evas_object_name_get( o );
+  return name ? name : "<unknown>";
 }
 
 void Object::setName( const std::string& name )

-- 


Reply via email to