Merge pull request #807 from isanae/logging-rework

Logging rework

1 files changed, 13 insertions, 13 deletions

diff --git a/src/modlist.cpp b/src/modlist.cpp
index 1710a98d..c591c49b 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -271,11 +271,11 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
               int categoryIdx = categoryFactory.getCategoryIndex(category);
               return categoryFactory.getCategoryName(categoryIdx);
             } catch (const std::exception &e) {
-              qCritical("failed to retrieve category name: %s", e.what());
+              log::error("failed to retrieve category name: {}", e.what());
               return QString();
             }
           } else {
-            qWarning("category %d doesn't exist (may have been removed)", category);
+            log::warn("category {} doesn't exist (may have been removed)", category);
             modInfo->setCategory(category, false);
             return QString();
           }
@@ -449,7 +449,7 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
       try {
         return modInfo->getDescription();
       } catch (const std::exception &e) {
-        qCritical("invalid mod description: %s", e.what());
+        log::error("invalid mod description: {}", e.what());
         return QString();
       }
     } else if (column == COL_VERSION) {
@@ -488,7 +488,7 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
         try {
           categoryString << "<span style=\"white-space: nowrap;\"><i>" << ToWString(categoryFactory.getCategoryName(categoryFactory.getCategoryIndex(*catIter))) << "</font></span>";
         } catch (const std::exception &e) {
-          qCritical("failed to generate tooltip: %s", e.what());
+          log::error("failed to generate tooltip: {}", e.what());
           return QString();
         }
       }
@@ -618,8 +618,9 @@ bool ModList::setData(const QModelIndex &index, const QVariant &value, int role)
         result = true;
       } break;
       default: {
-        qWarning("edit on column \"%s\" not supported",
-                 getColumnName(index.column()).toUtf8().constData());
+        log::warn(
+          "edit on column \"{}\" not supported",
+          getColumnName(index.column()).toUtf8().constData());
         result = false;
       } break;
     }
@@ -635,9 +636,9 @@ bool ModList::setData(const QModelIndex &index, const QVariant &value, int role)
     try {
       m_ModStateChanged(info->name(), newState);
     } catch (const std::exception &e) {
-      qCritical("failed to invoke state changed notification: %s", e.what());
+      log::error("failed to invoke state changed notification: {}", e.what());
     } catch (...) {
-      qCritical("failed to invoke state changed notification: unknown exception");
+      log::error("failed to invoke state changed notification: unknown exception");
     }
   }
 
@@ -833,7 +834,7 @@ void ModList::modInfoChanged(ModInfo::Ptr info)
     emit dataChanged(index(row, 0), index(row, columnCount()));
     emit postDataChanged();
   } else {
-    qCritical("modInfoChanged not called after modInfoAboutToChange");
+    log::error("modInfoChanged not called after modInfoAboutToChange");
   }
   m_ChangeInfo.name = QString();
 }
@@ -1012,9 +1013,8 @@ bool ModList::dropURLs(const QMimeData *mimeData, int row, const QModelIndex &pa
   QString overwriteName = ModInfo::getByIndex(overwriteIndex)->name();
 
   for (auto url : mimeData->urls()) {
-    //qDebug("URL drop requested: %s -> %s", qUtf8Printable(url.url()), qUtf8Printable(modDir.canonicalPath()));
     if (!url.isLocalFile()) {
-      qDebug("URL drop ignored: \"%s\" is not a local file", qUtf8Printable(url.url()));
+      log::debug("URL drop ignored: \"{}\" is not a local file", url.url());
       continue;
     }
 
@@ -1034,7 +1034,7 @@ bool ModList::dropURLs(const QMimeData *mimeData, int row, const QModelIndex &pa
       originName = overwriteName;
       relativePath = overwriteDir.relativeFilePath(sourceFile);
     } else {
-      qDebug("URL drop ignored: \"%s\" is not a known file to MO", qUtf8Printable(sourceFile));
+      log::debug("URL drop ignored: \"{}\" is not a known file to MO", sourceFile);
       continue;
     }
 
@@ -1046,7 +1046,7 @@ bool ModList::dropURLs(const QMimeData *mimeData, int row, const QModelIndex &pa
 
   if (sourceList.count()) {
     if (!shellMove(sourceList, targetList)) {
-      qDebug("Failed to move file (error %d)", ::GetLastError());
+      log::debug("Failed to move file (error {})", ::GetLastError());
       return false;
     }
   }