change List reference parameter to pointer

master
Andreas Volz 7 years ago
parent 3d0cb4e535
commit 429212c67e
  1. 2
      elementaryxx/include/elementaryxx/List.h
  2. 4
      elementaryxx/src/List.cpp
  3. 8
      evasxx/src/Object.cpp

@ -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

@ -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

@ -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 )

Loading…
Cancel
Save