# HG changeset patch # User Raimund Renkert # Date 1397573137 -7200 # Node ID 26651cc0cc47041a2056954dab081dcebb12940c # Parent a636018102112f0b9fa73a003e73162d4a2c770f Remove all certificates if a new list is loaded from file. diff -r a63601810211 -r 26651cc0cc47 ui/administratorwindow.cpp --- a/ui/administratorwindow.cpp Tue Apr 15 16:44:55 2014 +0200 +++ b/ui/administratorwindow.cpp Tue Apr 15 16:45:37 2014 +0200 @@ -135,6 +135,7 @@ qDebug() << "Not a valid list."; } else { + certificateModel->removeAll(); loadCertificateTable(); } } diff -r a63601810211 -r 26651cc0cc47 ui/certificatetablemodel.cpp --- a/ui/certificatetablemodel.cpp Tue Apr 15 16:44:55 2014 +0200 +++ b/ui/certificatetablemodel.cpp Tue Apr 15 16:45:37 2014 +0200 @@ -31,14 +31,17 @@ return false; } for (int i = row + count - 1; i >= row; i--) { - if (!certificates.at(i).isEditable()) { - certificates.removeAt(i); - } + certificates.removeAt(i); } endRemoveRows(); return true; } +bool CertificateTabelModel::removeAll() +{ + return removeRows(0, certificates.size(), QModelIndex()); +} + QVariant CertificateTabelModel::data(const QModelIndex &index, int role) const { diff -r a63601810211 -r 26651cc0cc47 ui/certificatetablemodel.h --- a/ui/certificatetablemodel.h Tue Apr 15 16:44:55 2014 +0200 +++ b/ui/certificatetablemodel.h Tue Apr 15 16:45:37 2014 +0200 @@ -19,6 +19,7 @@ void addCertificate(const Certificate &certificate, bool editable); bool removeRows(int row, int count, const QModelIndex&); + bool removeAll(); int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const;