diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2020-01-19 08:54:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-19 08:54:37 -0800 |
| commit | 02aca732970c6dbb2462905003af5298d1540125 (patch) | |
| tree | 07d59ce1f9c2680bd631e098a853a0b20a6af023 | |
| parent | 01149380a21391c3f241d77dc5020c27d5c8e281 (diff) | |
| parent | 5a6311f7cd4de765a2bfddced22da14d0381204d (diff) | |
Merge pull request #17197 from lrusak/dialog-defines
Fix problem introduced by clang-format include reordering
| -rw-r--r-- | xbmc/interfaces/legacy/Dialog.cpp | 29 | ||||
| -rw-r--r-- | xbmc/interfaces/legacy/Dialog.h | 28 |
2 files changed, 29 insertions, 28 deletions
diff --git a/xbmc/interfaces/legacy/Dialog.cpp b/xbmc/interfaces/legacy/Dialog.cpp index 6198d8d177..b291c2f035 100644 --- a/xbmc/interfaces/legacy/Dialog.cpp +++ b/xbmc/interfaces/legacy/Dialog.cpp @@ -5,31 +5,32 @@ * SPDX-License-Identifier: GPL-2.0-or-later * See LICENSES/README.md for more information. */ -#include "LanguageHook.h" +#include "Dialog.h" + +#include "LanguageHook.h" +#include "ListItem.h" +#include "ModuleXbmcgui.h" #include "ServiceBroker.h" -#include "dialogs/GUIDialogYesNo.h" -#include "dialogs/GUIDialogSelect.h" +#include "WindowException.h" #include "dialogs/GUIDialogContextMenu.h" +#include "dialogs/GUIDialogFileBrowser.h" +#include "dialogs/GUIDialogKaiToast.h" +#include "dialogs/GUIDialogNumeric.h" +#include "dialogs/GUIDialogSelect.h" #include "dialogs/GUIDialogTextViewer.h" +#include "dialogs/GUIDialogYesNo.h" #include "guilib/GUIComponent.h" +#include "guilib/GUIKeyboardFactory.h" #include "guilib/GUIWindowManager.h" -#include "dialogs/GUIDialogFileBrowser.h" -#include "dialogs/GUIDialogNumeric.h" -#include "video/dialogs/GUIDialogVideoInfo.h" +#include "messaging/helpers/DialogOKHelper.h" #include "music/dialogs/GUIDialogMusicInfo.h" #include "settings/MediaSourceSettings.h" #include "storage/MediaManager.h" -#include "dialogs/GUIDialogKaiToast.h" -#include "ModuleXbmcgui.h" -#include "guilib/GUIKeyboardFactory.h" -#include "utils/log.h" #include "utils/StringUtils.h" #include "utils/Variant.h" -#include "WindowException.h" -#include "messaging/helpers/DialogOKHelper.h" -#include "Dialog.h" -#include "ListItem.h" +#include "utils/log.h" +#include "video/dialogs/GUIDialogVideoInfo.h" #ifdef TARGET_POSIX #include "platform/posix/XTimeUtils.h" #endif diff --git a/xbmc/interfaces/legacy/Dialog.h b/xbmc/interfaces/legacy/Dialog.h index 3dd0b726dc..4b4ae4f320 100644 --- a/xbmc/interfaces/legacy/Dialog.h +++ b/xbmc/interfaces/legacy/Dialog.h @@ -18,20 +18,20 @@ #include <string> #include <vector> -#define INPUT_ALPHANUM 0 -#define INPUT_NUMERIC 1 -#define INPUT_DATE 2 -#define INPUT_TIME 3 -#define INPUT_IPADDRESS 4 -#define INPUT_PASSWORD 5 - -#define PASSWORD_VERIFY 1 -#define ALPHANUM_HIDE_INPUT 2 - namespace XBMCAddon { - namespace xbmcgui - { +namespace xbmcgui +{ +constexpr int INPUT_ALPHANUM{0}; +constexpr int INPUT_NUMERIC{1}; +constexpr int INPUT_DATE{2}; +constexpr int INPUT_TIME{3}; +constexpr int INPUT_IPADDRESS{4}; +constexpr int INPUT_PASSWORD{5}; + +constexpr int PASSWORD_VERIFY{1}; +constexpr int ALPHANUM_HIDE_INPUT{2}; + /// /// \defgroup python_Dialog Dialog /// \ingroup python_xbmcgui @@ -982,5 +982,5 @@ namespace XBMCAddon }; //@} - } -} +} // namespace xbmcgui +} // namespace XBMCAddon |