cxx: Fix missing bits from header rename

Reviewed-by: Vincent Torri <vincent.torri@gmail.com>
Differential Revision: https://phab.enlightenment.org/D8811

diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am
index 1e5936d..2f95733 100644 (file)
--- a/src/Makefile_Cxx.am
+++ b/src/Makefile_Cxx.am
@@ -28,9 +28,8 @@ dist_installed_eflcxxextraheaders_DATA = lib/efl/cxx/efl_part_impl.hh
 installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/
 ## TIZEN_ONLY(20180509): support elementary optional build
 if BUILD_TIZEN_ELM
-dist_installed_elementarycxxmainheaders_DATA = lib/elementary/Elementary.hh
+dist_installed_elementarycxxmainheaders_DATA = lib/elementary/Efl_Ui.hh
 endif
-##
 
 installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/
 dist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh

diff --git a/src/lib/elementary/Efl_Ui.hh b/src/lib/elementary/Efl_Ui.hh
index d8551b8..611cdbe 100644 (file)
--- a/src/lib/elementary/Efl_Ui.hh
+++ b/src/lib/elementary/Efl_Ui.hh
@@ -1,7 +1,7 @@
-#ifndef EFL_CXX_ELEMENTARY_HH
-#define EFL_CXX_ELEMENTARY_HH
-#if defined(ELEMENTARY_H) || defined(ELM_WIDGET_H)
-#error "Do not include Elm C API headers before including Elementary.hh"
+#ifndef EFL_CXX_EFL_UI_HH
+#define EFL_CXX_EFL_UI_HH
+#if defined(ELEMENTARY_H) || defined(ELM_WIDGET_H) || defined(_EFL_UI_H)
+#error "Do not include Elm C API headers before including Efl_Ui.hh"
 #endif
 
 #ifndef EFL_BETA_API_SUPPORT

diff --git a/src/tests/elementary/elm_cxx_suite.cc b/src/tests/elementary/elm_cxx_suite.cc
index 1e7a5d6..eb88aa8 100644 (file)
--- a/src/tests/elementary/elm_cxx_suite.cc
+++ b/src/tests/elementary/elm_cxx_suite.cc
@@ -1,4 +1,4 @@
-#include <Elementary.hh>
+#include <Efl_Ui.hh>
 
 int main()
 {