diff options
| author | saturneric <[email protected]> | 2025-02-03 18:01:26 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2025-02-03 18:01:26 +0000 |
| commit | d3d94f5b7a3e60b3bbb73e832bab7cf2d44a1600 (patch) | |
| tree | 5cc7838f1325b076b91bb898fd0da3cfcb60b455 /src/core/function/gpg/GpgKeyManager.cpp | |
| parent | doc: update README.md (diff) | |
| parent | fix: set pb range when size of operas > 1 (diff) | |
| download | GpgFrontend-d3d94f5b7a3e60b3bbb73e832bab7cf2d44a1600.tar.gz GpgFrontend-d3d94f5b7a3e60b3bbb73e832bab7cf2d44a1600.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/core/function/gpg/GpgKeyManager.cpp')
| -rw-r--r-- | src/core/function/gpg/GpgKeyManager.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/core/function/gpg/GpgKeyManager.cpp b/src/core/function/gpg/GpgKeyManager.cpp index d0576e59..afa775eb 100644 --- a/src/core/function/gpg/GpgKeyManager.cpp +++ b/src/core/function/gpg/GpgKeyManager.cpp @@ -61,10 +61,10 @@ auto GpgKeyManager::SignKey(const GpgKey& target, KeyArgsList& keys, } auto GpgKeyManager::RevSign(const GpgKey& key, - const SignIdArgsListPtr& signature_id) -> bool { + const SignIdArgsList& signature_id) -> bool { auto& key_getter = GpgKeyGetter::GetInstance(GetChannel()); - for (const auto& sign_id : *signature_id) { + for (const auto& sign_id : signature_id) { auto signing_key = key_getter.GetKey(sign_id.first); assert(signing_key.IsGood()); @@ -271,13 +271,8 @@ auto GpgKeyManager::RevokeSubkey(const GpgKey& key, int subkey_index, } // dealing with reason text -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 4) - auto reason_text_lines = SecureCreateSharedObject<QList<QString>>( + auto reason_text_lines = SecureCreateSharedObject<QStringList>( reason_text.split('\n', Qt::SkipEmptyParts).toVector()); -#else - auto reason_text_lines = SecureCreateSharedObject<QVector<QString>>( - reason_text.split('\n', Qt::SkipEmptyParts).toVector()); -#endif AutomatonNextStateHandler next_state_handler = [](AutomatonState state, QString status, QString args) { |