Appease lint

dolphin-emu · Oct 24, 2024 · 8cd9dbe · 8cd9dbe
1 parent 29f0d5d
commit 8cd9dbe
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
@@ -409,7 +409,7 @@ bool PPCSymbolDB::LoadMap(const Core::CPUThreadGuard& guard, const std::string&
     size_t num_parts = parts.size();
 
     std::string object_filename_string = "";
-    std::string name_string = name; // Default to the full line
+    std::string name_string = name;  // Default to the full line
 
     if (num_parts > 0)
     {

diff --git a/Source/Core/DolphinQt/Debugger/CodeWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp
@@ -409,12 +409,13 @@ void CodeWidget::UpdateFunctionCalls(const Common::Symbol* symbol)
 
     if (call_symbol)
     {
-      const QString name = QString::fromStdString(fmt::format(
-        "> {} ({}{:08x})", call_symbol->name,
-        !call_symbol->object_name.empty() ? fmt::format("{}, ", call_symbol->object_name) : "",
-        addr));
-      if (!name.contains(filter, Qt::CaseInsensitive))
-        continue;
+      QString name;
+
+      if (!call_symbol->object_name.empty())
+        name = QString::fromStdString(
+            fmt::format("< {} ({}, {:08x})", call_symbol->name, call_symbol->object_name, addr));
+      else
+        name = QString::fromStdString(fmt::format("< {} ({:08x})", call_symbol->name, addr));
 
       auto* item = new QListWidgetItem(name);
       item->setData(Qt::UserRole, addr);
@@ -435,10 +436,13 @@ void CodeWidget::UpdateFunctionCallers(const Common::Symbol* symbol)
 
     if (caller_symbol)
     {
-      const QString name = QString::fromStdString(fmt::format(
-        "< {} ({}{:08x})", caller_symbol->name,
-        !caller_symbol->object_name.empty() ? fmt::format("{}, ",  caller_symbol->object_name) :
-        "", addr));
+      QString name;
+
+      if (!caller_symbol->object_name.empty())
+        name = QString::fromStdString(fmt::format("< {} ({}, {:08x})", caller_symbol->name,
+                                                  caller_symbol->object_name, addr));
+      else
+        name = QString::fromStdString(fmt::format("< {} ({:08x})", caller_symbol->name, addr));
 
       if (!name.contains(filter, Qt::CaseInsensitive))
         continue;