--- a/ui/certificatetablemodel.cpp	Thu Apr 10 09:56:51 2014 +0200
+++ b/ui/certificatetablemodel.cpp	Thu Apr 10 10:05:32 2014 +0200
@@ -3,34 +3,40 @@
 CertificateTabelModel::CertificateTabelModel(QObject *parent)
     : QAbstractTableModel(parent)
 {
-    certificates = new QList<Certificate>();
-    header = new QList<QString>();
-    header->append("");
-    header->append(tr("CN"));
-    header->append(tr("issued  on"));
-    header->append(tr("expires on"));
-    header->append(tr("Fingerprint"));
+    header.append("");
+    header.append(tr("CN"));
+    header.append(tr("issued  on"));
+    header.append(tr("expires on"));
+    header.append(tr("Fingerprint"));
 
 }
 
-void CertificateTabelModel::addCertificate(Certificate *certificate)
+void CertificateTabelModel::addCertificate(const Certificate& certificate)
 {
-    certificates->append(*certificate);
+    beginInsertRows(QModelIndex(), rowCount(), rowCount());
+    certificates.append(certificate);
+    endInsertRows();
 }
 
 QVariant CertificateTabelModel::data(const QModelIndex &index,
         int role) const
 {
-    if (index.row() > certificates->size() || index.row() < 0) {
+    if (index.row() > certificates.size() || index.row() < 0) {
         return QVariant();
     }
 
-    int row = index.row();
-    Certificate cert = certificates->at(row);
-    switch(index.column()) {
-    case 0: return cert.isInstallCert();
-    case 1: return cert.shortDescription();
-    default: ;
+    if (role == Qt::DisplayRole) {
+        Certificate cert = certificates.at(index.row());
+        QVariant ret;
+        switch(index.column()) {
+        case 0: ret = cert.isInstallCert(); break;
+        case 1: ret = cert.subjectCN(); break;
+        case 2: ret = cert.validFrom(); break;
+        case 3: ret = cert.validTo(); break;
+        case 4: ret = "Fingerprint"; break;
+        default: ;
+        }
+        return ret;
     }
 
     return QVariant();
@@ -40,19 +46,19 @@
         Qt::Orientation orientation, int role) const
 {
     if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
-        return header->at(section);
+        return header.at(section);
     }
     return QVariant();
 }
 
 int CertificateTabelModel::rowCount(const QModelIndex&) const
 {
-    return certificates->size();
+    return certificates.size();
 }
 
 int CertificateTabelModel::columnCount(const QModelIndex&) const
 {
-    return header->size();
+    return header.size();
 }