[3.0] Change SetNativeImageSource() to SetSource()

 - Change API name before ACR for the API.

Change-Id: I5aa6310ff1e3e91def89983f5cf1807085ae847d

diff --git a/adaptors/public-api/adaptor-framework/native-image-source.cpp b/adaptors/public-api/adaptor-framework/native-image-source.cpp
index 9efc7d3..c4764e4 100644 (file)
--- a/adaptors/public-api/adaptor-framework/native-image-source.cpp
+++ b/adaptors/public-api/adaptor-framework/native-image-source.cpp
@@ -55,9 +55,9 @@ bool NativeImageSource::EncodeToFile(const std::string& filename) const
   return mImpl->EncodeToFile(filename);
 }
 
-void NativeImageSource::SetNativeImageSource( Any nativeImageSource )
+void NativeImageSource::SetSource( Any source )
 {
-  mImpl->SetNativeImageSource( nativeImageSource );
+  mImpl->SetSource( source );
 }
 
 bool NativeImageSource::GlExtensionCreate()

diff --git a/adaptors/public-api/adaptor-framework/native-image-source.h b/adaptors/public-api/adaptor-framework/native-image-source.h
index 2ec3ec2..e626cd5 100644 (file)
--- a/adaptors/public-api/adaptor-framework/native-image-source.h
+++ b/adaptors/public-api/adaptor-framework/native-image-source.h
@@ -129,12 +129,12 @@ public:
   bool EncodeToFile(const std::string& filename) const;
 
   /**
-   * @brief Set an existing native image source
+   * @brief Set an existing source
    *
    * @SINCE_1_1.19
-   * @param[in] source Any handle with native image source
+   * @param[in] source Any handle with the source
    */
-  void SetNativeImageSource( Any source );
+  void SetSource( Any source );
 
 private:   // native image
 

diff --git a/adaptors/tizen/native-image-source-impl-tizen.cpp b/adaptors/tizen/native-image-source-impl-tizen.cpp
index 4ebed37..f9d1923 100644 (file)
--- a/adaptors/tizen/native-image-source-impl-tizen.cpp
+++ b/adaptors/tizen/native-image-source-impl-tizen.cpp
@@ -289,7 +289,7 @@ bool NativeImageSource::EncodeToFile(const std::string& filename) const
   return false;
 }
 
-void NativeImageSource::SetNativeImageSource( Any nativeImageSource )
+void NativeImageSource::SetSource( Any source )
 {
   if( mOwnTbmsurface && mTbmsurface != NULL )
   {
@@ -301,7 +301,7 @@ void NativeImageSource::SetNativeImageSource( Any nativeImageSource )
     mTbmsurface = NULL;
   }
 
-  mTbmsurface = GetSurfaceFromAny( nativeImageSource );
+  mTbmsurface = GetSurfaceFromAny( source );
   mOwnTbmsurface = false;
 
   if( mTbmsurface != NULL )

diff --git a/adaptors/tizen/native-image-source-impl.h b/adaptors/tizen/native-image-source-impl.h
index 0317047..5e251b7 100644 (file)
--- a/adaptors/tizen/native-image-source-impl.h
+++ b/adaptors/tizen/native-image-source-impl.h
@@ -72,9 +72,9 @@ public:
   bool EncodeToFile(const std::string& filename) const;
 
   /**
-   * @copydoc Dali::NativeImageSource::SetNativeImageSource( Any nativeImageSource )
+   * @copydoc Dali::NativeImageSource::SetSource( Any source )
    */
-  void SetNativeImageSource( Any nativeImageSource );
+  void SetSource( Any source );
 
   /**
    * destructor

diff --git a/adaptors/x11/native-image-source-impl-x.cpp b/adaptors/x11/native-image-source-impl-x.cpp
index 84d7887..f97b681 100644 (file)
--- a/adaptors/x11/native-image-source-impl-x.cpp
+++ b/adaptors/x11/native-image-source-impl-x.cpp
@@ -273,9 +273,9 @@ bool NativeImageSource::EncodeToFile(const std::string& filename) const
   return false;
 }
 
-void NativeImageSource::SetNativeImageSource( Any nativeImageSource )
+void NativeImageSource::SetSource( Any source )
 {
-  mPixmap = GetPixmapFromAny( nativeImageSource );
+  mPixmap = GetPixmapFromAny( source );
 
   if (mPixmap)
   {

diff --git a/adaptors/x11/native-image-source-impl.h b/adaptors/x11/native-image-source-impl.h
index c7e2357..20f4585 100644 (file)
--- a/adaptors/x11/native-image-source-impl.h
+++ b/adaptors/x11/native-image-source-impl.h
@@ -70,9 +70,9 @@ public:
   bool EncodeToFile(const std::string& filename) const;
 
   /**
-   * @copydoc Dali::NativeImageSource::SetNativeImageSource( Any nativeImageSource )
+   * @copydoc Dali::NativeImageSource::SetSource( Any source )
    */
-  void SetNativeImageSource( Any nativeImageSource );
+  void SetSource( Any source );
 
   /**
    * destructor