diff ui/certificatelistwidget.cpp @ 1108:9bb9932bb819

Revert commit 1101 the inactive manual changes were a bad idea
author Andre Heinecke <andre.heinecke@intevation.de>
date Mon, 15 Sep 2014 17:47:12 +0200
parents 6f7b7d88f048
children
line wrap: on
line diff
--- a/ui/certificatelistwidget.cpp	Mon Sep 15 17:46:22 2014 +0200
+++ b/ui/certificatelistwidget.cpp	Mon Sep 15 17:47:12 2014 +0200
@@ -37,43 +37,10 @@
     emit certListChanged(-1);
 }
 
-int CertificateListWidget::activeCertificates()
-{
-    int ret = 0;
-    for (int i = 0; i < mCertificateWidgets.size(); i++) {
-        if (mCertificateWidgets[i]->certificate()->isActive()) {
-            ret++;
-        }
-    }
-    return ret;
-}
-
-void CertificateListWidget::activateCertificate(const Certificate &cert)
-{
-    for (int i = 0; i < mCertificateWidgets.size(); i++) {
-        if (*(mCertificateWidgets[i]->certificate()) == cert) {
-            mCertificateWidgets[i]->certificate()->setActive(true);
-            break;
-        }
-    }
-    emit certListChanged(-1);
-}
-
-void CertificateListWidget::deactivateCertificate(const Certificate &cert)
-{
-    for (int i = 0; i < mCertificateWidgets.size(); i++) {
-        if (*(mCertificateWidgets[i]->certificate()) == cert) {
-            mCertificateWidgets[i]->certificate()->setActive(false);
-            break;
-        }
-    }
-    emit certListChanged(-1);
-}
-
 void CertificateListWidget::removeCertificate(const Certificate &cert)
 {
     for (int i = 0; i < mCertificateWidgets.size(); i++) {
-        if (*(mCertificateWidgets[i]->certificate()) == cert) {
+        if (mCertificateWidgets[i]->certificate() == cert) {
             mLayout.removeWidget(mCertificateWidgets[i]);
             mCertificateWidgets[i]->deleteLater();
             mCertificateWidgets.removeAt(i);
@@ -96,7 +63,7 @@
 {
     QStringList list;
     foreach (CertificateItemWidget * item, mCertificateWidgets) {
-        list <<  item->certificate()->base64Line();
+        list <<  item->certificate().base64Line();
     }
     return list;
 }
@@ -105,7 +72,7 @@
     QStringList list;
     foreach (CertificateItemWidget * item, mCertificateWidgets) {
         if (item->state()) {
-            list << item->certificate()->base64Line();
+            list << item->certificate().base64Line();
         }
     }
     return list;
@@ -115,7 +82,7 @@
     QStringList list;
     foreach (CertificateItemWidget * item, mCertificateWidgets) {
         if (!item->state()) {
-            list << item->certificate()->base64Line();
+            list << item->certificate().base64Line();
         }
     }
     return list;
@@ -125,7 +92,7 @@
 {
     QList<Certificate> list;
     foreach (CertificateItemWidget * item, mCertificateWidgets) {
-        list <<  *(item->certificate());
+        list <<  item->certificate();
     }
     return list;
 }
@@ -133,7 +100,7 @@
 void CertificateListWidget::setCertState(bool state, const Certificate &cert)
 {
     foreach (CertificateItemWidget * item, mCertificateWidgets) {
-        if (*(item->certificate()) == cert &&
+        if (item->certificate() == cert &&
             item->state() != state) {
             item->setState(state);
         }
@@ -161,7 +128,7 @@
 bool CertificateListWidget::contains(const Certificate &cert)
 {
     foreach (CertificateItemWidget * item, mCertificateWidgets) {
-        if (*(item->certificate()) == cert) {
+        if (item->certificate() == cert) {
             return true;
         }
     }

http://wald.intevation.org/projects/trustbridge/