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

fix some compiler warnings

This commit is contained in:
Boris Faure 2014-10-22 21:08:57 +02:00
parent d671a68877
commit 8fadf10987
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/editor/edi_editor.c
View File

@ -24,13 +24,13 @@
static Edi_Color EDI_COLOR_FOREGROUND = "<color=#ffffff>"; static Edi_Color EDI_COLOR_FOREGROUND = "<color=#ffffff>";
static Edi_Color EDI_COLOR_COMMENT = "<color=#3399ff>"; static Edi_Color EDI_COLOR_COMMENT = "<color=#3399ff>";
static Edi_Color EDI_COLOR_STRING = "<color=#ff3a35>"; //static Edi_Color EDI_COLOR_STRING = "<color=#ff5a35>";
static Edi_Color EDI_COLOR_NUMBER = "<color=#D4D42A>";// font_weight=Bold"; static Edi_Color EDI_COLOR_NUMBER = "<color=#D4D42A>";// font_weight=Bold";
static Edi_Color EDI_COLOR_BRACE = "<color=#656565>"; static Edi_Color EDI_COLOR_BRACE = "<color=#656565>";
static Edi_Color EDI_COLOR_TYPE = "<color=#3399ff>"; static Edi_Color EDI_COLOR_TYPE = "<color=#3399ff>";
static Edi_Color EDI_COLOR_CLASS = "<color=#72AAD4>";// font_weight=Bold"; static Edi_Color EDI_COLOR_CLASS = "<color=#72AAD4>";// font_weight=Bold";
static Edi_Color EDI_COLOR_FUNCTION = "<color=#72AAD4>";// font_weight=Bold"; static Edi_Color EDI_COLOR_FUNCTION = "<color=#72AAD4>";// font_weight=Bold";
static Edi_Color EDI_COLOR_PARAM = "<color=#ffffff>"; //static Edi_Color EDI_COLOR_PARAM = "<color=#ffffff>";
static Edi_Color EDI_COLOR_KEYWORD = "<color=#ff9900>";// font_weight=Bold"; static Edi_Color EDI_COLOR_KEYWORD = "<color=#ff9900>";// font_weight=Bold";
static Edi_Color EDI_COLOR_PREPROCESSOR = "<color=#00B000>"; static Edi_Color EDI_COLOR_PREPROCESSOR = "<color=#00B000>";
@ -278,7 +278,7 @@ _edi_editor_statusbar_add(Evas_Object *panel, Edi_Editor *editor, Edi_Mainview_I
#if HAVE_LIBCLANG #if HAVE_LIBCLANG
static void static void
_edi_range_color_set(Edi_Editor *editor, Edi_Range range, Edi_Color color) _edi_range_color_set(Edi_Editor *editor EINA_UNUSED, Edi_Range range, Edi_Color color)
{ {
evas_textblock_cursor_line_set(_format_cursor, range.start.line - 1); evas_textblock_cursor_line_set(_format_cursor, range.start.line - 1);
evas_textblock_cursor_pos_set(_format_cursor, evas_textblock_cursor_pos_get(_format_cursor) + range.start.col - 1); evas_textblock_cursor_pos_set(_format_cursor, evas_textblock_cursor_pos_get(_format_cursor) + range.start.col - 1);
@ -447,7 +447,7 @@ _clang_load_highlighting(const char *path, Edi_Editor *editor)
} }
static void static void
_clang_load_errors(const char *path, Edi_Editor *editor) _clang_load_errors(const char *path EINA_UNUSED, Edi_Editor *editor)
{ {
unsigned n = clang_getNumDiagnostics(editor->tx_unit); unsigned n = clang_getNumDiagnostics(editor->tx_unit);
unsigned i = 0; unsigned i = 0;
@ -517,12 +517,14 @@ _edi_clang_setup(const char *path, Edi_Editor *editor)
evas_textblock_cursor_free(_format_cursor); evas_textblock_cursor_free(_format_cursor);
} }
/*
static void static void
_edi_clang_dispose(Edi_Editor *editor) _edi_clang_dispose(Edi_Editor *editor)
{ {
clang_disposeTranslationUnit(editor->tx_unit); clang_disposeTranslationUnit(editor->tx_unit);
clang_disposeIndex(editor->idx); clang_disposeIndex(editor->idx);
} }
*/
#endif #endif
EAPI Evas_Object *edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item) EAPI Evas_Object *edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item)

10
src/bin/mainview/edi_mainview.c
View File

@ -188,7 +188,7 @@ _edi_mainview_item_tab_add(Edi_Path_Options *options, const char *mime)
it = elm_naviframe_item_simple_push(nf, content); it = elm_naviframe_item_simple_push(nf, content);
elm_naviframe_item_style_set(it, "overlap"); elm_naviframe_item_style_set(it, "overlap");
tab = elm_toolbar_item_append(tb, NULL, basename(options->path), _promote, it); tab = elm_toolbar_item_append(tb, NULL, basename((char*)options->path), _promote, it);
item->view = it; item->view = it;
item->tab = tab; item->tab = tab;
elm_toolbar_item_selected_set(tab, EINA_TRUE); elm_toolbar_item_selected_set(tab, EINA_TRUE);
@ -214,7 +214,7 @@ _edi_mainview_win_title_get(const char *path)
{ {
char *winname, *filename; char *winname, *filename;
filename = basename(path); filename = basename((char*)path);
winname = malloc((8 + strlen(filename)) * sizeof(char)); winname = malloc((8 + strlen(filename)) * sizeof(char));
snprintf(winname, 8 + strlen(filename), "Edi :: %s", filename); snprintf(winname, 8 + strlen(filename), "Edi :: %s", filename);
@ -552,7 +552,7 @@ edi_mainview_goto(int line)
Evas_Object *content; Evas_Object *content;
Elm_Object_Item *it; Elm_Object_Item *it;
Edi_Editor *editor; Edi_Editor *editor;
Evas_Object *tb; Evas_Object *_tb;
Evas_Textblock_Cursor *mcur; Evas_Textblock_Cursor *mcur;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
@ -562,8 +562,8 @@ edi_mainview_goto(int line)
if (!content || line <= 0) if (!content || line <= 0)
return; return;
tb = elm_entry_textblock_get(editor->entry); _tb = elm_entry_textblock_get(editor->entry);
mcur = evas_object_textblock_cursor_get(tb); mcur = evas_object_textblock_cursor_get(_tb);
evas_textblock_cursor_line_set(mcur, line-1); evas_textblock_cursor_line_set(mcur, line-1);
elm_entry_cursor_geometry_get(editor->entry, &x, &y, &w, &h); elm_entry_cursor_geometry_get(editor->entry, &x, &y, &w, &h);

2
src/bin/welcome/edi_welcome.c
View File

@ -130,7 +130,7 @@ _edi_welcome_project_new_input_row_add(const char *text, const char *placeholder
} }
static void static void
_edi_welcome_project_new_create_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) _edi_welcome_project_new_create_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
const char *path, *name, *user, *email, *url; const char *path, *name, *user, *email, *url;
char script[PATH_MAX], fullpath[PATH_MAX]; char script[PATH_MAX], fullpath[PATH_MAX];