Cleanup some random clang-tidy errors.

src/game.cpp

@@ -332,7 +332,7 @@ static constexpr int DANGEROUS_PROXIMITY = 5;
 
 
 #if defined(__ANDROID__)
-extern bool add_key_to_quick_shortcuts( int key, const std::string &category, bool back );
+extern bool add_key_to_quick_shortcuts( int key, const std::string &category, bool back ); // NOLINT
 #endif
 
 //The one and only game instance
@@ -547,8 +547,8 @@ void game::load_data_from_dir( const std::string &path, const std::string &src,
 
 #if !(defined(_WIN32) || defined(TILES))
 // in ncurses_def.cpp
-void check_encoding();
-void ensure_term_size();
+extern void check_encoding(); // NOLINT
+extern void ensure_term_size(); // NOLINT
 #endif
 
 void game_ui::init_ui()

src/game_ui.cpp

@@ -4,30 +4,24 @@
 
 void reinitialize_framebuffer()
 {
-    return;
 }
 
 void to_map_font_dim_width( int & )
 {
-    return;
 }
 
 void to_map_font_dim_height( int & )
 {
-    return;
 }
 
 void to_map_font_dimension( int &, int & )
 {
-    return;
 }
 void from_map_font_dimension( int &, int & )
 {
-    return;
 }
 void to_overmap_font_dimension( int &, int & )
 {
-    return;
 }
 
 #endif

src/input.h

@@ -376,7 +376,7 @@ class input_manager
          * Use `input_context::(re)set_timeout()` when possible so timeout will be properly
          * reset when entering a new input context.
          */
-        void set_timeout( int t );
+        void set_timeout( int delay );
         void reset_timeout() {
             set_timeout( -1 );
         }

src/ncurses_def.cpp

@@ -422,8 +422,8 @@ bool nc_color::is_blink() const
     return attribute_value & A_BLINK;
 }
 
-void ensure_term_size();
-void check_encoding();
+void ensure_term_size(); // NOLINT(cata-static-declarations)
+void check_encoding(); // NOLINT(cata-static-declarations)
 
 void ensure_term_size()
 {
@@ -461,6 +461,7 @@ void ensure_term_size()
     }
 }
 
+// NOLINTNEXTLINE(cata-static-declarations)
 void check_encoding()
 {
     // Check whether LC_CTYPE supports the UTF-8 encoding

src/options.cpp

@@ -480,7 +480,7 @@ bool options_manager::cOpt::checkPrerequisite() const
 bool options_manager::cOpt::is_hidden() const
 {
     switch( hide ) {
-        case COPT_NO_HIDE:
+        case COPT_NO_HIDE: // NOLINT(bugprone-branch-clone)
             return false;
 
         case COPT_SDL_HIDE:

tests/widget_test.cpp

@@ -23,7 +23,7 @@ namespace cata_curses_test
 #endif
 #include <curses.h>
 #endif
-}
+} // namespace cata_curses_test
 #else
 #include "cursesport.h"
 #endif