Merge "Change deletion order of FrameworkFactory" into devel/master

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.h
index 6571365..03a65c1 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-actor-utils.h
@@ -19,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/rendering/texture-set.h>
 #include <dali/public-api/rendering/texture.h>
 #include <set> // For std::multiset

diff --git a/dali/internal/addons/common/addon-manager.cpp b/dali/internal/addons/common/addon-manager.cpp
index e72a58e..cb3a65b 100644 (file)
--- a/dali/internal/addons/common/addon-manager.cpp
+++ b/dali/internal/addons/common/addon-manager.cpp
@@ -16,7 +16,7 @@
  */
 
 // INTERNAL INCLUDES
-#include "addon-manager.h"
+#include <dali/internal/addons/common/addon-manager.h>
 #include <dali/internal/addons/common/addon-manager-impl.h>
 
 namespace Dali
@@ -60,7 +60,7 @@ bool AddOnManager::GetAddOnInfo(const std::string& name, AddOnInfo& info)
 
 std::vector<Dali::AddOnLibrary> AddOnManager::LoadAddOns(const std::vector<std::string>& addonNames)
 {
-  return std::move(mImpl->LoadAddOns(addonNames));
+  return mImpl->LoadAddOns(addonNames);
 }
 
 void* AddOnManager::GetGlobalProc(const Dali::AddOnLibrary& addonHandle, const char* procName)

diff --git a/dali/internal/imaging/common/webp-loading.cpp b/dali/internal/imaging/common/webp-loading.cpp
index 885e142..1903d2c 100644 (file)
--- a/dali/internal/imaging/common/webp-loading.cpp
+++ b/dali/internal/imaging/common/webp-loading.cpp
@@ -217,11 +217,8 @@ public:
   void ReleaseResource()
   {
 #ifdef DALI_WEBP_AVAILABLE
-    if(&mWebPData != nullptr)
-    {
-      mWebPData.bytes = nullptr;
-      WebPDataInit(&mWebPData);
-    }
+    mWebPData.bytes = nullptr;
+    WebPDataInit(&mWebPData);
 #endif
 #ifdef DALI_ANIMATED_WEBP_ENABLED
     if(mIsAnimatedImage)

diff --git a/dali/internal/web-engine/common/web-engine-impl.cpp b/dali/internal/web-engine/common/web-engine-impl.cpp
index 87e1f6e..d09b8fb 100644 (file)
--- a/dali/internal/web-engine/common/web-engine-impl.cpp
+++ b/dali/internal/web-engine/common/web-engine-impl.cpp
@@ -56,7 +56,7 @@ std::string MakePluginName(const char* environmentName)
 {
   std::stringstream fullName;
   fullName << kPluginFullNamePrefix << environmentName << kPluginFullNamePostfix;
-  return std::move(fullName.str());
+  return fullName.str();
 }
 
 Dali::BaseHandle Create()