From c9dc0bbaf5bcaddec9fa0929c04aa1e2c6c353c1 Mon Sep 17 00:00:00 2001 From: Joe Konno Date: Mon, 23 Jul 2012 12:35:24 -0700 Subject: [PATCH] EFL: Refactor/rename templates.h to macros.h Signed-off-by: Joe Konno --- src/efl/{templates.h => macros.h} | 5 +++-- src/efl/test_actionslider.cpp | 2 +- src/efl/test_bubble.cpp | 2 +- src/efl/test_button.cpp | 2 +- src/efl/test_check.cpp | 2 +- src/efl/test_clock.cpp | 2 +- src/efl/test_dayselector.cpp | 2 +- src/efl/test_fileselector.cpp | 2 +- src/efl/test_fileselector_button.cpp | 2 +- src/efl/test_fileselector_entry.cpp | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) rename src/efl/{templates.h => macros.h} (99%) diff --git a/src/efl/templates.h b/src/efl/macros.h similarity index 99% rename from src/efl/templates.h rename to src/efl/macros.h index c0a6531..7f7905b 100644 --- a/src/efl/templates.h +++ b/src/efl/macros.h @@ -1,3 +1,6 @@ +#ifndef __WAYLAND_EFL_TEMPLATES_H__ +#define __WAYLAND_EFL_TEMPLATES_H__ + #include #include @@ -6,8 +9,6 @@ #include "elmtestharness.h" #include "application.h" -#ifndef __WAYLAND_EFL_TEMPLATES_H__ -#define __WAYLAND_EFL_TEMPLATES_H__ diff --git a/src/efl/test_actionslider.cpp b/src/efl/test_actionslider.cpp index 81353f2..89d19d9 100644 --- a/src/efl/test_actionslider.cpp +++ b/src/efl/test_actionslider.cpp @@ -1,6 +1,6 @@ #include -#include "templates.h" +#include "macros.h" using std::vector; diff --git a/src/efl/test_bubble.cpp b/src/efl/test_bubble.cpp index 1b25d57..23b9c25 100644 --- a/src/efl/test_bubble.cpp +++ b/src/efl/test_bubble.cpp @@ -7,7 +7,7 @@ #include "window.h" #include "elmtestharness.h" -#include "templates.h" +#include "macros.h" using std::vector; using std::string; diff --git a/src/efl/test_button.cpp b/src/efl/test_button.cpp index f0dc1fd..3b5c286 100644 --- a/src/efl/test_button.cpp +++ b/src/efl/test_button.cpp @@ -1,4 +1,4 @@ -#include "templates.h" +#include "macros.h" // Basic suite START EFL_RESIZE_TEST(Button, button, 300, 200, 200, 100) diff --git a/src/efl/test_check.cpp b/src/efl/test_check.cpp index 911d2fb..eff66ea 100644 --- a/src/efl/test_check.cpp +++ b/src/efl/test_check.cpp @@ -4,7 +4,7 @@ #include "window.h" #include "elmtestharness.h" -#include "templates.h" +#include "macros.h" // Basic suite START EFL_RESIZE_TEST(Check, check, 300, 200, 200, 100) diff --git a/src/efl/test_clock.cpp b/src/efl/test_clock.cpp index 0e64149..81bb3a6 100644 --- a/src/efl/test_clock.cpp +++ b/src/efl/test_clock.cpp @@ -4,7 +4,7 @@ #include "window.h" #include "elmtestharness.h" -#include "templates.h" +#include "macros.h" // Basic suite START diff --git a/src/efl/test_dayselector.cpp b/src/efl/test_dayselector.cpp index d584ed3..1f17984 100644 --- a/src/efl/test_dayselector.cpp +++ b/src/efl/test_dayselector.cpp @@ -6,7 +6,7 @@ #include "window.h" #include "elmtestharness.h" -#include "templates.h" +#include "macros.h" using std::vector; diff --git a/src/efl/test_fileselector.cpp b/src/efl/test_fileselector.cpp index 9e9e269..21013dd 100644 --- a/src/efl/test_fileselector.cpp +++ b/src/efl/test_fileselector.cpp @@ -6,7 +6,7 @@ #include "window.h" #include "elmtestharness.h" -#include "templates.h" +#include "macros.h" using std::vector; diff --git a/src/efl/test_fileselector_button.cpp b/src/efl/test_fileselector_button.cpp index 738eac7..f3d921a 100644 --- a/src/efl/test_fileselector_button.cpp +++ b/src/efl/test_fileselector_button.cpp @@ -6,7 +6,7 @@ #include "window.h" #include "elmtestharness.h" -#include "templates.h" +#include "macros.h" using std::vector; diff --git a/src/efl/test_fileselector_entry.cpp b/src/efl/test_fileselector_entry.cpp index 03f0115..c4ef3d8 100644 --- a/src/efl/test_fileselector_entry.cpp +++ b/src/efl/test_fileselector_entry.cpp @@ -6,7 +6,7 @@ #include "window.h" #include "elmtestharness.h" -#include "templates.h" +#include "macros.h" using std::vector; -- 2.7.4