From 5f8335c1e49ce108ef3481863833c98efa00411b Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Thu, 2 Jul 2020 23:09:26 +0200
Subject: sync with upstream

---
 .../include/kodi/gui/dialogs/ContextMenu.h           | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h')

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
index 26d6386..d545030 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/ContextMenu.h
@@ -66,16 +66,18 @@ namespace dialogs
     ///   fprintf(stderr, "Selected item is: %i\n", selected);
     /// ~~~~~~~~~~~~~
     ///
-    inline int Show(const std::string& heading, const std::vector<std::string>& entries)
+    inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                     const std::vector<std::string>& entries)
     {
       using namespace ::kodi::addon;
-      unsigned int size = entries.size();
-      const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char**)));
+      unsigned int size = static_cast<unsigned int>(entries.size());
+      const char** cEntries = static_cast<const char**>(malloc(size * sizeof(const char**)));
       for (unsigned int i = 0; i < size; ++i)
       {
         cEntries[i] = entries[i].c_str();
       }
-      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogContextMenu->open(CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size);
+      int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogContextMenu->open(
+          CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size);
       free(cEntries);
       return ret;
     }
@@ -113,10 +115,11 @@ namespace dialogs
     ///   fprintf(stderr, "Selected item is: %i\n", selected);
     /// ~~~~~~~~~~~~~
     ///
-    inline int Show(const std::string& heading, const std::vector<std::pair<std::string, std::string>>& entries)
+    inline int ATTRIBUTE_HIDDEN Show(
+        const std::string& heading, const std::vector<std::pair<std::string, std::string>>& entries)
     {
       using namespace ::kodi::addon;
-      unsigned int size = entries.size();
+      unsigned int size = static_cast<unsigned int>(entries.size());
       const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char**)));
       for (unsigned int i = 0; i < size; ++i)
       {
@@ -160,10 +163,11 @@ namespace dialogs
     ///   fprintf(stderr, "Selected item is: %i\n", selected);
     /// ~~~~~~~~~~~~~
     ///
-    inline int Show(const std::string& heading, const std::vector<std::pair<int, std::string>>& entries)
+    inline int ATTRIBUTE_HIDDEN Show(const std::string& heading,
+                                     const std::vector<std::pair<int, std::string>>& entries)
     {
       using namespace ::kodi::addon;
-      unsigned int size = entries.size();
+      unsigned int size = static_cast<unsigned int>(entries.size());
       const char** cEntries = static_cast<const char**>(malloc(size*sizeof(const char**)));
       for (unsigned int i = 0; i < size; ++i)
       {
-- 
cgit v1.2.3