From 9d5da8bea79d1617f46cee9a2aa35b7cfa7dc899 Mon Sep 17 00:00:00 2001 From: chris Date: Wed, 16 Oct 2002 21:56:04 +0000 Subject: [PATCH] *** empty log message *** --- MainWindowTemps.cpp | 5 +---- MainWindowX509Req.cpp | 3 --- lib/db_x509req.cpp | 7 ------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/MainWindowTemps.cpp b/MainWindowTemps.cpp index 15b8b36f..bf123255 100644 --- a/MainWindowTemps.cpp +++ b/MainWindowTemps.cpp @@ -111,10 +111,7 @@ void MainWindow::deleteTemp() void MainWindow::insertTemp(pki_temp *temp) { - if (!temps->insertPKI(temp)) - QMessageBox::warning(this,tr(XCA_TITLE), - tr("The template could not be stored into the database"), "OK"); - + temps->insertPKI(temp); } void MainWindow::certFromTemp() diff --git a/MainWindowX509Req.cpp b/MainWindowX509Req.cpp index 3b55968b..10bc241b 100644 --- a/MainWindowX509Req.cpp +++ b/MainWindowX509Req.cpp @@ -181,13 +181,10 @@ void MainWindow::loadReq() s = QDir::convertSeparators(s); try { pki_x509req *req = new pki_x509req(s.latin1()); - MARK insertReq(req); - MARK pki_key *pkey = req->getKey(); MARK if (pkey) keys->updateViewPKI(pkey); - MARK } catch (errorEx &err) { Error(err); diff --git a/lib/db_x509req.cpp b/lib/db_x509req.cpp index 5db5b647..1d1cab6b 100644 --- a/lib/db_x509req.cpp +++ b/lib/db_x509req.cpp @@ -132,22 +132,15 @@ void db_x509req::preprocess() pki_key *db_x509req::findKey(pki_x509req *req) { pki_key *key, *refkey; - MARK if (!req) return NULL; MARK if ((key = req->getKey()) != NULL ) return key; - MARK refkey = req->getPubKey(); - MARK key = (pki_key *)keylist->findPKI(refkey); - MARK if (key && key->isPubKey()) { key = NULL; } - MARK if (req->setKey(key)) keylist->updateViewPKI(key); - MARK if (refkey) delete(refkey); - MARK return key; }