enlightenment
/
eflxx
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed API to setContent,getContent,unsetContent,setText,getText without suffix "Part" as this is marked with first parameter name. 

SVN revision: 69476
This commit is contained in:
Andreas Volz 2012-03-16 21:00:54 +00:00
parent c4d68fda30
commit dd0fd50613
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elementaryxx/include/elementaryxx/Elementaryxx.h
View File

@ -13,7 +13,6 @@
#include "Button.h"
#include "Clock.h"
#include "Scroller.h"
#include "Toggle.h"
#include "Entry.h"
#include "Slider.h"
#include "Label.h"

16
elementaryxx/include/elementaryxx/Object.h
View File

@ -55,8 +55,8 @@ public:
*
* @ingroup General
*/
void setTextPart (const std::string &label);
void setTextPart (const std::string &part, const std::string &label);
void setText (const std::string &label);
void setText (const std::string &part, const std::string &label);
/**
* Get a label of an object
@ -69,8 +69,8 @@ public:
*
* @ingroup General
*/
const std::string getTextPart ();
const std::string getTextPart (const std::string &part);
const std::string getText ();
const std::string getText (const std::string &part);
/**
* Set a content of an object
@ -83,8 +83,8 @@ public:
*
* @ingroup General
*/
void setContentPart (const Evasxx::Object &content);
void setContentPart (const std::string &part, const Evasxx::Object &content);
void setContent (const Evasxx::Object &content);
void setContent (const std::string &part, const Evasxx::Object &content);
/**
* Get a content of an object
@ -97,8 +97,8 @@ public:
*
* @ingroup General
*/
Eflxx::CountedPtr <Evasxx::Object> getContentPart ();
Eflxx::CountedPtr <Evasxx::Object> getContentPart (const std::string &part);
Eflxx::CountedPtr <Evasxx::Object> getContent ();
Eflxx::CountedPtr <Evasxx::Object> getContent (const std::string &part);
/**
* Unset a content of an object

16
elementaryxx/src/Object.cpp
View File

@ -108,37 +108,37 @@ const std::string Object::getWidgetType ()
return elm_object_widget_type_get (o);
}
void Object::setTextPart (const std::string &label)
void Object::setText (const std::string &label)
{
elm_object_part_text_set(o, NULL, label.c_str());
}
void Object::setTextPart (const std::string &part, const std::string &label)
void Object::setText (const std::string &part, const std::string &label)
{
elm_object_part_text_set(o, part.c_str(), label.c_str());
}
const std::string Object::getTextPart ()
const std::string Object::getText ()
{
return elm_object_part_text_get(o, NULL);
}
const std::string Object::getTextPart (const std::string &part)
const std::string Object::getText (const std::string &part)
{
return elm_object_part_text_get(o, part.c_str());
}
void Object::setContentPart (const Evasxx::Object &content)
void Object::setContent (const Evasxx::Object &content)
{
elm_object_part_content_set(o, NULL, content.obj());
}
void Object::setContentPart (const std::string &part, const Evasxx::Object &content)
void Object::setContent (const std::string &part, const Evasxx::Object &content)
{
elm_object_part_content_set(o, part.c_str(), content.obj());
}
Eflxx::CountedPtr <Evasxx::Object> Object::getContentPart ()
Eflxx::CountedPtr <Evasxx::Object> Object::getContent ()
{
Evas_Object *eo = elm_object_part_content_get(o, NULL);
@ -147,7 +147,7 @@ Eflxx::CountedPtr <Evasxx::Object> Object::getContentPart ()
return Eflxx::CountedPtr <Evasxx::Object> (ret_o);
}
Eflxx::CountedPtr <Evasxx::Object> Object::getContentPart (const std::string &part)
Eflxx::CountedPtr <Evasxx::Object> Object::getContent (const std::string &part)
{
Evas_Object *eo = elm_object_part_content_get(o, part.c_str());