2 files changed, 8 insertions, 3 deletions
diff --git a/desktop-widgets/divecomputermanagementdialog.cpp b/desktop-widgets/divecomputermanagementdialog.cpp
index f060e3715..bfeddf24f 100644
--- a/desktop-widgets/divecomputermanagementdialog.cpp
+++ b/desktop-widgets/divecomputermanagementdialog.cpp
@@ -20,7 +20,9 @@ DiveComputerManagementDialog::DiveComputerManagementDialog(QWidget *parent, Qt::
 void DiveComputerManagementDialog::init()
 {
 	model.reset(new DiveComputerModel);
-	ui.tableView->setModel(model.data());
+	proxyModel.setSourceModel(model.get());
+	ui.tableView->setModel(&proxyModel);
+	ui.tableView->setSortingEnabled(true);
 	ui.tableView->resizeColumnsToContents();
 	ui.tableView->setColumnWidth(DiveComputerModel::REMOVE, 22);
 	layout()->activate();
diff --git a/desktop-widgets/divecomputermanagementdialog.h b/desktop-widgets/divecomputermanagementdialog.h
index 806ec8073..d80f8f9d3 100644
--- a/desktop-widgets/divecomputermanagementdialog.h
+++ b/desktop-widgets/divecomputermanagementdialog.h
@@ -1,9 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0
 #ifndef DIVECOMPUTERMANAGEMENTDIALOG_H
 #define DIVECOMPUTERMANAGEMENTDIALOG_H
-#include <QDialog>
+
 #include "ui_divecomputermanagementdialog.h"
 #include "qt-models/divecomputermodel.h"
+#include <QDialog>
+#include <memory>
 
 class QModelIndex;
 
@@ -23,7 +25,8 @@ slots:
 private:
 	explicit DiveComputerManagementDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
 	Ui::DiveComputerManagementDialog ui;
-	QScopedPointer<DiveComputerModel> model;
+	std::unique_ptr<DiveComputerModel> model;
+	DiveComputerSortedModel proxyModel;
 };
 
 #endif // DIVECOMPUTERMANAGEMENTDIALOG_H