Merge pull request #807 from isanae/logging-rework

Logging rework

1 files changed, 6 insertions, 4 deletions

diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index 2d9ea4a5..77ffad96 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -22,6 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "profile.h"

 #include "messagedialog.h"

 #include "qtgroupingproxy.h"

+#include <log.h>

 #include <QMenu>

 #include <QCheckBox>

 #include <QWidgetAction>

@@ -30,6 +31,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDebug>

 #include <QTreeView>

 

+using namespace MOBase;

 

 ModListSortProxy::ModListSortProxy(Profile* profile, QObject *parent)

   : QSortFilterProxyModel(parent)

@@ -194,7 +196,7 @@ bool ModListSortProxy::lessThan(const QModelIndex &left,
             QString rightCatName = categories.getCategoryName(categories.getCategoryIndex(rightMod->getPrimaryCategory()));

             lt = leftCatName < rightCatName;

           } catch (const std::exception &e) {

-            qCritical("failed to compare categories: %s", e.what());

+            log::error("failed to compare categories: {}", e.what());

           }

         }

       }

@@ -240,7 +242,7 @@ bool ModListSortProxy::lessThan(const QModelIndex &left,
       // nop, already compared by priority

     } break;

     default: {

-      qWarning() << "Sorting is not defined for column " << left.column();

+      log::warn("Sorting is not defined for column {}", left.column());

     } break;

   }

   return lt;

@@ -474,13 +476,13 @@ bool ModListSortProxy::filterAcceptsRow(int row, const QModelIndex &parent) cons
   }

 

   if (row >= static_cast<int>(m_Profile->numMods())) {

-    qWarning("invalid row index: %d", row);

+    log::warn("invalid row index: {}", row);

     return false;

   }

 

   QModelIndex idx = sourceModel()->index(row, 0, parent);

   if (!idx.isValid()) {

-    qDebug("invalid mod index");

+    log::debug("invalid mod index");

     return false;

   }

   if (sourceModel()->hasChildren(idx)) {