vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the types of Eo Events - addresses lots of compiler warnings

This commit is contained in:
Andy Williams 2014-11-09 21:53:30 +00:00
parent e3fd501e9b
commit 131a686c78
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elm_code/bin/Makefile.am
View File

@ -7,6 +7,7 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-I$(top_srcdir)/elm_code/bin/ \ -I$(top_srcdir)/elm_code/bin/ \
-I$(top_builddir)/elm_code/lib/ \ -I$(top_builddir)/elm_code/lib/ \
-I$(top_srcdir)/elm_code/lib/ \ -I$(top_srcdir)/elm_code/lib/ \
-DEFL_BETA_API_SUPPORT \
@EFL_CFLAGS@ @EFL_CFLAGS@
elm_code_test_SOURCES = elm_code_test_main.c elm_code_test_SOURCES = elm_code_test_main.c

4
elm_code/lib/Elm_Code.h
View File

@ -2,7 +2,7 @@
# define ELM_CODE_H_ # define ELM_CODE_H_
#include <Elementary.h> #include <Elementary.h>
#include <Eo.h>
#include <Eina.h> #include <Eina.h>
#include <elm_code_common.h> #include <elm_code_common.h>
@ -119,7 +119,7 @@ EAPI void elm_code_free(Elm_Code *code);
*/ */
EAPI void elm_code_callback_fire(Elm_Code *code, const char *signal, void *data); EAPI void elm_code_callback_fire(Elm_Code *code, const Eo_Event_Description *signal, void *data);
/** /**

1
elm_code/lib/Makefile.am
View File

@ -5,6 +5,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/elm_code/lib \ -I$(top_builddir)/elm_code/lib \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-DEFL_BETA_API_SUPPORT \
@EFL_CFLAGS@ \ @EFL_CFLAGS@ \
-DEFL_EFL_BUILD -DEFL_EFL_BUILD

8
elm_code/lib/elm_code.c
View File

@ -2,7 +2,6 @@
# include "config.h" # include "config.h"
#endif #endif
#define EFL_BETA_API_SUPPORT
#include <Eo.h> #include <Eo.h>
#include "Elm_Code.h" #include "Elm_Code.h"
@ -12,6 +11,9 @@
static int _elm_code_init = 0; static int _elm_code_init = 0;
int _elm_code_lib_log_dom = -1; int _elm_code_lib_log_dom = -1;
const Eo_Event_Description ELM_CODE_EVENT_LINE_SET_DONE =
EO_EVENT_DESCRIPTION("line,set,done", "");
EAPI int EAPI int
elm_code_init(void) elm_code_init(void)
{ {
@ -91,14 +93,14 @@ elm_code_free(Elm_Code *code)
} }
EAPI void EAPI void
elm_code_callback_fire(Elm_Code *code, const char *signal, void *data) elm_code_callback_fire(Elm_Code *code, const Eo_Event_Description *signal, void *data)
{ {
Eina_List *item; Eina_List *item;
Evas_Object *widget; Evas_Object *widget;
EINA_LIST_FOREACH(code->widgets, item, widget) EINA_LIST_FOREACH(code->widgets, item, widget)
{ {
eo_do(widget, eo_event_callback_call((Eo_Event_Description *)signal, data)); eo_do(widget, eo_event_callback_call(signal, data));
} }
} }

6
elm_code/lib/elm_code_common.h
View File

@ -1,12 +1,10 @@
#ifndef ELM_CODE_COMMON_H_ #ifndef ELM_CODE_COMMON_H_
# define ELM_CODE_COMMON_H_ # define ELM_CODE_COMMON_H_
#include <Eo.h>
#include <Eina.h> #include <Eina.h>
// TODO figure out how this can be fixed EAPI extern const Eo_Event_Description ELM_CODE_EVENT_LINE_SET_DONE;
#define ELM_CODE_EVENT_LINE_SET_DONE "line,set,done"
//EAPI const Eo_Event_Description ELM_CODE_EVENT_LINE_SET_DONE =
// EO_EVENT_DESCRIPTION("line,set,done", "");
typedef enum { typedef enum {
ELM_CODE_STATUS_TYPE_DEFAULT = 0, ELM_CODE_STATUS_TYPE_DEFAULT = 0,

4
elm_code/lib/elm_code_file.c
View File

@ -33,7 +33,7 @@ static void _elm_code_file_line_append_data(Elm_Code_File *file, const char *con
file->lines = eina_list_append(file->lines, line); file->lines = eina_list_append(file->lines, line);
if (file->parent) if (file->parent)
elm_code_callback_fire(file->parent, ELM_CODE_EVENT_LINE_SET_DONE, line); elm_code_callback_fire(file->parent, &ELM_CODE_EVENT_LINE_SET_DONE, line);
} }
EAPI Elm_Code_File *elm_code_file_new() EAPI Elm_Code_File *elm_code_file_new()
@ -152,5 +152,5 @@ EAPI void elm_code_file_line_status_set(Elm_Code_File *file, unsigned int number
line->status = status; line->status = status;
if (file->parent) if (file->parent)
elm_code_callback_fire(file->parent, ELM_CODE_EVENT_LINE_SET_DONE, line); elm_code_callback_fire(file->parent, &ELM_CODE_EVENT_LINE_SET_DONE, line);
} }

4
elm_code/lib/elm_code_widget.c
View File

@ -2,9 +2,7 @@
# include "config.h" # include "config.h"
#endif #endif
#define EFL_BETA_API_SUPPORT
#include <Eo.h> #include <Eo.h>
#include <Elementary.h> #include <Elementary.h>
#include "elm_code_widget.h" #include "elm_code_widget.h"
@ -131,7 +129,7 @@ EAPI Evas_Object *elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, _elm_code_widget_resize_cb, code); evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE, _elm_code_widget_resize_cb, code);
eo_do(o,eo_event_callback_add((Eo_Event_Description *)ELM_CODE_EVENT_LINE_SET_DONE, _elm_code_widget_line_cb, code)); eo_do(o,eo_event_callback_add(&ELM_CODE_EVENT_LINE_SET_DONE, _elm_code_widget_line_cb, code));
code->widgets = eina_list_append(code->widgets, o); code->widgets = eina_list_append(code->widgets, o);
return o; return o;

2
src/bin/Makefile.am
View File

@ -8,7 +8,7 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-I$(top_srcdir)/src/bin/ \ -I$(top_srcdir)/src/bin/ \
-I$(top_srcdir)/elm_code/lib \ -I$(top_srcdir)/elm_code/lib \
-I$(top_builddir)/src/lib/ \ -I$(top_builddir)/src/lib/ \
-I$(top_srcdir)/src/lib/ \ -DEFL_BETA_API_SUPPORT \
@EFL_CFLAGS@ @EFL_CFLAGS@
edi_SOURCES = \ edi_SOURCES = \