diff --git a/src/commands/importcertificatefromdatacommand.h b/src/commands/importcertificatefromdatacommand.h index 8202e8712..06845b84e 100644 --- a/src/commands/importcertificatefromdatacommand.h +++ b/src/commands/importcertificatefromdatacommand.h @@ -1,64 +1,63 @@ /* -*- mode: c++; c-basic-offset:4 -*- importcertificatefromdatacommand.h This file is part of Kleopatra, the KDE keymanager Copyright (c) 2018 Intevation GmbH Kleopatra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Kleopatra is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #ifndef __KLEOPATRA_IMPORTCERTIFICATEFROMDATACOMMAND_H__ #define __KLEOPATRA_IMPORTCERTIFICATEFROMDATACOMMAND_H__ #include "importcertificatescommand.h" #include -class QStringList; namespace Kleo { class ImportCertificateFromDataCommand : public ImportCertificatesCommand { Q_OBJECT public: explicit ImportCertificateFromDataCommand(const QByteArray &data, GpgME::Protocol proto); ~ImportCertificateFromDataCommand() override; private: void doStart() override; private: class Private; inline Private *d_func(); inline const Private *d_func() const; }; } #endif // __KLEOPATRA_IMPORTCERTIFICATEFROMDATACOMMAND_H__ diff --git a/src/dialogs/certifycertificatedialog.h b/src/dialogs/certifycertificatedialog.h index e72dae412..b58127c6c 100644 --- a/src/dialogs/certifycertificatedialog.h +++ b/src/dialogs/certifycertificatedialog.h @@ -1,88 +1,83 @@ /* -*- mode: c++; c-basic-offset:4 -*- dialogs/signcertificatedialog.h This file is part of Kleopatra, the KDE keymanager Copyright (c) 2008 Klarälvdalens Datakonsult AB Kleopatra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Kleopatra is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #ifndef __KLEOPATRA_DIALOGS_CERTIFYCERTIFICATEDIALOG_H__ #define __KLEOPATRA_DIALOGS_CERTIFYCERTIFICATEDIALOG_H__ #include #include #include #include -namespace GpgME -{ -class Error; -} - namespace Kleo { class CertifyWidget; class CertifyCertificateDialog : public QDialog { Q_OBJECT public: explicit CertifyCertificateDialog(QWidget *parent = nullptr, Qt::WindowFlags f = {}); ~CertifyCertificateDialog(); bool exportableCertificationSelected() const; bool trustCertificationSelected() const; bool nonRevocableCertificationSelected() const; void setSelectedUserIDs(const std::vector &uids); std::vector selectedUserIDs() const; void setCertificatesWithSecretKeys(const std::vector &keys); GpgME::Key selectedSecretKey() const; bool sendToServer() const; unsigned int selectedCheckLevel() const; void setCertificateToCertify(const GpgME::Key &key); QString remarks() const; private: CertifyWidget *mCertWidget; }; } #endif /* __KLEOPATRA_DIALOGS_CERTIFYCERTIFICATEDIALOG_H__ */ diff --git a/src/smartcard/card.h b/src/smartcard/card.h index a82ec3697..6475e84e2 100644 --- a/src/smartcard/card.h +++ b/src/smartcard/card.h @@ -1,130 +1,129 @@ #ifndef SMARTCARD_CARD_H #define SMARTCARD_CARD_H /* smartcard/card.h This file is part of Kleopatra, the KDE keymanager Copyright (c) 2017 by Bundesamt für Sicherheit in der Informationstechnik Software engineering by Intevation GmbH Kleopatra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Kleopatra is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of the Qt library by Trolltech AS, Norway (or with modified versions of Qt that use the same license as Qt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than Qt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ #include #include #include namespace Kleo { namespace SmartCard { -class ReaderStatus; /** Class to work with Smartcards or other Hardware tokens. */ class Card { public: enum AppType { UnknownApplication, OpenPGPApplication, NksApplication, P15Application, DinSigApplication, GeldkarteApplication, NumAppTypes }; enum PinState { UnknownPinState, NullPin, PinBlocked, NoPin, PinOk, NumPinStates }; enum Status { NoCard, CardPresent, CardActive, CardUsable, _NumScdStates, CardError = _NumScdStates, NumStates }; Card(); virtual ~Card() {} virtual bool operator == (const Card& other) const; bool operator != (const Card& other) const; void setStatus(Status s); Status status() const; virtual void setSerialNumber(const std::string &sn); std::string serialNumber() const; AppType appType() const; void setAppType(AppType type); void setAppVersion(int version); int appVersion() const; std::vector pinStates() const; void setPinStates(const std::vector &pinStates); void setSlot(int slot); int slot() const; bool hasNullPin() const; void setHasNullPin(bool value); bool canLearnKeys() const; void setCanLearnKeys(bool value); QString errorMsg() const; void setErrorMsg(const QString &msg); private: bool mCanLearn; bool mHasNullPin; Status mStatus; std::string mSerialNumber; AppType mAppType; int mAppVersion; std::vector mPinStates; int mSlot; QString mErrMsg; }; } // namespace Smartcard } // namespace Kleopatra #endif // SMARTCARD_CARD_H