misc: avoid using namespace spdlog;

Author: Toni500github

include/util.hpp

@@ -202,6 +202,18 @@ template <typename... Args>
     std::exit(1);
 }
 
+template <typename... Args>
+inline void error(fmt::format_string<Args...> fmt, Args&&... args) noexcept
+{
+#ifdef _WIN32
+    MessageBox(nullptr,
+               fmt::format(fmt::runtime(fmt), std::forward<Args>(args)...).c_str(),
+               "Error",
+               MB_ICONERROR | MB_OK);
+#endif
+    spdlog::error(fmt, args...);
+}
+
 template <typename... Args>
 inline void warn(fmt::format_string<Args...> fmt, Args&&... args) noexcept
 {

src/main_tool_metal.mm

@@ -36,8 +36,6 @@ void extern_glfwSwapInterval(int v)
 
 GLFWwindow* window = nullptr;
 
-using namespace spdlog;
-
 void minimize_window()
 {
     glfwIconifyWindow(window);
@@ -191,7 +189,7 @@ int run_main_tool(const std::string& imgui_ini_path)
         else
         {
             if (!font.empty())
-                ::warn("Font '{}' is not found", font);
+                warn("Font '{}' is not found", font);
             continue;
         }
 

src/main_tool_opengl3.cpp

@@ -20,8 +20,6 @@
 #    include <X11/Xlib.h>
 #  endif
 
-using namespace spdlog;
-
 GLFWwindow* window = nullptr;
 
 void glfw_error_callback(int i_error, const char* description);
@@ -231,7 +229,7 @@ int run_main_tool(const std::string& imgui_ini_path)
         else
         {
             if (!font.empty())
-                ::warn("Font '{}' is not found", font);
+                warn("Font '{}' is not found", font);
             continue;
         }
 

src/screenshot_tool.cpp

@@ -20,7 +20,6 @@
 
 #include "clipboard.hpp"
 #include "config.hpp"
-#include "fmt/format.h"
 #include "imgui/imgui.h"
 #include "imgui/imgui_impl_opengl3_loader.h"
 #include "imgui/imgui_internal.h"
@@ -30,18 +29,11 @@
 #include "tool_icons.h"
 #include "util.hpp"
 
-#if (!__has_include("version.h"))
-#  error "version.h not found, please generate it with ./scripts/generateVersion.sh"
-#else
-#  include "version.h"
-#endif
-
 #ifndef GL_NO_ERROR
 #  define GL_NO_ERROR 0
 #endif
 
 using namespace std::chrono_literals;
-using namespace spdlog;
 
 static constexpr ImVec4 k_error_color(1.0f, 0.0f, 0.0f, 1.0f);
 static constexpr ImVec2 origin(0, 0);

src/text_extraction.cpp

@@ -14,8 +14,6 @@
 #include "screen_capture.hpp"
 #include "util.hpp"
 
-using namespace spdlog;
-
 // --------------------
 // OCR
 // --------------------
@@ -45,7 +43,7 @@ static tesseract::PageSegMode choose_psm(int w, int h)
     const size_t area   = static_cast<size_t>(w) * h;
     const float  aspect = (h > 0) ? static_cast<float>(w) / static_cast<float>(h) : 1.0f;
 
-    debug("Choosing PSM, area: {}*{}={}, aspect: {}", w, h, area, aspect);
+    spdlog::debug("Choosing PSM, area: {}*{}={}, aspect: {}", w, h, area, aspect);
 
     // Single character: tiny and roughly square
     if (area < 2'500 && aspect > 0.3f && aspect < 3.0f)