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/Keyboard.h | 50 ++++++++++++++++------ 1 file changed, 36 insertions(+), 14 deletions(-) (limited to 'xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h') diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h index 76284d8..843bdfa 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/dialogs/Keyboard.h @@ -76,17 +76,23 @@ namespace dialogs /// text.c_str(), bRet ? "OK" : "Canceled"); /// ~~~~~~~~~~~~~ /// - inline bool ShowAndGetInput(std::string& text, const std::string& heading, bool allowEmptyResult, bool hiddenInput = false, unsigned int autoCloseMs = 0) + inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(std::string& text, + const std::string& heading, + bool allowEmptyResult, + bool hiddenInput = false, + unsigned int autoCloseMs = 0) { using namespace ::kodi::addon; char* retString = nullptr; - bool ret = CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_input_with_head(CAddonBase::m_interface->toKodi->kodiBase, - text.c_str(), &retString, heading.c_str(), allowEmptyResult, - hiddenInput, autoCloseMs); + bool ret = + CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->show_and_get_input_with_head( + CAddonBase::m_interface->toKodi->kodiBase, text.c_str(), &retString, heading.c_str(), + allowEmptyResult, hiddenInput, autoCloseMs); if (retString != nullptr) { text = retString; - CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, retString); + CAddonBase::m_interface->toKodi->free_string(CAddonBase::m_interface->toKodi->kodiBase, + retString); } return ret; } @@ -108,7 +114,9 @@ namespace dialogs /// false if unsuccessful display, no user /// input, or canceled editing. /// - inline bool ShowAndGetInput(std::string& text, bool allowEmptyResult, unsigned int autoCloseMs = 0) + inline bool ATTRIBUTE_HIDDEN ShowAndGetInput(std::string& text, + bool allowEmptyResult, + unsigned int autoCloseMs = 0) { using namespace ::kodi::addon; char* retString = nullptr; @@ -140,7 +148,10 @@ namespace dialogs /// false if unsuccessful display, no user /// input, or canceled editing. /// - inline bool ShowAndGetNewPassword(std::string& newPassword, const std::string& heading, bool allowEmptyResult, unsigned int autoCloseMs = 0) + inline bool ATTRIBUTE_HIDDEN ShowAndGetNewPassword(std::string& newPassword, + const std::string& heading, + bool allowEmptyResult, + unsigned int autoCloseMs = 0) { using namespace ::kodi::addon; char* retString = nullptr; @@ -170,7 +181,8 @@ namespace dialogs /// false if unsuccessful display, no user /// input, or canceled editing. /// - inline bool ShowAndGetNewPassword(std::string& newPassword, unsigned int autoCloseMs = 0) + inline bool ATTRIBUTE_HIDDEN ShowAndGetNewPassword(std::string& newPassword, + unsigned int autoCloseMs = 0) { using namespace ::kodi::addon; char* retString = nullptr; @@ -251,7 +263,10 @@ namespace dialogs /// } /// ~~~~~~~~~~~~~ /// - inline bool ShowAndVerifyNewPassword(std::string& newPassword, const std::string& heading, bool allowEmptyResult, unsigned int autoCloseMs = 0) + inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword, + const std::string& heading, + bool allowEmptyResult, + unsigned int autoCloseMs = 0) { using namespace ::kodi::addon; char* retString = nullptr; @@ -281,7 +296,8 @@ namespace dialogs /// false if unsuccessful display, no user /// input, or canceled editing. /// - inline bool ShowAndVerifyNewPassword(std::string& newPassword, unsigned int autoCloseMs = 0) + inline bool ATTRIBUTE_HIDDEN ShowAndVerifyNewPassword(std::string& newPassword, + unsigned int autoCloseMs = 0) { using namespace ::kodi::addon; char* retString = nullptr; @@ -313,7 +329,10 @@ namespace dialogs /// unsuccessful input. -1 if no user input or /// canceled editing. /// - inline int ShowAndVerifyPassword(std::string& password, const std::string& heading, int retries, unsigned int autoCloseMs = 0) + inline int ATTRIBUTE_HIDDEN ShowAndVerifyPassword(std::string& password, + const std::string& heading, + int retries, + unsigned int autoCloseMs = 0) { using namespace ::kodi::addon; char* retString = nullptr; @@ -347,7 +366,9 @@ namespace dialogs /// false if unsuccessful display, no user /// input, or canceled editing. /// - inline bool ShowAndGetFilter(std::string& text, bool searching, unsigned int autoCloseMs = 0) + inline bool ATTRIBUTE_HIDDEN ShowAndGetFilter(std::string& text, + bool searching, + unsigned int autoCloseMs = 0) { using namespace ::kodi::addon; char* retString = nullptr; @@ -372,7 +393,8 @@ namespace dialogs /// @return true if successful done, false if /// unsuccessful or keyboard not present. /// - inline bool SendTextToActiveKeyboard(const std::string& text, bool closeKeyboard = false) + inline bool ATTRIBUTE_HIDDEN SendTextToActiveKeyboard(const std::string& text, + bool closeKeyboard = false) { using namespace ::kodi::addon; return CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->send_text_to_active_keyboard(CAddonBase::m_interface->toKodi->kodiBase, @@ -387,7 +409,7 @@ namespace dialogs /// /// @return true if keyboard present, false if not present /// - inline bool IsKeyboardActivated() + inline bool ATTRIBUTE_HIDDEN IsKeyboardActivated() { using namespace ::kodi::addon; return CAddonBase::m_interface->toKodi->kodi_gui->dialogKeyboard->is_keyboard_activated(CAddonBase::m_interface->toKodi->kodiBase); -- cgit v1.2.3