sync with upstreamMatrix

4 files changed, 11 insertions, 5 deletions

diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h
index 3066b3c..10fa6ef 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/Window.h
@@ -451,7 +451,7 @@ public:
   /// @param[in] item List item to add
   /// @param[in] itemPosition [opt] The position for item, default is on end
   ///
-  void AddListItem(std::shared_ptr<CListItem> item, int itemPosition = -1)
+  void AddListItem(const std::shared_ptr<CListItem>& item, int itemPosition = -1)
   {
     m_interface->kodi_gui->window->add_list_item(m_interface->kodiBase, m_controlHandle,
                                                  item->m_controlHandle, itemPosition);
@@ -465,7 +465,7 @@ public:
   /// @param[in] item List item to add
   /// @param[in] itemPosition [opt] The position for item, default is on end
   ///
-  void AddListItem(const std::string item, int itemPosition = -1)
+  void AddListItem(const std::string& item, int itemPosition = -1)
   {
     m_interface->kodi_gui->window->add_list_item(
         m_interface->kodiBase, m_controlHandle,
@@ -492,7 +492,7 @@ public:
   ///
   /// @param[in] item List item control class to remove
   ///
-  void RemoveListItem(std::shared_ptr<CListItem> item)
+  void RemoveListItem(const std::shared_ptr<CListItem>& item)
   {
     m_interface->kodi_gui->window->remove_list_item(m_interface->kodiBase, m_controlHandle,
                                                     item->m_controlHandle);
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h
index 42a86f3..dc89740 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/dialogs/TextViewer.h
@@ -33,7 +33,7 @@ namespace dialogs
 /// in the <em>"./resources/language/resource.language.??_??/strings.po"</em>
 /// to call with <b>std::string kodi::general::GetLocalizedString(...);</b>.
 ///
-/// It has the header \ref TextViewer.h "#include <kodi/gui/dialogs/TextViewer.h>"
+/// It has the header @ref TextViewer.h "#include <kodi/gui/dialogs/TextViewer.h>"
 /// be included to enjoy it.
 ///
 namespace TextViewer
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GLonDX.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GLonDX.h
index 4dd97af..5d4e384 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GLonDX.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/gl/GLonDX.h
@@ -10,6 +10,8 @@
 
 #ifdef __cplusplus
 
+#if defined(WIN32) && defined(HAS_ANGLE)
+
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <angle_gl.h>
@@ -386,4 +388,8 @@ using CRenderHelper = gl::CGLonDX;
 } /* namespace gui */
 } /* namespace kodi */
 
+#else /* defined(WIN32) && defined(HAS_ANGLE) */
+#pragma message ( "WARNING: GLonDX.h only be available on Windows by use of Angle as depend!" )
+#endif /* defined(WIN32) && defined(HAS_ANGLE) */
+
 #endif /* __cplusplus */
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/gui/renderHelper.h b/xbmc/addons/kodi-dev-kit/include/kodi/gui/renderHelper.h
index dabe101..b08f898 100644
--- a/xbmc/addons/kodi-dev-kit/include/kodi/gui/renderHelper.h
+++ b/xbmc/addons/kodi-dev-kit/include/kodi/gui/renderHelper.h
@@ -67,7 +67,7 @@ inline std::shared_ptr<IRenderHelper> ATTRIBUTE_HIDDEN GetRenderHelper()
   if (static_cast<CAddonBase*>(CAddonBase::m_interface->addonBase)->m_renderHelper)
     return static_cast<CAddonBase*>(CAddonBase::m_interface->addonBase)->m_renderHelper;
 
-  const std::shared_ptr<kodi::gui::IRenderHelper> renderHelper(new CRenderHelper());
+  std::shared_ptr<kodi::gui::IRenderHelper> renderHelper(new CRenderHelper());
   if (!renderHelper->Init())
     return nullptr;