diff ui/administratorwindow.cpp @ 457:c17c1da7108d

merged.
author Raimund Renkert <rrenkert@intevation.de>
date Wed, 23 Apr 2014 14:00:38 +0200
parents 6dec8101793c
children 091ad56c2715
line wrap: on
line diff
--- a/ui/administratorwindow.cpp	Wed Apr 23 14:00:10 2014 +0200
+++ b/ui/administratorwindow.cpp	Wed Apr 23 14:00:38 2014 +0200
@@ -33,7 +33,7 @@
     setWindowTitle(tr("TrustBridge Administration"));
     QString path = QStandardPaths::locate(
         QStandardPaths::DataLocation, QString("certlist_last.txt"));
-    certList.readList(path.toLocal8Bit());
+    mCertList.readList(path.toLocal8Bit());
     createActions();
     createMenuBar();
     createContent();
@@ -143,8 +143,8 @@
     QString certFile = QFileDialog::getOpenFileName(
         this, tr("Select certificate list file"), path, "*.txt");
     qDebug() << "selected: " + certFile;
-    certList.readList(certFile.toLocal8Bit().constData());
-    if (!certList.isValid()) {
+    mCertList.readList(certFile.toLocal8Bit().constData());
+    if (!mCertList.isValid()) {
         qDebug() << "Not a valid list.";
     }
     else {
@@ -181,7 +181,7 @@
 }
 
 void AdministratorWindow::loadCertificateTable() {
-    foreach(const Certificate &cert, certList.getCertificates()) {
+    foreach(const Certificate &cert, mCertList.getCertificates()) {
         certificateModel->addCertificate(cert, true);
     }
     certificateView->resizeColumnsToContents();

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