From d12ef91687d95e2fb37a43d2eebc1e2b164d374d Mon Sep 17 00:00:00 2001
From: q66 <quaker66@gmail.com>
Date: Fri, 21 Nov 2014 20:10:46 +0000
Subject: [PATCH] rename WEIGHT/ALIGN/EXPAND/FILL to
 E_WEIGHT/E_ALIGN/E_EXPAND/E_FILL

Otherwise there were macro clashes with a systemwide include.
Also remove a leftover E_Hal.h include.
---
 src/bin/e.h                          | 8 ++++----
 src/bin/e_dialog.c                   | 4 ++--
 src/modules/everything/evry.c        | 4 ++--
 src/modules/temperature/e_mod_main.h | 2 --
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/bin/e.h b/src/bin/e.h
index 877bf864c..e73d8a05c 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -263,10 +263,10 @@ typedef struct _E_Rect         E_Rect;
        }                                                          \
   }
 
-#define WEIGHT evas_object_size_hint_weight_set
-#define ALIGN evas_object_size_hint_align_set
-#define EXPAND(X) WEIGHT((X), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND)
-#define FILL(X) ALIGN((X), EVAS_HINT_FILL, EVAS_HINT_FILL)
+#define E_WEIGHT evas_object_size_hint_weight_set
+#define E_ALIGN evas_object_size_hint_align_set
+#define E_EXPAND(X) E_WEIGHT((X), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND)
+#define E_FILL(X) E_ALIGN((X), EVAS_HINT_FILL, EVAS_HINT_FILL)
 
 # define E_REMOTE_OPTIONS 1
 # define E_REMOTE_OUT     2
diff --git a/src/bin/e_dialog.c b/src/bin/e_dialog.c
index 7b01b9f55..45950efc9 100644
--- a/src/bin/e_dialog.c
+++ b/src/bin/e_dialog.c
@@ -36,8 +36,8 @@ _e_dialog_internal_new(Evas_Object *parent, const char *name, const char *class,
    evas_object_event_callback_add(dia->win, EVAS_CALLBACK_DEL, _e_dialog_cb_delete, dia);
    ecore_evas_name_class_set(ecore_evas_ecore_evas_get(e), name, class);
    dia->bg_object = o = edje_object_add(evas_object_evas_get(dia->win));
-   EXPAND(o);
-   FILL(o);
+   E_EXPAND(o);
+   E_FILL(o);
    elm_win_resize_object_add(dia->win, o);
    e_theme_edje_object_set(o, "base/theme/dialog",
                            "e/widgets/dialog/main");
diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index c88b923fd..b9c20ef58 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -768,8 +768,8 @@ _evry_window_new(E_Zone *zone, E_Zone_Edge edge)
    o = edje_object_add(win->evas);
    win->o_main = o;
    elm_win_resize_object_add(win->ewin, o);
-   EXPAND(o);
-   FILL(o);
+   E_EXPAND(o);
+   E_FILL(o);
    e_theme_edje_object_set(o, "base/theme/modules/everything",
                            "e/modules/everything/main");
 
diff --git a/src/modules/temperature/e_mod_main.h b/src/modules/temperature/e_mod_main.h
index bdff1a2a2..59808b715 100644
--- a/src/modules/temperature/e_mod_main.h
+++ b/src/modules/temperature/e_mod_main.h
@@ -5,8 +5,6 @@
 
 #ifdef HAVE_EEZE
 # include <Eeze.h>
-#else
-# include <E_Hal.h>
 #endif