lint. fix build

Author: dhthwy

library/CMakeLists.txt

@@ -398,6 +398,8 @@ target_include_directories(dfhack-run PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/includ
 add_executable(binpatch binpatch.cpp)
 target_link_libraries(binpatch dfhack-md5)
 
+target_include_directories(dfhack-test PRIVATE ${SDL2_INCLUDE_DIRS})
+
 if(WIN32)
     set_target_properties(dfhack PROPERTIES OUTPUT_NAME "dfhooks_dfhack" )
     set_target_properties(dfhack PROPERTIES COMPILE_FLAGS "/FI\"Export.h\"" )

library/Console-sdl.cpp

@@ -224,10 +224,8 @@ SDLConsoleDriver::SDLConsoleDriver() : Console(this)
 SDLConsoleDriver::~SDLConsoleDriver()
 {
     assert(!inited);
-    if(wlock)
-        delete wlock;
-    if(d)
-        delete d;
+    delete wlock;
+    delete d;
 }
 
 /**

library/SDLConsole_impl.cpp

@@ -966,7 +966,7 @@ class Property {
             return default_value;
         }
 
-        if (std::holds_alternative<T>(it->second) == false) {
+        if (!std::holds_alternative<T>(it->second)) {
             return default_value; // TODO: log error
         }
         return std::get<T>(it->second);
@@ -1208,7 +1208,7 @@ class Font : public SignalEmitter {
 
     void render(const std::u32string_view& text, int x, int y)
     {
-        for (auto& ch : text) {
+        for (const auto& ch : text) {
             char32_t index;
             if (ch <= 127)
                 index = ch;
@@ -3174,7 +3174,7 @@ int set_draw_color(SDL_Renderer* renderer, const SDL_Color& color)
 struct SDLConsole_pshare {
     Property props;
     std::weak_ptr<SDLConsole_impl> impl_weak;
-    std::thread::id render_thread_id{};
+    std::thread::id render_thread_id;
 };
 
 class SDLConsole_impl : public std::enable_shared_from_this<SDLConsole_impl> {
@@ -3216,7 +3216,7 @@ class SDLConsole_impl : public std::enable_shared_from_this<SDLConsole_impl> {
 #endif
 
     OutputPane& outpane() {
-        return *main_window.outpane.get();
+        return *main_window.outpane;
     }
 
     bool sdl_event_hook(SDL_Event& e)
@@ -3287,7 +3287,7 @@ class SDLConsole_impl : public std::enable_shared_from_this<SDLConsole_impl> {
     }
 };
 
-SDLConsole::SDLConsole() : state()
+SDLConsole::SDLConsole()
 {
     pshare = std::make_unique<SDLConsole_pshare>();
     state.set_state(State::inactive);
@@ -3305,7 +3305,7 @@ bool SDLConsole::init()
     if (state.is_failed()) return false;
     if (!state.is_inactive()) return true;
     bool success = true;
-    //std::cerr << "SDLConsole: init() from thread: " << std::this_thread::get_id() << std::endl;
+    std::cerr << "SDLConsole: init() from thread: " << std::this_thread::get_id() << std::endl;
     pshare->render_thread_id = std::this_thread::get_id();
     try {
         bind_sdl_symbols();

library/include/SDLConsoleDriver.h

@@ -65,8 +65,7 @@ namespace  DFHack
         void gotoxy(int x, int y) override;
         /// Enable or disable the caret/cursor
         void cursor(bool enable = true) override;
-        /// Waits given number of milliseconds before continuing.
-        void msleep(unsigned int msec) override;
+
         /// get the current number of columns
         int  get_columns(void) override;
         /// get the current number of rows
@@ -80,6 +79,8 @@ namespace  DFHack
         bool sdl_event_hook(SDL_Event& event);
         bool init_sdl();
         void cleanup() override;
+
+        static constexpr ConsoleType type_tag = ConsoleType::SDL;
     private:
         Private * d;
         std::recursive_mutex * wlock;