Merge branch 'develop'

11 files changed, 24 insertions, 21 deletions

diff --git a/src/core/function/KeyPackageOperator.cpp b/src/core/function/KeyPackageOperator.cpp
index ace277b8..a5f1989c 100644
--- a/src/core/function/KeyPackageOperator.cpp
+++ b/src/core/function/KeyPackageOperator.cpp
@@ -45,7 +45,7 @@ namespace GpgFrontend {
 auto KeyPackageOperator::GeneratePassphrase(const QString& phrase_path,
                                             QString& phrase) -> bool {
   phrase = PassphraseGenerator::GetInstance().Generate(256);
-  FLOG_D("generated passphrase: %lld bytes", phrase.size());
+  FLOG_D() << "generated passphrase: " << phrase.size() << "bytes";
   return WriteFile(phrase_path, phrase.toUtf8());
 }
 
diff --git a/src/core/function/basic/GpgFunctionObject.h b/src/core/function/basic/GpgFunctionObject.h
index 41a597e5..fea400aa 100644
--- a/src/core/function/basic/GpgFunctionObject.h
+++ b/src/core/function/basic/GpgFunctionObject.h
@@ -34,6 +34,7 @@
 #include "core/function/basic/ChannelObject.h"
 #include "core/function/basic/SingletonStorage.h"
 #include "core/function/basic/SingletonStorageCollection.h"
+#include "core/typedef/CoreTypedef.h"
 #include "core/utils/MemoryUtils.h"
 
 namespace GpgFrontend {
diff --git a/src/core/function/gpg/GpgBasicOperator.cpp b/src/core/function/gpg/GpgBasicOperator.cpp
index 7f36e60a..30fd8912 100644
--- a/src/core/function/gpg/GpgBasicOperator.cpp
+++ b/src/core/function/gpg/GpgBasicOperator.cpp
@@ -55,7 +55,9 @@ void SetSignersImpl(GpgContext& ctx_, const KeyArgsList& signers, bool ascii) {
       CheckGpgError(error);
     }
   }
-  if (signers.size() != gpgme_signers_count(ctx_.DefaultContext())) {
+
+  auto count = gpgme_signers_count(ctx_.DefaultContext());
+  if (static_cast<unsigned int>(signers.size()) != count) {
     FLOG_D("not all signers added");
   }
 }
@@ -286,7 +288,7 @@ auto EncryptSignImpl(GpgContext& ctx_, const KeyArgsList& keys,
   QContainer<gpgme_key_t> recipients(keys.begin(), keys.end());
 
   // Last entry data_in array has to be nullptr
-  recipients.emplace_back(nullptr);
+  recipients.push_back(nullptr);
 
   SetSignersImpl(ctx_, signers, ascii);
 
diff --git a/src/core/function/gpg/GpgCommandExecutor.cpp b/src/core/function/gpg/GpgCommandExecutor.cpp
index 5256de60..b244dfa4 100644
--- a/src/core/function/gpg/GpgCommandExecutor.cpp
+++ b/src/core/function/gpg/GpgCommandExecutor.cpp
@@ -201,7 +201,7 @@ void GpgCommandExecutor::ExecuteConcurrentlySync(ExecuteContexts contexts) {
 
     QObject::connect(task, &Thread::Task::SignalTaskEnd, [&]() {
       --remaining_tasks;
-      FLOG_D("remaining tasks: %lld", remaining_tasks);
+      LOG_D() << "remaining tasks: " << remaining_tasks;
       if (remaining_tasks <= 0) {
         FLOG_D("no remaining task, quit");
         looper.quit();
diff --git a/src/core/function/gpg/GpgCommandExecutor.h b/src/core/function/gpg/GpgCommandExecutor.h
index cb35e686..5a2f13db 100644
--- a/src/core/function/gpg/GpgCommandExecutor.h
+++ b/src/core/function/gpg/GpgCommandExecutor.h
@@ -56,7 +56,7 @@ class GPGFRONTEND_CORE_EXPORT GpgCommandExecutor {
         GpgCommandExecutorInterator int_func = [](QProcess *) {});
   };
 
-  using ExecuteContexts = QList<ExecuteContext>;
+  using ExecuteContexts = QContainer<ExecuteContext>;
 
   /**
    * @brief Excuting a command
diff --git a/src/core/function/gpg/GpgFileOpera.cpp b/src/core/function/gpg/GpgFileOpera.cpp
index 3b2efd52..a3ad1ac5 100644
--- a/src/core/function/gpg/GpgFileOpera.cpp
+++ b/src/core/function/gpg/GpgFileOpera.cpp
@@ -461,6 +461,8 @@ auto GpgFileOpera::EncryptDirectorySymmetricSync(
     const QString& out_path) -> std::tuple<GpgError, DataObjectPtr> {
   auto ex = CreateStandardGFDataExchanger();
 
+  CreateArchiveHelper(in_path, ex);
+
   return RunGpgOperaSync(
       [=](const DataObjectPtr& data_object) -> GpgError {
         GpgData data_in(ex);
@@ -470,8 +472,6 @@ auto GpgFileOpera::EncryptDirectorySymmetricSync(
                                       data_object);
       },
       "gpgme_op_encrypt_symmetric", "2.1.0");
-
-  CreateArchiveHelper(in_path, ex);
 }
 
 }  // namespace GpgFrontend
\ No newline at end of file
diff --git a/src/core/function/gpg/GpgKeyGetter.cpp b/src/core/function/gpg/GpgKeyGetter.cpp
index e5b234f8..a4ca6021 100644
--- a/src/core/function/gpg/GpgKeyGetter.cpp
+++ b/src/core/function/gpg/GpgKeyGetter.cpp
@@ -151,7 +151,7 @@ class GpgKeyGetter::Impl : public SingletonFunctionObject<GpgKeyGetter::Impl> {
 
   auto GetKeys(const KeyIdArgsList& ids) -> GpgKeyList {
     auto keys = GpgKeyList{};
-    for (const auto& key_id : ids) keys.emplace_back(GetKey(key_id, true));
+    for (const auto& key_id : ids) keys.push_back(GetKey(key_id, true));
     return keys;
   }
 
@@ -159,7 +159,7 @@ class GpgKeyGetter::Impl : public SingletonFunctionObject<GpgKeyGetter::Impl> {
     // get the lock
     std::lock_guard<std::mutex> lock(ctx_mutex_);
     auto keys_copy = GpgKeyList{};
-    for (const auto& key : keys) keys_copy.emplace_back(key);
+    for (const auto& key : keys) keys_copy.push_back(key);
     return keys_copy;
   }
 
@@ -192,7 +192,7 @@ class GpgKeyGetter::Impl : public SingletonFunctionObject<GpgKeyGetter::Impl> {
    * @brief
    *
    */
-  QList<GpgKey> keys_cache_;
+  QContainer<GpgKey> keys_cache_;
 
   /**
    * @brief shared mutex for the keys cache
diff --git a/src/core/function/gpg/GpgKeyImportExporter.cpp b/src/core/function/gpg/GpgKeyImportExporter.cpp
index 6c78f760..60c06995 100644
--- a/src/core/function/gpg/GpgKeyImportExporter.cpp
+++ b/src/core/function/gpg/GpgKeyImportExporter.cpp
@@ -60,7 +60,7 @@ auto GpgKeyImportExporter::ImportKey(const GFBuffer& in_buffer)
     GpgImportInformation::GpgImportedKey key;
     key.import_status = static_cast<int>(status->status);
     key.fpr = status->fpr;
-    import_info->imported_keys.emplace_back(key);
+    import_info->imported_keys.push_back(key);
     status = status->next;
   }
   return import_info;
@@ -85,8 +85,8 @@ auto GpgKeyImportExporter::ExportKey(const GpgKey& key, bool secret, bool ascii,
   QContainer<gpgme_key_t> keys_array;
 
   // Last entry data_in array has to be nullptr
-  keys_array.emplace_back(key);
-  keys_array.emplace_back(nullptr);
+  keys_array.push_back(static_cast<gpgme_key_t>(key));
+  keys_array.push_back(nullptr);
 
   GpgData data_out;
   auto* ctx = ascii ? ctx_.DefaultContext() : ctx_.BinaryContext();
@@ -117,7 +117,7 @@ void GpgKeyImportExporter::ExportKeys(const KeyArgsList& keys, bool secret,
         QContainer<gpgme_key_t> keys_array(keys.begin(), keys.end());
 
         // Last entry data_in array has to be nullptr
-        keys_array.emplace_back(nullptr);
+        keys_array.push_back(nullptr);
 
         GpgData data_out;
         auto* ctx = ascii ? ctx_.DefaultContext() : ctx_.BinaryContext();
@@ -147,7 +147,7 @@ void GpgKeyImportExporter::ExportAllKeys(const KeyArgsList& keys, bool secret,
         QContainer<gpgme_key_t> keys_array(keys.begin(), keys.end());
 
         // Last entry data_in array has to be nullptr
-        keys_array.emplace_back(nullptr);
+        keys_array.push_back(nullptr);
 
         GpgData data_out;
         auto* ctx = ascii ? ctx_.DefaultContext() : ctx_.BinaryContext();
diff --git a/src/core/function/gpg/GpgKeyManager.cpp b/src/core/function/gpg/GpgKeyManager.cpp
index afa775eb..36f68bdc 100644
--- a/src/core/function/gpg/GpgKeyManager.cpp
+++ b/src/core/function/gpg/GpgKeyManager.cpp
@@ -272,7 +272,7 @@ auto GpgKeyManager::RevokeSubkey(const GpgKey& key, int subkey_index,
 
   // dealing with reason text
   auto reason_text_lines = SecureCreateSharedObject<QStringList>(
-      reason_text.split('\n', Qt::SkipEmptyParts).toVector());
+      reason_text.split('\n', Qt::SkipEmptyParts));
 
   AutomatonNextStateHandler next_state_handler =
       [](AutomatonState state, QString status, QString args) {
diff --git a/src/core/function/gpg/GpgKeyOpera.cpp b/src/core/function/gpg/GpgKeyOpera.cpp
index 23a848ee..9511b347 100644
--- a/src/core/function/gpg/GpgKeyOpera.cpp
+++ b/src/core/function/gpg/GpgKeyOpera.cpp
@@ -111,7 +111,7 @@ void GpgKeyOpera::GenerateRevokeCert(const GpgKey& key,
 
   // dealing with reason text
   auto reason_text_lines = GpgFrontend::SecureCreateSharedObject<QStringList>(
-      revocation_reason_text.split('\n', Qt::SkipEmptyParts).toVector());
+      revocation_reason_text.split('\n', Qt::SkipEmptyParts));
 
   const auto app_path = Module::RetrieveRTValueTypedOrDefault<>(
       "core", "gpgme.ctx.app_path", QString{});
@@ -124,10 +124,10 @@ void GpgKeyOpera::GenerateRevokeCert(const GpgKey& key,
          if (exit_code != 0) {
            LOG_W() << "gnupg gen revoke execute error, process stderr: "
                    << p_err << ", process stdout: " << p_out;
-         } else {
-           FLOG_D("gnupg gen revoke exit_code: %d, process stdout size: %lld",
-                  exit_code, p_out.size());
+           return;
          }
+         LOG_D() << "gnupg gen revoke exit_code: " << exit_code
+                 << "process stdout size: " << p_out.size();
        },
        nullptr,
        [revocation_reason_code, reason_text_lines](QProcess* proc) -> void {
diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp
index e87a710d..b9312745 100644
--- a/src/core/function/gpg/GpgUIDOperator.cpp
+++ b/src/core/function/gpg/GpgUIDOperator.cpp
@@ -156,7 +156,7 @@ auto GpgUIDOperator::RevokeUID(const GpgKey& key, int uid_index,
 
   // dealing with reason text
   auto reason_text_lines = GpgFrontend::SecureCreateSharedObject<QStringList>(
-      reason_text.split('\n', Qt::SkipEmptyParts).toVector());
+      reason_text.split('\n', Qt::SkipEmptyParts));
 
   AutomatonNextStateHandler next_state_handler = [](AutomatonState state,
                                                     QString status,