LINT fixes since recent tooling update

nerzhul · nerzhul · commit 02a23892f94d · 2019-03-14T12:30:13.000+01:00
diff --git 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
@@ -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,15 +62,17 @@ typedef enum {
 	joystick_center_id
 } touch_gui_button_id;
 
-typedef enum {
+typedef enum
+{
 	j_forward = 0,
 	j_backward,
 	j_left,
 	j_right,
 	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
@@ -2916,13 +2916,13 @@ class ustring16
 				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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ bool GUIModalMenu::preprocessEvent(const SEvent &event)`
`260`	`260`	`return retval;`
`261`	`261`	`}`
`262`	`262`	`}`
`263`		`- // clang-format on`
	`263`	`+ // clang-format on`
`264`	`264`	`#endif`
`265`	`265`	`return false;`
`266`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2916,13 +2916,13 @@ class ustring16`
`2916`	`2916`	`ret[0] = unicode::BOM;`
`2917`	`2917`	`else if (endian == unicode::EUTFEE_LITTLE)`
`2918`	`2918`	`{`
`2919`		`- uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(ret.c_str());`
	`2919`	`+ uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(&ret[0]);`
`2920`	`2920`	`*ptr8++ = unicode::BOM_ENCODE_UTF16_LE[0];`
`2921`	`2921`	`*ptr8 = unicode::BOM_ENCODE_UTF16_LE[1];`
`2922`	`2922`	`}`
`2923`	`2923`	`else`
`2924`	`2924`	`{`
`2925`		`- uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(ret.c_str());`
	`2925`	`+ uchar8_t* ptr8 = reinterpret_cast<uchar8_t*>(&ret[0]);`
`2926`	`2926`	`*ptr8++ = unicode::BOM_ENCODE_UTF16_BE[0];`
`2927`	`2927`	`*ptr8 = unicode::BOM_ENCODE_UTF16_BE[1];`
`2928`	`2928`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,`
`24`	`24`	`namespace con`
`25`	`25`	`{`
`26`	`26`
`27`		`-typedef enum {`
	`27`	`+typedef enum`
	`28`	`+{`
`28`	`29`	`MIN_RTT,`
`29`	`30`	`MAX_RTT,`
`30`	`31`	`AVG_RTT,`