diff options
| author | Saturn&Eric <[email protected]> | 2024-01-30 05:38:51 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-01-30 05:38:51 +0000 |
| commit | 60b8aafec9b59da71ae5c36708f5533870c2f499 (patch) | |
| tree | 2118b1847c356a5b0a53a13785f1b4f932fefa9f /src/core/function/gpg/GpgKeyOpera.cpp | |
| parent | Merge pull request #126 from saturneric/dev/2.1.1/main (diff) | |
| parent | doc: update translations (diff) | |
| download | GpgFrontend-60b8aafec9b59da71ae5c36708f5533870c2f499.tar.gz GpgFrontend-60b8aafec9b59da71ae5c36708f5533870c2f499.zip | |
Merge pull request #127 from saturneric/dev/2.1.1/main
Develop 2.1.2.2
Diffstat (limited to 'src/core/function/gpg/GpgKeyOpera.cpp')
| -rw-r--r-- | src/core/function/gpg/GpgKeyOpera.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/function/gpg/GpgKeyOpera.cpp b/src/core/function/gpg/GpgKeyOpera.cpp index 118f4784..e0ecb3ce 100644 --- a/src/core/function/gpg/GpgKeyOpera.cpp +++ b/src/core/function/gpg/GpgKeyOpera.cpp @@ -30,8 +30,6 @@ #include <gpg-error.h> -#include <memory> - #include "core/GpgModel.h" #include "core/function/gpg/GpgCommandExecutor.h" #include "core/function/gpg/GpgKeyGetter.h" @@ -53,7 +51,7 @@ GpgKeyOpera::GpgKeyOpera(int channel) * Delete keys * @param uidList key ids */ -void GpgKeyOpera::DeleteKeys(GpgFrontend::KeyIdArgsListPtr key_ids) { +void GpgKeyOpera::DeleteKeys(KeyIdArgsListPtr key_ids) { GpgError err; for (const auto& tmp : *key_ids) { auto key = GpgKeyGetter::GetInstance().GetKey(tmp); @@ -130,7 +128,7 @@ void GpgKeyOpera::GenerateRevokeCert(const GpgKey& key, // Code From Gpg4Win while (proc->canReadLine()) { const QString line = QString::fromUtf8(proc->readLine()).trimmed(); - GF_CORE_LOG_DEBUG("line: {}", line.toStdString()); + GF_CORE_LOG_DEBUG("line: {}", line); if (line == QLatin1String("[GNUPG:] GET_BOOL gen_revoke.okay")) { proc->write("y\n"); } else if (line == QLatin1String("[GNUPG:] GET_LINE " @@ -514,7 +512,7 @@ auto GpgKeyOpera::ModifyTOFUPolicy(const GpgKey& key, return CheckGpgError(err); } -void GpgKeyOpera::DeleteKey(const GpgFrontend::KeyId& key_id) { +void GpgKeyOpera::DeleteKey(const KeyId& key_id) { auto keys = std::make_unique<KeyIdArgsList>(); keys->push_back(key_id); DeleteKeys(std::move(keys)); |