enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

Evas textblock: Fixed compiler warnings. 

SVN revision: 63185
This commit is contained in:
Tom Hacohen 2011-09-05 07:13:07 +00:00
parent cfddcef5d1
commit c4229776de
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -2020,9 +2020,7 @@ _paragraph_free(const Evas_Object *obj, Evas_Object_Textblock_Paragraph *par)
static void static void
_paragraphs_clear(const Evas_Object *obj, Evas_Object_Textblock_Paragraph *pars) _paragraphs_clear(const Evas_Object *obj, Evas_Object_Textblock_Paragraph *pars)
{ {
Evas_Object_Textblock *o;
Evas_Object_Textblock_Paragraph *par; Evas_Object_Textblock_Paragraph *par;
o = (Evas_Object_Textblock *)(obj->object_data);
EINA_INLIST_FOREACH(EINA_INLIST_GET(pars), par) EINA_INLIST_FOREACH(EINA_INLIST_GET(pars), par)
{ {
@ -2788,7 +2786,6 @@ _layout_text_add_logical_item(Ctxt *c, Evas_Object_Textblock_Text_Item *ti,
static void static void
_layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Textblock_Node_Text *n, int start, int off, const char *repch) _layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Textblock_Node_Text *n, int start, int off, const char *repch)
{ {
int new_line, empty_item;
const Eina_Unicode *str = EINA_UNICODE_EMPTY_STRING; const Eina_Unicode *str = EINA_UNICODE_EMPTY_STRING;
const Eina_Unicode *tbase; const Eina_Unicode *tbase;
Evas_Object_Textblock_Text_Item *ti; Evas_Object_Textblock_Text_Item *ti;
@ -2849,9 +2846,6 @@ _layout_text_append(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Text
skip: skip:
tbase = str; tbase = str;
new_line = 0;
empty_item = 0;
/* If there's no parent text node, only create an empty item */ /* If there's no parent text node, only create an empty item */
if (!n) if (!n)
@ -4287,9 +4281,7 @@ _find_layout_item_line_match(Evas_Object *obj, Evas_Object_Textblock_Node_Text *
EINA_INLIST_FOREACH(found_par->lines, ln) EINA_INLIST_FOREACH(found_par->lines, ln)
{ {
Evas_Object_Textblock_Item *it; Evas_Object_Textblock_Item *it;
Evas_Object_Textblock_Line *lnn;
lnn = (Evas_Object_Textblock_Line *)(((Eina_Inlist *)ln)->next);
EINA_INLIST_FOREACH(ln->items, it) EINA_INLIST_FOREACH(ln->items, it)
{ {
/* FIXME: p should be size_t, same goes for pos */ /* FIXME: p should be size_t, same goes for pos */
@ -4978,12 +4970,10 @@ _markup_get_format_append(Evas_Object_Textblock *o __UNUSED__, Eina_Strbuf *txt,
eina_strbuf_append_char(txt, '<'); eina_strbuf_append_char(txt, '<');
{ {
const char *s; const char *s;
int push = 0;
int pop = 0; int pop = 0;
// FIXME: need to escape // FIXME: need to escape
s = fnode->orig_format; s = fnode->orig_format;
if (*s == '+') push = 1;
if (*s == '-') pop = 1; if (*s == '-') pop = 1;
while ((*s == ' ') || (*s == '+') || (*s == '-')) s++; while ((*s == ' ') || (*s == '+') || (*s == '-')) s++;
if (pop) eina_strbuf_append_char(txt, '/'); if (pop) eina_strbuf_append_char(txt, '/');
@ -7320,7 +7310,7 @@ static char *
_evas_textblock_cursor_range_text_markup_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *_cur2) _evas_textblock_cursor_range_text_markup_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *_cur2)
{ {
Evas_Object_Textblock *o; Evas_Object_Textblock *o;
Evas_Object_Textblock_Node_Text *n1, *n2, *tnode; Evas_Object_Textblock_Node_Text *tnode;
Eina_Strbuf *buf; Eina_Strbuf *buf;
Evas_Textblock_Cursor *cur2; Evas_Textblock_Cursor *cur2;
buf = eina_strbuf_new(); buf = eina_strbuf_new();
@ -7337,8 +7327,6 @@ _evas_textblock_cursor_range_text_markup_get(const Evas_Textblock_Cursor *cur1,
cur1 = _cur2; cur1 = _cur2;
_cur2 = tc; _cur2 = tc;
} }
n1 = cur1->node;
n2 = _cur2->node;
/* Work on a local copy of the cur */ /* Work on a local copy of the cur */
cur2 = alloca(sizeof(Evas_Textblock_Cursor)); cur2 = alloca(sizeof(Evas_Textblock_Cursor));
cur2->obj = _cur2->obj; cur2->obj = _cur2->obj;
@ -7441,7 +7429,6 @@ _evas_textblock_cursor_range_text_markup_get(const Evas_Textblock_Cursor *cur1,
static char * static char *
_evas_textblock_cursor_range_text_plain_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *_cur2) _evas_textblock_cursor_range_text_plain_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *_cur2)
{ {
Evas_Object_Textblock *o;
Eina_UStrbuf *buf; Eina_UStrbuf *buf;
Evas_Object_Textblock_Node_Text *n1, *n2; Evas_Object_Textblock_Node_Text *n1, *n2;
Evas_Textblock_Cursor *cur2; Evas_Textblock_Cursor *cur2;
@ -7451,7 +7438,6 @@ _evas_textblock_cursor_range_text_plain_get(const Evas_Textblock_Cursor *cur1, c
if (!cur1 || !cur1->node) return NULL; if (!cur1 || !cur1->node) return NULL;
if (!_cur2 || !_cur2->node) return NULL; if (!_cur2 || !_cur2->node) return NULL;
if (cur1->obj != _cur2->obj) return NULL; if (cur1->obj != _cur2->obj) return NULL;
o = (Evas_Object_Textblock *)(cur1->obj->object_data);
if (evas_textblock_cursor_compare(cur1, _cur2) > 0) if (evas_textblock_cursor_compare(cur1, _cur2) > 0)
{ {
const Evas_Textblock_Cursor *tc; const Evas_Textblock_Cursor *tc;
@ -7822,7 +7808,7 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat
Evas_Object_Textblock_Text_Item *ti = NULL; Evas_Object_Textblock_Text_Item *ti = NULL;
Evas_Object_Textblock_Format_Item *fi = NULL; Evas_Object_Textblock_Format_Item *fi = NULL;
int x = 0, y = 0, w = 0, h = 0; int x = 0, y = 0, w = 0, h = 0;
int pos, ret; int pos;
Eina_Bool previous_format; Eina_Bool previous_format;
if (!cur) return -1; if (!cur) return -1;
@ -7863,12 +7849,11 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat
if (ln && ti) if (ln && ti)
{ {
pos = cur->pos - ti->parent.text_pos; pos = cur->pos - ti->parent.text_pos;
ret = -1;
if (pos < 0) pos = 0; if (pos < 0) pos = 0;
if (ti->parent.format->font.font) if (ti->parent.format->font.font)
{ {
ret = query_func(cur->ENDT, query_func(cur->ENDT,
ti->parent.format->font.font, ti->parent.format->font.font,
&ti->text_props, &ti->text_props,
pos, pos,