diff options
| -rw-r--r-- | src/gui/modalMenu.cpp | 2 | ||||
| -rw-r--r-- | src/gui/touchscreengui.h | 9 | ||||
| -rw-r--r-- | src/irrlicht_changes/irrUString.h | 4 | ||||
| -rw-r--r-- | src/network/peerhandler.h | 3 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/gui/modalMenu.cpp b/src/gui/modalMenu.cpp index 4ffe88800..30417943d 100644 --- a/src/gui/modalMenu.cpp +++ b/src/gui/modalMenu.cpp @@ -260,7 +260,7 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event) return retval; } } - // clang-format on + // clang-format on #endif return false; } diff --git a/src/gui/touchscreengui.h b/src/gui/touchscreengui.h index 421f70963..1f9adda22 100644 --- a/src/gui/touchscreengui.h +++ b/src/gui/touchscreengui.h @@ -33,7 +33,8 @@ using namespace irr; using namespace irr::core; using namespace irr::gui; -typedef enum { +typedef enum +{ jump_id = 0, crunch_id, zoom_id, @@ -61,7 +62,8 @@ typedef enum { joystick_center_id } touch_gui_button_id; -typedef enum { +typedef enum +{ j_forward = 0, j_backward, j_left, @@ -69,7 +71,8 @@ typedef enum { j_special1 } touch_gui_joystick_move_id; -typedef enum { +typedef enum +{ AHBB_Dir_Top_Bottom, AHBB_Dir_Bottom_Top, AHBB_Dir_Left_Right, diff --git a/src/irrlicht_changes/irrUString.h b/src/irrlicht_changes/irrUString.h index fce49e717..b628c092c 100644 --- a/src/irrlicht_changes/irrUString.h +++ b/src/irrlicht_changes/irrUString.h @@ -2916,13 +2916,13 @@ public: ret[0] = unicode::BOM; 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[1]; } 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[1]; } diff --git a/src/network/peerhandler.h b/src/network/peerhandler.h index 208ab801e..da65483ef 100644 --- a/src/network/peerhandler.h +++ b/src/network/peerhandler.h @@ -24,7 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc., namespace con { -typedef enum { +typedef enum +{ MIN_RTT, MAX_RTT, AVG_RTT, |