summaryrefslogtreecommitdiff
path: root/src/examples
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-10-05 20:09:47 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-10-05 20:09:47 +0000
commit7fe3d3599446108bc36a0ab6ec563a267db02733 (patch)
tree8c45e7b3087e289466d4fb4ff99b12b209b770f6 /src/examples
parent227ef6982edc5e7a31f74077b93e82aeb33d7d6f (diff)
merge: __UNUSED__ --> EINA_UNUSED and some fixes in eo.
SVN revision: 77542
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/eo/Makefile.am4
-rw-r--r--src/examples/eo/evas/evas_elw_box.c4
-rw-r--r--src/examples/eo/evas/evas_elw_boxedbutton.c8
-rw-r--r--src/examples/eo/evas/evas_elw_button.c4
-rw-r--r--src/examples/eo/evas/evas_elw_win.c4
-rw-r--r--src/examples/eo/evas/evas_evas_obj.c2
-rw-r--r--src/examples/eo/evas/evas_test.c10
7 files changed, 20 insertions, 16 deletions
diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am
index d7719be5b8..2a2072e451 100644
--- a/src/examples/eo/Makefile.am
+++ b/src/examples/eo/Makefile.am
@@ -2,7 +2,9 @@ MAINTAINERCLEANFILES = Makefile.in
2 2
3AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
4-I. \ 4-I. \
5-I$(top_srcdir)/src/lib/eina \
5-I$(top_srcdir)/src/lib/eo \ 6-I$(top_srcdir)/src/lib/eo \
7-I$(top_builddir)/src/lib/eina \
6-I$(top_builddir)/src/lib/eo \ 8-I$(top_builddir)/src/lib/eo \
7@EFL_EO_BUILD@ \ 9@EFL_EO_BUILD@ \
8@EO_CFLAGS@ 10@EO_CFLAGS@
@@ -30,6 +32,8 @@ eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la @EO_LIBS@
30 32
31if EO_BUILD_EXAMPLE_EVAS 33if EO_BUILD_EXAMPLE_EVAS
32 34
35AM_CPPFLAGS += @ELM_CFLAGS@
36
33eo_evas_SOURCES = \ 37eo_evas_SOURCES = \
34evas/evas_elw_box.c \ 38evas/evas_elw_box.c \
35evas/evas_elw_box.h \ 39evas/evas_elw_box.h \
diff --git a/src/examples/eo/evas/evas_elw_box.c b/src/examples/eo/evas/evas_elw_box.c
index 1a2330f845..3efaded84d 100644
--- a/src/examples/eo/evas/evas_elw_box.c
+++ b/src/examples/eo/evas/evas_elw_box.c
@@ -5,8 +5,8 @@
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#include "Eo.h" 7#include "Eo.h"
8#include "evas_obj.h" 8#include "evas_evas_obj.h"
9#include "elw_box.h" 9#include "evas_elw_box.h"
10 10
11EAPI Eo_Op ELW_BOX_BASE_ID = 0; 11EAPI Eo_Op ELW_BOX_BASE_ID = 0;
12 12
diff --git a/src/examples/eo/evas/evas_elw_boxedbutton.c b/src/examples/eo/evas/evas_elw_boxedbutton.c
index 457dba892a..f6a14640f1 100644
--- a/src/examples/eo/evas/evas_elw_boxedbutton.c
+++ b/src/examples/eo/evas/evas_elw_boxedbutton.c
@@ -5,10 +5,10 @@
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#include "Eo.h" 7#include "Eo.h"
8#include "evas_obj.h" 8#include "evas_evas_obj.h"
9#include "elw_box.h" 9#include "evas_elw_box.h"
10#include "elw_button.h" 10#include "evas_elw_button.h"
11#include "elw_boxedbutton.h" 11#include "evas_elw_boxedbutton.h"
12 12
13typedef struct 13typedef struct
14{ 14{
diff --git a/src/examples/eo/evas/evas_elw_button.c b/src/examples/eo/evas/evas_elw_button.c
index 82fa39b354..6ee294f988 100644
--- a/src/examples/eo/evas/evas_elw_button.c
+++ b/src/examples/eo/evas/evas_elw_button.c
@@ -5,8 +5,8 @@
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#include "Eo.h" 7#include "Eo.h"
8#include "evas_obj.h" 8#include "evas_evas_obj.h"
9#include "elw_button.h" 9#include "evas_elw_button.h"
10 10
11EAPI Eo_Op ELW_BUTTON_BASE_ID = 0; 11EAPI Eo_Op ELW_BUTTON_BASE_ID = 0;
12 12
diff --git a/src/examples/eo/evas/evas_elw_win.c b/src/examples/eo/evas/evas_elw_win.c
index dd9e1002f5..25065212e3 100644
--- a/src/examples/eo/evas/evas_elw_win.c
+++ b/src/examples/eo/evas/evas_elw_win.c
@@ -5,8 +5,8 @@
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#include "Eo.h" 7#include "Eo.h"
8#include "evas_obj.h" 8#include "evas_evas_obj.h"
9#include "elw_win.h" 9#include "evas_elw_win.h"
10 10
11typedef struct 11typedef struct
12{ 12{
diff --git a/src/examples/eo/evas/evas_evas_obj.c b/src/examples/eo/evas/evas_evas_obj.c
index 9d13c66813..3d5a1834a9 100644
--- a/src/examples/eo/evas/evas_evas_obj.c
+++ b/src/examples/eo/evas/evas_evas_obj.c
@@ -5,7 +5,7 @@
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#include "Eo.h" 7#include "Eo.h"
8#include "evas_obj.h" 8#include "evas_evas_obj.h"
9 9
10#define MY_CLASS EXEVAS_OBJ_CLASS 10#define MY_CLASS EXEVAS_OBJ_CLASS
11 11
diff --git a/src/examples/eo/evas/evas_test.c b/src/examples/eo/evas/evas_test.c
index 7a5751367b..1502e31dd1 100644
--- a/src/examples/eo/evas/evas_test.c
+++ b/src/examples/eo/evas/evas_test.c
@@ -4,11 +4,11 @@
4 4
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#include "evas_obj.h" 7#include "evas_evas_obj.h"
8#include "elw_button.h" 8#include "evas_elw_button.h"
9#include "elw_box.h" 9#include "evas_elw_box.h"
10#include "elw_boxedbutton.h" 10#include "evas_elw_boxedbutton.h"
11#include "elw_win.h" 11#include "evas_elw_win.h"
12 12
13Eina_Bool 13Eina_Bool
14_btn_clicked_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info) 14_btn_clicked_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info)