X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=WindowManager%2Fsrc%2Fwindowmanager.hpp;h=26fe8ea1408a57bfa819baddcdfa7f049f746d2f;hb=ffad9fd5bed339b7ae3bd8086f1c90ce1b6dc69b;hp=a4d9d4f1ecb8b6cbb3d02e18e143ee50aa4d5557;hpb=2044d95f928fa42beaa00f9cb30816b1f6f63552;p=staging%2FHomeScreen.git diff --git a/WindowManager/src/windowmanager.hpp b/WindowManager/src/windowmanager.hpp index a4d9d4f..26fe8ea 100644 --- a/WindowManager/src/windowmanager.hpp +++ b/WindowManager/src/windowmanager.hpp @@ -21,12 +21,12 @@ #include #include -#include "windowmanager_adapter.h" +#include "windowmanager_adaptor.h" -#ifdef __arm__ +#ifdef HAVE_IVI_LAYERMANAGEMENT_API extern "C" { -#include "ilm/ilm_control.h" +#include } #endif @@ -49,7 +49,7 @@ private: void dumpScene(); -#ifdef __arm__ +#ifdef HAVE_IVI_LAYERMANAGEMENT_API void createNewLayer(int layerId); void addSurfaceToLayer(int surfaceId, int layerId); #endif @@ -59,7 +59,7 @@ private: public: static void* myThis; -#ifdef __arm__ +#ifdef HAVE_IVI_LAYERMANAGEMENT_API // for general notifications void notificationFunc_non_static(ilmObjectType object, t_ilm_uint id, @@ -82,7 +82,7 @@ public: public slots: -// from windowmanager_adapter.h +// from windowmanager_adaptor.h public: // PROPERTIES Q_PROPERTY(int layoutId READ layoutId) int layoutId() const;