# # # patch "src/model/Certs.cpp" # from [7d7c566ba3e4796e8b65d558fbb9bdb068bda5a9] # to [8b011be58c9224fb726884374bd3d4941a8c7e36] # # patch "src/model/Certs.h" # from [3aae2258184a7ea076935b471ebee44baf7bf1f5] # to [187ae7a01ea9ccfe8467875bfe906f4a9f174790] # ============================================================ --- src/model/Certs.cpp 7d7c566ba3e4796e8b65d558fbb9bdb068bda5a9 +++ src/model/Certs.cpp 8b011be58c9224fb726884374bd3d4941a8c7e36 @@ -21,21 +21,16 @@ Certs::Certs(QObject * parent, const Dat Certs::Certs(QObject * parent, const DatabaseFile & db) : QAbstractItemModel(parent), AutomateCommand(0), databaseFile(db) -{ - certs = new CertList(); -} +{} Certs::~Certs() { - certs->clear(); - delete certs; + certs.clear(); } void Certs::readCerts(const QString & rev) { - // clear current attributes list - certs->clear(); - // reset the view + certs.clear(); reset(); if (rev.size() == 0) return; @@ -127,14 +122,14 @@ void Certs::processTaskResult(const Mono // check if we really processed an item entry if (!isItem) continue; - certs->append(cert); + certs.append(cert); } // reset any connected view(s) reset(); // signal that we've finished (whoever listens to that) - emit certsRead(); + emit certsRead(certs); } int Certs::columnCount(const QModelIndex & parent) const @@ -162,9 +157,9 @@ QVariant Certs::data(const QModelIndex & } int row = index.row(); - if (row >= certs->size()) return QVariant(); + if (row >= certs.size()) return QVariant(); - Cert cert = certs->at(row); + Cert cert = certs.at(row); switch (index.column()) { @@ -215,7 +210,7 @@ int Certs::rowCount(const QModelIndex & int Certs::rowCount(const QModelIndex & parent) const { Q_UNUSED(parent); - return certs->size(); + return certs.size(); } QModelIndex Certs::index(int row, int column, const QModelIndex & parent) const @@ -235,7 +230,7 @@ void Certs::clearData() void Certs::clearData() { - certs->clear(); + certs.clear(); reset(); } ============================================================ --- src/model/Certs.h 3aae2258184a7ea076935b471ebee44baf7bf1f5 +++ src/model/Certs.h 187ae7a01ea9ccfe8467875bfe906f4a9f174790 @@ -45,10 +45,10 @@ signals: void readCerts(const QString &); signals: - void certsRead(); + void certsRead(const CertList &); protected: - CertList * certs; + CertList certs; private: void processTaskResult(const MonotoneTask &);