From a6a5cf61e2f45eb54721c7ee2dbcc05afe8939f9 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 9 Dec 2018 19:10:55 +0100 Subject: Cleanup: make DiveImportedModel::checkStates a std::vector To not have to bother with memory-management. Moreover, the old code was in principle wrong, since it assumed that sizeof(bool) == 1. Of course, this is true for all supported platforms, but let's not depend on such implementation-defined behavior anyway. Signed-off-by: Berthold Stoeger --- qt-models/diveimportedmodel.cpp | 10 ++++------ qt-models/diveimportedmodel.h | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'qt-models') diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp index 3c5a4a76b..be9b4275d 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -4,7 +4,6 @@ DiveImportedModel::DiveImportedModel(QObject *o) : QAbstractTableModel(o), firstIndex(0), lastIndex(-1), - checkStates(nullptr), diveTable(nullptr) { // Defaults to downloadTable, can be changed later. @@ -97,7 +96,7 @@ void DiveImportedModel::changeSelected(QModelIndex clickedIndex) void DiveImportedModel::selectAll() { - memset(checkStates, true, lastIndex - firstIndex + 1); + std::fill(checkStates.begin(), checkStates.end(), true); dataChanged(index(0, 0), index(lastIndex - firstIndex, 0), QVector() << Qt::CheckStateRole << Selected); } @@ -109,7 +108,7 @@ void DiveImportedModel::selectRow(int row) void DiveImportedModel::selectNone() { - memset(checkStates, false, lastIndex - firstIndex + 1); + std::fill(checkStates.begin(), checkStates.end(), false); dataChanged(index(0, 0), index(lastIndex - firstIndex,0 ), QVector() << Qt::CheckStateRole << Selected); } @@ -141,9 +140,8 @@ void DiveImportedModel::repopulate() firstIndex = 0; lastIndex = diveTable->nr - 1; - delete[] checkStates; - checkStates = new bool[diveTable->nr]; - memset(checkStates, true, diveTable->nr); + checkStates.resize(diveTable->nr); + std::fill(checkStates.begin(), checkStates.end(), true); endResetModel(); } diff --git a/qt-models/diveimportedmodel.h b/qt-models/diveimportedmodel.h index eeea0b82c..fc4d9147b 100644 --- a/qt-models/diveimportedmodel.h +++ b/qt-models/diveimportedmodel.h @@ -2,6 +2,7 @@ #define DIVEIMPORTEDMODEL_H #include +#include class DiveImportedModel : public QAbstractTableModel { @@ -31,7 +32,7 @@ slots: private: int firstIndex; int lastIndex; - bool *checkStates; + std::vector checkStates; // char instead of bool to avoid silly pessimization of std::vector. struct dive_table *diveTable; }; -- cgit v1.2.3-70-g09d2