fix sorting order of location in caller callee view

fixes: #466
KDAB · Mar 1, 2023 · 9520607 · 9520607
1 parent 09a11b1
commit 9520607
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/models/callercalleemodel.h b/src/models/callercalleemodel.h
@@ -265,7 +265,7 @@ class LocationCostModelImpl : public HashModel<Data::SourceLocationCostMap, Mode
     {
         if (role == SortRole) {
             if (column == Location) {
-                return fileLine.toString();
+                return QVariant::fromValue(fileLine);
             }
             column -= NUM_BASE_COLUMNS;
             if (column < m_totalCosts.numTypes()) {

diff --git a/src/models/callercalleeproxy.h b/src/models/callercalleeproxy.h
@@ -8,13 +8,9 @@
 
 #pragma once
 
+#include "data.h"
 #include <QSortFilterProxyModel>
 
-namespace Data {
-struct Symbol;
-struct FileLine;
-}
-
 namespace CallerCalleeProxyDetail {
 bool match(const QSortFilterProxyModel* proxy, const Data::Symbol& symbol);
 bool match(const QSortFilterProxyModel* proxy, const Data::FileLine& fileLine);
@@ -44,5 +40,16 @@ class CallerCalleeProxy : public QSortFilterProxyModel
         return CallerCalleeProxyDetail::match(this, key);
     }
 
+    bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override
+    {
+        QVariant left = source_left.data(sortRole());
+        QVariant right = source_right.data(sortRole());
+        if (left.canConvert<Data::FileLine>()) {
+            return left.value<Data::FileLine>() < right.value<Data::FileLine>();
+        } else {
+            return QSortFilterProxyModel::lessThan(source_left, source_right);
+        }
+    }
+
 private:
 };