summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2012-12-05 06:25:49 +0000
committerDaniel Zaoui <daniel.zaoui@yahoo.com>2012-12-05 06:25:49 +0000
commit25ea899dfae39b155f7f0f2b7cafc456cfd1f1d8 (patch)
tree9abd20c54d2a07949320b26770e57e47b0dcd9be /src
parentf03023b28b891c3d7a9449802f489ed3de6050cc (diff)
Some KlocWork fixes.
Signed-off-by: Daniel Zaoui <daniel.zaoui@samsung.com> SVN revision: 80211
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/canvas/evas_events.c4
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c7
-rw-r--r--src/lib/evas/canvas/evas_smart.c2
3 files changed, 7 insertions, 6 deletions
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index ba643b7045..587071e9f3 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -53,7 +53,7 @@ _evas_event_object_list_raw_in_get(Evas *eo_e, Eina_List *in,
53 int x, int y, int *no_rep, Eina_Bool source) 53 int x, int y, int *no_rep, Eina_Bool source)
54{ 54{
55 Evas_Object *eo_obj; 55 Evas_Object *eo_obj;
56 Evas_Object_Protected_Data *obj; 56 Evas_Object_Protected_Data *obj = NULL;
57 int inside; 57 int inside;
58 58
59 if (!list) return in; 59 if (!list) return in;
@@ -626,6 +626,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M
626 EINA_LIST_FOREACH(copy, l, eo_child) 626 EINA_LIST_FOREACH(copy, l, eo_child)
627 { 627 {
628 ev->canvas = point; 628 ev->canvas = point;
629 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
629 if ((child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) && 630 if ((child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) &&
630 (child->mouse_grabbed > 0)) 631 (child->mouse_grabbed > 0))
631 { 632 {
@@ -639,7 +640,6 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M
639 &ev->canvas.x, 640 &ev->canvas.x,
640 &ev->canvas.y, 641 &ev->canvas.y,
641 child->mouse_grabbed); 642 child->mouse_grabbed);
642 child = eo_data_get(eo_child, EVAS_OBJ_CLASS);
643 evas_object_event_callback_call(eo_child, child, EVAS_CALLBACK_MULTI_UP, 643 evas_object_event_callback_call(eo_child, child, EVAS_CALLBACK_MULTI_UP,
644 ev, event_id); 644 ev, event_id);
645 if (e->delete_me || e->is_frozen) break; 645 if (e->delete_me || e->is_frozen) break;
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index ad03a52c58..7079d27f16 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -7953,11 +7953,12 @@ _evas_textblock_cursor_range_text_markup_get(const Evas_Textblock_Cursor *cur1,
7953 Evas_Object_Textblock_Node_Text *tnode; 7953 Evas_Object_Textblock_Node_Text *tnode;
7954 Eina_Strbuf *buf; 7954 Eina_Strbuf *buf;
7955 Evas_Textblock_Cursor *cur2; 7955 Evas_Textblock_Cursor *cur2;
7956 buf = eina_strbuf_new();
7957 7956
7958 if (!cur1 || !cur1->node) return NULL; 7957 if (!cur1 || !cur1->node) return NULL;
7959 if (!_cur2 || !_cur2->node) return NULL; 7958 if (!_cur2 || !_cur2->node) return NULL;
7960 if (cur1->obj != _cur2->obj) return NULL; 7959 if (cur1->obj != _cur2->obj) return NULL;
7960 buf = eina_strbuf_new();
7961
7961 if (evas_textblock_cursor_compare(cur1, _cur2) > 0) 7962 if (evas_textblock_cursor_compare(cur1, _cur2) > 0)
7962 { 7963 {
7963 const Evas_Textblock_Cursor *tc; 7964 const Evas_Textblock_Cursor *tc;
@@ -8072,11 +8073,11 @@ _evas_textblock_cursor_range_text_plain_get(const Evas_Textblock_Cursor *cur1, c
8072 Evas_Object_Textblock_Node_Text *n1, *n2; 8073 Evas_Object_Textblock_Node_Text *n1, *n2;
8073 Evas_Textblock_Cursor *cur2; 8074 Evas_Textblock_Cursor *cur2;
8074 8075
8075 buf = eina_ustrbuf_new();
8076
8077 if (!cur1 || !cur1->node) return NULL; 8076 if (!cur1 || !cur1->node) return NULL;
8078 if (!_cur2 || !_cur2->node) return NULL; 8077 if (!_cur2 || !_cur2->node) return NULL;
8079 if (cur1->obj != _cur2->obj) return NULL; 8078 if (cur1->obj != _cur2->obj) return NULL;
8079 buf = eina_ustrbuf_new();
8080
8080 if (evas_textblock_cursor_compare(cur1, _cur2) > 0) 8081 if (evas_textblock_cursor_compare(cur1, _cur2) > 0)
8081 { 8082 {
8082 const Evas_Textblock_Cursor *tc; 8083 const Evas_Textblock_Cursor *tc;
diff --git a/src/lib/evas/canvas/evas_smart.c b/src/lib/evas/canvas/evas_smart.c
index f39721dd07..87856b7674 100644
--- a/src/lib/evas/canvas/evas_smart.c
+++ b/src/lib/evas/canvas/evas_smart.c
@@ -255,7 +255,7 @@ _evas_smart_class_callbacks_create(Evas_Smart *s)
255static void 255static void
256_evas_smart_class_interfaces_create(Evas_Smart *s) 256_evas_smart_class_interfaces_create(Evas_Smart *s)
257{ 257{
258 unsigned int i, total_priv_sz; 258 unsigned int i, total_priv_sz = 0;
259 const Evas_Smart_Class *sc; 259 const Evas_Smart_Class *sc;
260 260
261 /* get number of interfaces on the smart */ 261 /* get number of interfaces on the smart */