fix sorting order of location in caller callee view

add a new sfpm for SourceMapModel that implements lessThen to correctly
sort the locations
fixes: #466

Author: lievenhey

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()) {

src/models/callercalleeproxy.cpp

@@ -8,6 +8,7 @@
 
 #include "callercalleeproxy.h"
 
+#include "callercalleemodel.h"
 #include "data.h"
 
 namespace {
@@ -32,3 +33,21 @@ bool match(const QSortFilterProxyModel* proxy, const Data::FileLine& fileLine)
     return matchImpl(needle, fileLine.file);
 }
 }
+
+SourceMapProxy::SourceMapProxy(QObject* parent)
+    : CallerCalleeProxy<SourceMapModel>(parent)
+{
+}
+
+SourceMapProxy::~SourceMapProxy() { }
+
+bool SourceMapProxy::lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const
+{
+
+    if (source_left.column() == source_right.column() && source_left.column() == SourceMapModel::Location) {
+        const auto left = source_left.data(SourceMapModel::SortRole).value<Data::FileLine>();
+        const auto right = source_right.data(SourceMapModel::SortRole).value<Data::FileLine>();
+        return left < right;
+    }
+    return QSortFilterProxyModel::lessThan(source_left, source_right);
+}

src/models/callercalleeproxy.h

@@ -20,6 +20,8 @@ bool match(const QSortFilterProxyModel* proxy, const Data::Symbol& symbol);
 bool match(const QSortFilterProxyModel* proxy, const Data::FileLine& fileLine);
 }
 
+class SourceMapModel;
+
 template<typename Model>
 class CallerCalleeProxy : public QSortFilterProxyModel
 {
@@ -46,3 +48,16 @@ class CallerCalleeProxy : public QSortFilterProxyModel
 
 private:
 };
+
+class SourceMapProxy : public CallerCalleeProxy<SourceMapModel>
+{
+    Q_OBJECT
+public:
+    SourceMapProxy(QObject* parent = nullptr);
+    ~SourceMapProxy();
+
+protected:
+    bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const override;
+
+private:
+};

src/resultscallercalleepage.cpp

@@ -36,11 +36,21 @@
 #endif
 
 namespace {
+QSortFilterProxyModel* createProxy(SourceMapModel* model)
+{
+    return new SourceMapProxy(model);
+}
+template<typename Model>
+QSortFilterProxyModel* createProxy(Model* model)
+{
+    return new CallerCalleeProxy<Model>(model);
+}
+
 template<typename Model>
 Model* setupModelAndProxyForView(QTreeView* view, CostContextMenu* contextMenu)
 {
     auto model = new Model(view);
-    auto proxy = new CallerCalleeProxy<Model>(model);
+    auto proxy = createProxy(model);
     proxy->setSourceModel(model);
     proxy->setSortRole(Model::SortRole);
     view->setModel(proxy);