diff --git a/lib/pki_base.cpp b/lib/pki_base.cpp index d50e3189..8c91d531 100644 --- a/lib/pki_base.cpp +++ b/lib/pki_base.cpp @@ -118,12 +118,6 @@ const char *pki_base::getClassName() const return typeid(*this).name(); } -void pki_base::fopen_error(const QString &fname) const -{ - my_error(tr("Error opening file: '%1': %2"). - arg(fname).arg(strerror(errno))); -} - void pki_base::my_error(const QString &error) const { if (!error.isEmpty()) { diff --git a/lib/pki_base.h b/lib/pki_base.h index 7f065fba..0f1b05ae 100644 --- a/lib/pki_base.h +++ b/lib/pki_base.h @@ -62,7 +62,6 @@ class pki_base : public QObject /* model data */ pki_base *parent; void my_error(const QString &error) const; - void fopen_error(const QString &fname) const; virtual void PEM_file_comment(XFile &file) const; public: diff --git a/lib/pki_multi.cpp b/lib/pki_multi.cpp index e0e8e0c4..908632d2 100644 --- a/lib/pki_multi.cpp +++ b/lib/pki_multi.cpp @@ -17,6 +17,7 @@ #include "load_obj.h" #include "exception.h" #include "func.h" +#include "xfile.h" #include "widgets/MainWindow.h" #include @@ -89,14 +90,10 @@ static pki_base *pkiByPEM(QString text, int *skip) void pki_multi::fload(const QString fname) { - QFile file(fname); + XFile file(fname); QByteArray ba; - file.open(QFile::ReadOnly); - if (file.error()) { - fopen_error(fname); - return; - } + file.open_read(); ba = file.readAll(); fromPEMbyteArray(ba, fname); };