ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=4d466dbc7492a38d61c74d3136060a74533d0d52
commit 4d466dbc7492a38d61c74d3136060a74533d0d52
Author: Andy Williams <a...@andywilliams.me>
Date: Sun May 31 21:18:18 2015 +0100
Fix many warnings.
Make the font face const char * and use eina_stringshare
---
configure.ac | 2 +-
elm_code/src/lib/elm_code_diff_widget.c | 2 +-
elm_code/src/lib/elm_code_diff_widget.h | 3 ++-
elm_code/src/lib/widget/elm_code_widget.c | 14 +++++++-------
elm_code/src/lib/widget/elm_code_widget.eo | 2 +-
src/bin/edi_config.h | 6 +++---
src/bin/screens/edi_settings_font.c | 2 +-
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index eea4b9a..7740ead 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-EFL_VERSION([0], [1], [dev])
+EFL_VERSION([0], [0], [9])
AC_INIT([edi], [efl_version], [enlightenment-de...@lists.sourceforge.net])
AC_PREREQ([2.65])
diff --git a/elm_code/src/lib/elm_code_diff_widget.c
b/elm_code/src/lib/elm_code_diff_widget.c
index eba3b37..e07b9cb 100644
--- a/elm_code/src/lib/elm_code_diff_widget.c
+++ b/elm_code/src/lib/elm_code_diff_widget.c
@@ -121,7 +121,7 @@ elm_code_diff_widget_add(Evas_Object *parent, Elm_Code
*code)
}
EAPI void
-elm_code_diff_widget_font_set(Evas_Object *widget, char *name, int size)
+elm_code_diff_widget_font_set(Evas_Object *widget, const char *name, int size)
{
Elm_Code_Widget *child;
diff --git a/elm_code/src/lib/elm_code_diff_widget.h
b/elm_code/src/lib/elm_code_diff_widget.h
index 895dd55..7a6f2d6 100644
--- a/elm_code/src/lib/elm_code_diff_widget.h
+++ b/elm_code/src/lib/elm_code_diff_widget.h
@@ -23,7 +23,8 @@ extern "C" {
EAPI Evas_Object *elm_code_diff_widget_add(Evas_Object *parent, Elm_Code
*code);
-EAPI void elm_code_diff_widget_font_set(Evas_Object *widget, char *name, int
size);
+EAPI void elm_code_diff_widget_font_set(Evas_Object *widget, const char *name,
+ int size);
/**
* @}
diff --git a/elm_code/src/lib/widget/elm_code_widget.c
b/elm_code/src/lib/widget/elm_code_widget.c
index a320c9e..bf63c35 100644
--- a/elm_code/src/lib/widget/elm_code_widget.c
+++ b/elm_code/src/lib/widget/elm_code_widget.c
@@ -1285,23 +1285,23 @@ _elm_code_widget_lines_visible_get(Eo *obj EINA_UNUSED,
Elm_Code_Widget_Data *pd
}
EOLIAN static void
-_elm_code_widget_font_set(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd, char
*name,
- Evas_Font_Size size)
+_elm_code_widget_font_set(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd,
+ const char *name, Evas_Font_Size size)
{
- char *face = name;
+ const char *face = name;
if (!face)
face = "Mono";
evas_object_textgrid_font_set(pd->grid, face, size *
elm_config_scale_get());
if (pd->font_name)
- free((char *)pd->font_name);
- pd->font_name = strdup(face);
+ eina_stringshare_del((char *)pd->font_name);
+ pd->font_name = eina_stringshare_add(face);
pd->font_size = size;
}
EOLIAN static void
-_elm_code_widget_font_get(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd, char
**name,
- Evas_Font_Size *size)
+_elm_code_widget_font_get(Eo *obj EINA_UNUSED, Elm_Code_Widget_Data *pd,
+ const char **name, Evas_Font_Size *size)
{
if (name)
*name = strdup((const char *)pd->font_name);
diff --git a/elm_code/src/lib/widget/elm_code_widget.eo
b/elm_code/src/lib/widget/elm_code_widget.eo
index f430965..61e8b87 100644
--- a/elm_code/src/lib/widget/elm_code_widget.eo
+++ b/elm_code/src/lib/widget/elm_code_widget.eo
@@ -37,7 +37,7 @@ class Elm_Code_Widget (Elm.Layout, Elm_Interface_Atspi_Text)
@ingroup Style */
}
values {
- name: char *; /*@ The name of the font to load */
+ name: const(char) *; /*@ The name of the font to load */
size: Evas_Font_Size; /*@ The font size for the widget */
}
}
diff --git a/src/bin/edi_config.h b/src/bin/edi_config.h
index 68d868d..e93f1ec 100644
--- a/src/bin/edi_config.h
+++ b/src/bin/edi_config.h
@@ -52,8 +52,8 @@ struct _Edi_Project_Config_Tab
struct _Edi_Project_Config_Launch
{
- char *path;
- char *args;
+ const char *path;
+ const char *args;
};
struct _Edi_Project_Config
@@ -62,7 +62,7 @@ struct _Edi_Project_Config
struct
{
- char *name;
+ const char *name;
int size;
} font;
diff --git a/src/bin/screens/edi_settings_font.c
b/src/bin/screens/edi_settings_font.c
index 371b9ab..a7a4331 100644
--- a/src/bin/screens/edi_settings_font.c
+++ b/src/bin/screens/edi_settings_font.c
@@ -152,7 +152,7 @@ _cb_op_font_sel(void *data, Evas_Object *obj EINA_UNUSED,
void *event EINA_UNUSE
}
static void
-_cb_op_fontsize_sel(void *data, Evas_Object *obj, void *event EINA_UNUSED)
+_cb_op_fontsize_sel(void *data EINA_UNUSED, Evas_Object *obj, void *event
EINA_UNUSED)
{
int size = elm_slider_value_get(obj) + 0.5;
--
