Refactored some function to use libfmt

mauer · Nov 30, 2023 · 5ef83dd · 5ef83dd
1 parent a53fa1c
commit 5ef83dd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/common/midi_message.cpp b/src/common/midi_message.cpp
@@ -17,6 +17,9 @@
 
 #include "midi_message.h"
 
+// fmt
+#include "fmt/format.h"
+
 // XMidiCtrl
 #include "conversions.h"
 
@@ -130,7 +133,7 @@ bool midi_message::check()
             return false;
 
         case midi_msg_type::none:
-            m_log->error("Could not determine MIDI type from Status '" + std::to_string(m_status) + "'");
+            m_log->error(fmt::format("Could not determine MIDI type from Status '{}'", m_status));
             return false;
 
         default:

diff --git a/src/common/text_logger.cpp b/src/common/text_logger.cpp
@@ -55,7 +55,7 @@ void text_logger::enable_file_logging(const std::filesystem::path& in_path)
 
         m_file_stream.open(filename, std::ios_base::out | std::ios_base::trunc);
         if (!m_file_stream.is_open())
-            error("Failed to open log file '" + filename + "'");
+            error(fmt::format("Failed to open log file '{}'", filename));
     } else {
         error("Cannot open log file as the give file path is empty");
     }
@@ -209,9 +209,7 @@ void text_logger::debug(std::string_view in_text)
  */
 void text_logger::debug_line(std::uint_least32_t in_line, std::string_view in_text)
 {
-    std::string debug_text = " --> Line " + std::to_string(in_line) + " :: " + std::string(in_text);
-
-    debug(debug_text);
+    debug(fmt::format(" --> Line {} :: {}", in_line, in_text));
 }
 
 
@@ -220,7 +218,7 @@ void text_logger::debug_line(std::uint_least32_t in_line, std::string_view in_te
  */
 void text_logger::debug_param(std::uint_least32_t in_line, std::string_view in_param, std::string_view in_value)
 {
-    debug_line(in_line, "Parameter '" + std::string(in_param) + "' = '" + std::string(in_value) + "'");
+    debug_line(in_line, fmt::format("Parameter '{}' = '{}'", in_param, in_value));
 }
 
 
@@ -253,10 +251,7 @@ void text_logger::warn(std::string_view in_text)
  */
 void text_logger::warn_line(std::uint_least32_t in_line, std::string_view in_text)
 {
-    //std::string warn_text = " --> Line " + std::to_string(in_line) + " :: " + std::string(in_text);
-    std::string warn_text = fmt::format(" --> Line {} :: {}", in_line, in_text);
-
-    warn(warn_text);
+    warn(fmt::format(" --> Line {} :: {}", in_line, in_text));
 }
 
 
@@ -277,7 +272,7 @@ void text_logger::error(std::string_view in_text)
  */
 void text_logger::error_line(std::uint_least32_t in_line, std::string_view in_text)
 {
-    std::string debug_text = " --> Line " + std::to_string(in_line) + " :: " + std::string(in_text);
+    std::string debug_text = fmt::format(" --> Line {} :: {}", in_line, in_text);
 
     create_message(log_level::error, debug_text);
 
@@ -390,4 +385,4 @@ void text_logger::add_message(log_level in_level, std::string_view in_text)
     }
 }
 
-} // Namespace xmidictrl
+} // Namespace xmidictrl
diff --git a/src/env/xplane/cmd_xplane.cpp b/src/env/xplane/cmd_xplane.cpp
@@ -17,6 +17,9 @@
 
 #include "cmd_xplane.h"
 
+// fmt
+#include "fmt/format.h"
+
 namespace xmidictrl {
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -81,7 +84,7 @@ XPLMCommandRef cmd_xplane::find_command_ref(text_logger &in_log, std::string_vie
     }
 
     if (cmd_ref == nullptr)
-        in_log.error("Command '" + std::string(in_cmd) + "' not found");
+        in_log.error(fmt::format("Command '{}' not found", in_cmd));
 
     return cmd_ref;
 }