Silence more clang-tidy warnings

CleverRaven · Jul 10, 2021 · 955ab31 · 955ab31
1 parent aa126fe
commit 955ab31
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/auto_note.cpp b/src/auto_note.cpp
@@ -482,7 +482,7 @@ void auto_note_manager_gui::show()
             .query_string();
 
             if( !custom_symbol_popup.canceled() ) {
-                std::string custom_symbol_str = custom_symbol_popup.text();
+                const std::string &custom_symbol_str = custom_symbol_popup.text();
                 if( custom_symbol_str.empty() ) {
                     custom_symbol_cache.erase( currentItem );
                 } else {

diff --git a/tests/point_test.cpp b/tests/point_test.cpp
@@ -28,11 +28,11 @@ TEST_CASE( "rectangle_containment_raw", "[point]" )
 
 TEST_CASE( "rectangle_overlapping_inclusive", "[point]" )
 {
-    inclusive_rectangle<point> r1( point( 0, 0 ), point( 2,
-                                   2 ) ); // NOLINT(cata-use-named-point-constants)
+    // NOLINTNEXTLINE(cata-use-named-point-constants)
+    inclusive_rectangle<point> r1( point( 0, 0 ), point( 2, 2 ) );
     inclusive_rectangle<point> r2( point( 2, 2 ), point( 3, 3 ) );
-    inclusive_rectangle<point> r3( point( 0, 0 ), point( 2,
-                                   1 ) ); // NOLINT(cata-use-named-point-constants)
+    // NOLINT(cata-use-named-point-constants)
+    inclusive_rectangle<point> r3( point( 0, 0 ), point( 2, 1 ) );
     inclusive_rectangle<point> r4( point( -2, -4 ), point( 4, -1 ) );
     inclusive_rectangle<point> r5( point( -1, -3 ), point( 0, -2 ) );
 
@@ -64,11 +64,11 @@ TEST_CASE( "rectangle_overlapping_inclusive", "[point]" )
 
 TEST_CASE( "rectangle_overlapping_half_open", "[point]" )
 {
-    half_open_rectangle<point> r1( point( 0, 0 ), point( 2,
-                                   2 ) ); // NOLINT(cata-use-named-point-constants)
+    // NOLINT(cata-use-named-point-constants)
+    half_open_rectangle<point> r1( point( 0, 0 ), point( 2, 2 ) );
     half_open_rectangle<point> r2( point( 2, 2 ), point( 3, 3 ) );
-    half_open_rectangle<point> r3( point( 0, 0 ), point( 2,
-                                   1 ) ); // NOLINT(cata-use-named-point-constants)
+    // NOLINT(cata-use-named-point-constants)
+    half_open_rectangle<point> r3( point( 0, 0 ), point( 2, 1 ) );
     half_open_rectangle<point> r4( point( -2, -4 ), point( 4, -1 ) );
     half_open_rectangle<point> r5( point( -1, -3 ), point( 0, -2 ) );