From 5f8335c1e49ce108ef3481863833c98efa00411b Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 2 Jul 2020 23:09:26 +0200 Subject: sync with upstream --- .../include/kodi/gui/dialogs/Select.h | 26 +++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h') diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h index ba0db1d..39a98fe 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Select.h @@ -104,16 +104,21 @@ namespace dialogs /// fprintf(stderr, "Selected item is: %i\n", selected); /// ~~~~~~~~~~~~~ /// - inline int Show(const std::string& heading, const std::vector& entries, int selected = -1, unsigned int autoclose = 0) + inline int ATTRIBUTE_HIDDEN Show(const std::string& heading, + const std::vector& entries, + int selected = -1, + unsigned int autoclose = 0) { using namespace ::kodi::addon; - unsigned int size = entries.size(); - const char** cEntries = (const char**)malloc(size*sizeof(const char**)); + unsigned int size = static_cast(entries.size()); + const char** cEntries = (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->dialogSelect->open(CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size, selected, autoclose); + int ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogSelect->open( + CAddonBase::m_interface->toKodi->kodiBase, heading.c_str(), cEntries, size, selected, + autoclose); free(cEntries); return ret; } @@ -159,10 +164,13 @@ namespace dialogs /// fprintf(stderr, "Selected item is: %i\n", selected); /// ~~~~~~~~~~~~~ /// - inline int Show(const std::string& heading, std::vector& entries, int selected = -1, unsigned int autoclose = 0) + inline int ATTRIBUTE_HIDDEN Show(const std::string& heading, + std::vector& entries, + int selected = -1, + unsigned int autoclose = 0) { using namespace ::kodi::addon; - unsigned int size = entries.size(); + unsigned int size = static_cast(entries.size()); const char** cEntries = static_cast(malloc(size*sizeof(const char*))); for (unsigned int i = 0; i < size; ++i) { @@ -224,10 +232,12 @@ namespace dialogs /// } /// ~~~~~~~~~~~~~ /// - inline bool ShowMultiSelect(const std::string& heading, std::vector& entries, int autoclose = 0) + inline bool ATTRIBUTE_HIDDEN ShowMultiSelect(const std::string& heading, + std::vector& entries, + int autoclose = 0) { using namespace ::kodi::addon; - unsigned int size = entries.size(); + unsigned int size = static_cast(entries.size()); const char** cEntryIDs = static_cast(malloc(size*sizeof(const char*))); const char** cEntryNames = static_cast(malloc(size*sizeof(const char*))); bool* cEntriesSelected = static_cast(malloc(size*sizeof(bool))); -- cgit v1.2.3