Move imf-manager-impl.h to integration-api. 04/50404/1
authordaemyung jang <dm86.jang@samsung.com>
Wed, 28 Oct 2015 04:30:39 +0000 (13:30 +0900)
committerVictor Cebollada <v.cebollada@samsung.com>
Wed, 28 Oct 2015 10:12:33 +0000 (10:12 +0000)
* A previous patch https://review.tizen.org/gerrit/#/c/50119/ removed
  the Ecore dependency from the public API. However, Ecore_IMF_Context
  may be needed in applications.

Change-Id: Id3096f4dd83f2e93c7dae100600ddb4af9ac86d9
Signed-off-by: daemyung jang <dm86.jang@samsung.com>
adaptors/integration-api/file.list
adaptors/integration-api/x11/imf-manager-impl.h [moved from adaptors/x11/imf-manager-impl.h with 94% similarity]

index 2779d84..c245a1d 100644 (file)
@@ -15,4 +15,5 @@ adaptor_integration_wayland_api_header_files = \
 adaptor_integration_x11_api_header_files = \
   $(adaptor_integration_api_dir)/x11/ecore-x-types.h \
   $(adaptor_integration_api_dir)/x11/ecore-x-render-surface.h \
-  $(adaptor_integration_api_dir)/x11/pixmap-render-surface.h
+  $(adaptor_integration_api_dir)/x11/pixmap-render-surface.h \
+  $(adaptor_integration_api_dir)/x11/imf-manager-impl.h
similarity index 94%
rename from adaptors/x11/imf-manager-impl.h
rename to adaptors/integration-api/x11/imf-manager-impl.h
index 7fbab59..1791792 100644 (file)
@@ -38,7 +38,7 @@ namespace Internal
 namespace Adaptor
 {
 
-class ImfManager : public Dali::BaseObject
+class DALI_IMPORT_API ImfManager : public Dali::BaseObject
 {
 public:
   typedef Dali::ImfManager::ImfManagerSignalType ImfManagerSignalType;
@@ -203,7 +203,7 @@ private:
 
 public:
 
-inline static Internal::Adaptor::ImfManager& GetImplementation(Dali::ImfManager& imfManager)
+DALI_IMPORT_API inline static Internal::Adaptor::ImfManager& GetImplementation(Dali::ImfManager& imfManager)
 {
   DALI_ASSERT_ALWAYS( imfManager && "ImfManager handle is empty" );
 
@@ -212,7 +212,7 @@ inline static Internal::Adaptor::ImfManager& GetImplementation(Dali::ImfManager&
   return static_cast<Internal::Adaptor::ImfManager&>(handle);
 }
 
-inline static const  Internal::Adaptor::ImfManager& GetImplementation(const Dali::ImfManager& imfManager)
+DALI_IMPORT_API inline static const  Internal::Adaptor::ImfManager& GetImplementation(const Dali::ImfManager& imfManager)
 {
   DALI_ASSERT_ALWAYS( imfManager && "ImfManager handle is empty" );