LINT fixes since recent tooling update

This commit is contained in:
Loïc Blot 2019-03-14 11:49:46 +01:00 committed by Loïc Blot
parent a6a04c4b5b
commit 02a23892f9
4 changed files with 11 additions and 7 deletions

@ -260,7 +260,7 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)
return retval; return retval;
} }
} }
// clang-format on // clang-format on
#endif #endif
return false; return false;
} }

@ -33,7 +33,8 @@ using namespace irr;
using namespace irr::core; using namespace irr::core;
using namespace irr::gui; using namespace irr::gui;
typedef enum { typedef enum
{
jump_id = 0, jump_id = 0,
crunch_id, crunch_id,
zoom_id, zoom_id,
@ -61,7 +62,8 @@ typedef enum {
joystick_center_id joystick_center_id
} touch_gui_button_id; } touch_gui_button_id;
typedef enum { typedef enum
{
j_forward = 0, j_forward = 0,
j_backward, j_backward,
j_left, j_left,
@ -69,7 +71,8 @@ typedef enum {
j_special1 j_special1
} touch_gui_joystick_move_id; } touch_gui_joystick_move_id;
typedef enum { typedef enum
{
AHBB_Dir_Top_Bottom, AHBB_Dir_Top_Bottom,
AHBB_Dir_Bottom_Top, AHBB_Dir_Bottom_Top,
AHBB_Dir_Left_Right, AHBB_Dir_Left_Right,

@ -2916,13 +2916,13 @@ public:
ret[0] = unicode::BOM; ret[0] = unicode::BOM;
else if (endian == unicode::EUTFEE_LITTLE) else if (endian == unicode::EUTFEE_LITTLE)
{ {
uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(ret.c_str()); uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(&ret[0]);
*ptr8++ = unicode::BOM_ENCODE_UTF16_LE[0]; *ptr8++ = unicode::BOM_ENCODE_UTF16_LE[0];
*ptr8 = unicode::BOM_ENCODE_UTF16_LE[1]; *ptr8 = unicode::BOM_ENCODE_UTF16_LE[1];
} }
else else
{ {
uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(ret.c_str()); uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(&ret[0]);
*ptr8++ = unicode::BOM_ENCODE_UTF16_BE[0]; *ptr8++ = unicode::BOM_ENCODE_UTF16_BE[0];
*ptr8 = unicode::BOM_ENCODE_UTF16_BE[1]; *ptr8 = unicode::BOM_ENCODE_UTF16_BE[1];
} }

@ -24,7 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
namespace con namespace con
{ {
typedef enum { typedef enum
{
MIN_RTT, MIN_RTT,
MAX_RTT, MAX_RTT,
AVG_RTT, AVG_RTT,