Add i18n Support

1. Remove Qt Linguist.
2. Add GNU gettext libraries.
3. Modified source codes to meet with i18n support.

16 files changed, 91 insertions, 136 deletions

diff --git a/src/gpg/function/BasicOperator.cpp b/src/gpg/function/BasicOperator.cpp
index 0e44c9e0..e92d4cfe 100644
--- a/src/gpg/function/BasicOperator.cpp
+++ b/src/gpg/function/BasicOperator.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
@@ -23,20 +23,19 @@
  */
 
 #include "gpg/function/BasicOperator.h"
+
 #include <vector>
+
 #include "gpg/function/GpgKeyGetter.h"
 
 GpgFrontend::GpgError GpgFrontend::BasicOperator::Encrypt(
-    GpgFrontend::KeyArgsList&& keys,
-    GpgFrontend::BypeArrayRef in_buffer,
-    GpgFrontend::ByteArrayPtr& out_buffer,
-    GpgFrontend::GpgEncrResult& result) {
+    GpgFrontend::KeyArgsList&& keys, GpgFrontend::BypeArrayRef in_buffer,
+    GpgFrontend::ByteArrayPtr& out_buffer, GpgFrontend::GpgEncrResult& result) {
   // gpgme_encrypt_result_t e_result;
   gpgme_key_t recipients[keys.size() + 1];
 
   int index = 0;
-  for (const auto& key : keys)
-    recipients[index++] = gpgme_key_t(key);
+  for (const auto& key : keys) recipients[index++] = gpgme_key_t(key);
 
   // Last entry data_in array has to be nullptr
   recipients[keys.size()] = nullptr;
@@ -56,8 +55,7 @@ GpgFrontend::GpgError GpgFrontend::BasicOperator::Encrypt(
 }
 
 GpgFrontend::GpgError GpgFrontend::BasicOperator::Decrypt(
-    BypeArrayRef in_buffer,
-    GpgFrontend::ByteArrayPtr& out_buffer,
+    BypeArrayRef in_buffer, GpgFrontend::ByteArrayPtr& out_buffer,
     GpgFrontend::GpgDecrResult& result) {
   gpgme_error_t err;
 
@@ -74,8 +72,7 @@ GpgFrontend::GpgError GpgFrontend::BasicOperator::Decrypt(
 }
 
 GpgFrontend::GpgError GpgFrontend::BasicOperator::Verify(
-    BypeArrayRef& in_buffer,
-    ByteArrayPtr& sig_buffer,
+    BypeArrayRef& in_buffer, ByteArrayPtr& sig_buffer,
     GpgVerifyResult& result) const {
   gpgme_error_t err;
 
@@ -131,10 +128,8 @@ GpgFrontend::GpgError GpgFrontend::BasicOperator::Sign(KeyArgsList&& keys,
 }
 
 gpgme_error_t GpgFrontend::BasicOperator::DecryptVerify(
-    BypeArrayRef in_buffer,
-    ByteArrayPtr& out_buffer,
-    GpgDecrResult& decrypt_result,
-    GpgVerifyResult& verify_result) {
+    BypeArrayRef in_buffer, ByteArrayPtr& out_buffer,
+    GpgDecrResult& decrypt_result, GpgVerifyResult& verify_result) {
   gpgme_error_t err;
 
   GpgData data_in(in_buffer.data(), in_buffer.size()), data_out;
@@ -154,11 +149,8 @@ gpgme_error_t GpgFrontend::BasicOperator::DecryptVerify(
 }
 
 gpgme_error_t GpgFrontend::BasicOperator::EncryptSign(
-    KeyArgsList&& keys,
-    KeyArgsList&& signers,
-    BypeArrayRef in_buffer,
-    ByteArrayPtr& out_buffer,
-    GpgEncrResult& encr_result,
+    KeyArgsList&& keys, KeyArgsList&& signers, BypeArrayRef in_buffer,
+    ByteArrayPtr& out_buffer, GpgEncrResult& encr_result,
     GpgSignResult& sign_result) {
   gpgme_error_t err;
   SetSigners(signers);
@@ -168,8 +160,7 @@ gpgme_error_t GpgFrontend::BasicOperator::EncryptSign(
 
   // set key for user
   int index = 0;
-  for (const auto& key : keys)
-    recipients[index++] = gpgme_key_t(key);
+  for (const auto& key : keys) recipients[index++] = gpgme_key_t(key);
 
   // Last entry dataIn array has to be nullptr
   recipients[keys.size()] = nullptr;
diff --git a/src/gpg/function/BasicOperator.h b/src/gpg/function/BasicOperator.h
index e8fa943d..e83ade70 100644
--- a/src/gpg/function/BasicOperator.h
+++ b/src/gpg/function/BasicOperator.h
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
@@ -34,35 +34,26 @@ namespace GpgFrontend {
 
 class BasicOperator : public SingletonFunctionObject<BasicOperator> {
  public:
-  gpg_error_t Encrypt(KeyArgsList&& keys,
-                      BypeArrayRef in_buffer,
-                      ByteArrayPtr& out_buffer,
-                      GpgEncrResult& result);
+  gpg_error_t Encrypt(KeyArgsList&& keys, BypeArrayRef in_buffer,
+                      ByteArrayPtr& out_buffer, GpgEncrResult& result);
 
-  gpgme_error_t EncryptSign(KeyArgsList&& keys,
-                            KeyArgsList&& signers,
-                            BypeArrayRef in_buffer,
-                            ByteArrayPtr& out_buffer,
+  gpgme_error_t EncryptSign(KeyArgsList&& keys, KeyArgsList&& signers,
+                            BypeArrayRef in_buffer, ByteArrayPtr& out_buffer,
                             GpgEncrResult& encr_result,
                             GpgSignResult& sign_result);
 
-  gpgme_error_t Decrypt(BypeArrayRef in_buffer,
-                        ByteArrayPtr& out_buffer,
+  gpgme_error_t Decrypt(BypeArrayRef in_buffer, ByteArrayPtr& out_buffer,
                         GpgDecrResult& result);
 
-  gpgme_error_t DecryptVerify(BypeArrayRef in_buffer,
-                              ByteArrayPtr& out_buffer,
+  gpgme_error_t DecryptVerify(BypeArrayRef in_buffer, ByteArrayPtr& out_buffer,
                               GpgDecrResult& decrypt_result,
                               GpgVerifyResult& verify_result);
 
-  gpgme_error_t Verify(BypeArrayRef in_buffer,
-                       ByteArrayPtr& sig_buffer,
+  gpgme_error_t Verify(BypeArrayRef in_buffer, ByteArrayPtr& sig_buffer,
                        GpgVerifyResult& result) const;
 
-  gpg_error_t Sign(KeyArgsList&& key_fprs,
-                   BypeArrayRef in_buffer,
-                   ByteArrayPtr& out_buffer,
-                   gpgme_sig_mode_t mode,
+  gpg_error_t Sign(KeyArgsList&& key_fprs, BypeArrayRef in_buffer,
+                   ByteArrayPtr& out_buffer, gpgme_sig_mode_t mode,
                    GpgSignResult& result);
 
   void SetSigners(KeyArgsList& keys);
diff --git a/src/gpg/function/GpgCommandExecutor.cpp b/src/gpg/function/GpgCommandExecutor.cpp
index efe1446f..a494d4a8 100644
--- a/src/gpg/function/GpgCommandExecutor.cpp
+++ b/src/gpg/function/GpgCommandExecutor.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
diff --git a/src/gpg/function/GpgCommandExecutor.h b/src/gpg/function/GpgCommandExecutor.h
index 01904fd3..a6eaaf4a 100644
--- a/src/gpg/function/GpgCommandExecutor.h
+++ b/src/gpg/function/GpgCommandExecutor.h
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
@@ -25,23 +25,23 @@
 #ifndef GPGFRONTEND_ZH_CN_TS_GPGCOMMANDEXECUTOR_H
 #define GPGFRONTEND_ZH_CN_TS_GPGCOMMANDEXECUTOR_H
 
+#include <boost/process.hpp>
+
 #include "gpg/GpgContext.h"
 #include "gpg/GpgFunctionObject.h"
 
-#include <boost/process.hpp>
-
 namespace GpgFrontend {
 class GpgCommandExecutor : public SingletonFunctionObject<GpgCommandExecutor> {
-public:
+ public:
   void Execute(StringArgsRef arguments,
                const std::function<void(boost::process::async_pipe &in,
                                         boost::process::async_pipe &out)>
                    &interact_func);
 
-private:
+ private:
   GpgContext &ctx = GpgContext::GetInstance();
 };
 
-} // namespace GpgFrontend
+}  // namespace GpgFrontend
 
-#endif // GPGFRONTEND_ZH_CN_TS_GPGCOMMANDEXECUTOR_H
+#endif  // GPGFRONTEND_ZH_CN_TS_GPGCOMMANDEXECUTOR_H
diff --git a/src/gpg/function/GpgFileOpera.cpp b/src/gpg/function/GpgFileOpera.cpp
index ae912ada..67504c0d 100644
--- a/src/gpg/function/GpgFileOpera.cpp
+++ b/src/gpg/function/GpgFileOpera.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
diff --git a/src/gpg/function/GpgFileOpera.h b/src/gpg/function/GpgFileOpera.h
index ff57b2c0..5b467357 100644
--- a/src/gpg/function/GpgFileOpera.h
+++ b/src/gpg/function/GpgFileOpera.h
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
diff --git a/src/gpg/function/GpgKeyGetter.cpp b/src/gpg/function/GpgKeyGetter.cpp
index 18fbe649..be27d69e 100644
--- a/src/gpg/function/GpgKeyGetter.cpp
+++ b/src/gpg/function/GpgKeyGetter.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
diff --git a/src/gpg/function/GpgKeyGetter.h b/src/gpg/function/GpgKeyGetter.h
index 8eab4e10..c8f5d73a 100644
--- a/src/gpg/function/GpgKeyGetter.h
+++ b/src/gpg/function/GpgKeyGetter.h
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
diff --git a/src/gpg/function/GpgKeyImportExportor.cpp b/src/gpg/function/GpgKeyImportExportor.cpp
index bdfc25bd..f4b88c60 100644
--- a/src/gpg/function/GpgKeyImportExportor.cpp
+++ b/src/gpg/function/GpgKeyImportExportor.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
@@ -33,8 +33,7 @@
  */
 GpgFrontend::GpgImportInformation GpgFrontend::GpgKeyImportExportor::ImportKey(
     StdBypeArrayPtr in_buffer) {
-  if (in_buffer->empty())
-    return GpgImportInformation();
+  if (in_buffer->empty()) return GpgImportInformation();
 
   GpgData data_in(in_buffer->data(), in_buffer->size());
   auto err = check_gpg_error(gpgme_op_import(ctx, data_in));
@@ -60,10 +59,8 @@ GpgFrontend::GpgImportInformation GpgFrontend::GpgKeyImportExportor::ImportKey(
  * @return if success
  */
 bool GpgFrontend::GpgKeyImportExportor::ExportKeys(
-    KeyIdArgsListPtr& uid_list,
-    ByteArrayPtr& out_buffer) const {
-  if (uid_list->empty())
-    return false;
+    KeyIdArgsListPtr& uid_list, ByteArrayPtr& out_buffer) const {
+  if (uid_list->empty()) return false;
 
   // Alleviate another crash problem caused by an unknown array out-of-bounds
   // access
@@ -89,11 +86,9 @@ bool GpgFrontend::GpgKeyImportExportor::ExportKeys(
  * @return if success
  */
 bool GpgFrontend::GpgKeyImportExportor::ExportKeys(
-    const KeyArgsList& keys,
-    ByteArrayPtr& out_buffer) const {
+    const KeyArgsList& keys, ByteArrayPtr& out_buffer) const {
   KeyIdArgsListPtr key_ids = std::make_unique<std::vector<std::string>>();
-  for (const auto& key : keys)
-    key_ids->push_back(key.id());
+  for (const auto& key : keys) key_ids->push_back(key.id());
   return ExportKeys(key_ids, out_buffer);
 }
 
@@ -104,8 +99,7 @@ bool GpgFrontend::GpgKeyImportExportor::ExportKeys(
  * @return if successful
  */
 bool GpgFrontend::GpgKeyImportExportor::ExportSecretKey(
-    const GpgKey& key,
-    ByteArrayPtr& out_buffer) const {
+    const GpgKey& key, ByteArrayPtr& out_buffer) const {
   DLOG(INFO) << "Export Secret Key" << key.id().c_str();
 
   gpgme_key_t target_key[2] = {gpgme_key_t(key), nullptr};
diff --git a/src/gpg/function/GpgKeyImportExportor.h b/src/gpg/function/GpgKeyImportExportor.h
index d71daddb..bceb87ef 100644
--- a/src/gpg/function/GpgKeyImportExportor.h
+++ b/src/gpg/function/GpgKeyImportExportor.h
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
@@ -26,6 +26,7 @@
 #define _GPGKEYIMPORTEXPORTOR_H
 
 #include <string>
+
 #include "gpg/GpgConstants.h"
 #include "gpg/GpgContext.h"
 #include "gpg/GpgFunctionObject.h"
@@ -46,34 +47,20 @@ class GpgImportInformation {
   GpgImportInformation() = default;
 
   explicit GpgImportInformation(gpgme_import_result_t result) {
-    if (result->unchanged)
-      unchanged = result->unchanged;
-    if (result->considered)
-      considered = result->considered;
-    if (result->no_user_id)
-      no_user_id = result->no_user_id;
-    if (result->imported)
-      imported = result->imported;
-    if (result->imported_rsa)
-      imported_rsa = result->imported_rsa;
-    if (result->unchanged)
-      unchanged = result->unchanged;
-    if (result->new_user_ids)
-      new_user_ids = result->new_user_ids;
-    if (result->new_sub_keys)
-      new_sub_keys = result->new_sub_keys;
-    if (result->new_signatures)
-      new_signatures = result->new_signatures;
-    if (result->new_revocations)
-      new_revocations = result->new_revocations;
-    if (result->secret_read)
-      secret_read = result->secret_read;
-    if (result->secret_imported)
-      secret_imported = result->secret_imported;
-    if (result->secret_unchanged)
-      secret_unchanged = result->secret_unchanged;
-    if (result->not_imported)
-      not_imported = result->not_imported;
+    if (result->unchanged) unchanged = result->unchanged;
+    if (result->considered) considered = result->considered;
+    if (result->no_user_id) no_user_id = result->no_user_id;
+    if (result->imported) imported = result->imported;
+    if (result->imported_rsa) imported_rsa = result->imported_rsa;
+    if (result->unchanged) unchanged = result->unchanged;
+    if (result->new_user_ids) new_user_ids = result->new_user_ids;
+    if (result->new_sub_keys) new_sub_keys = result->new_sub_keys;
+    if (result->new_signatures) new_signatures = result->new_signatures;
+    if (result->new_revocations) new_revocations = result->new_revocations;
+    if (result->secret_read) secret_read = result->secret_read;
+    if (result->secret_imported) secret_imported = result->secret_imported;
+    if (result->secret_unchanged) secret_unchanged = result->secret_unchanged;
+    if (result->not_imported) not_imported = result->not_imported;
   }
 
   int considered = 0;
diff --git a/src/gpg/function/GpgKeyManager.cpp b/src/gpg/function/GpgKeyManager.cpp
index 361c00bd..9e24b3d6 100644
--- a/src/gpg/function/GpgKeyManager.cpp
+++ b/src/gpg/function/GpgKeyManager.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
@@ -23,14 +23,15 @@
  */
 
 #include "gpg/function/GpgKeyManager.h"
+
 #include <boost/date_time/posix_time/conversion.hpp>
 #include <string>
+
 #include "gpg/function/BasicOperator.h"
 #include "gpg/function/GpgKeyGetter.h"
 
 bool GpgFrontend::GpgKeyManager::signKey(
-    const GpgFrontend::GpgKey& target,
-    GpgFrontend::KeyArgsList& keys,
+    const GpgFrontend::GpgKey& target, GpgFrontend::KeyArgsList& keys,
     const std::string& uid,
     const std::unique_ptr<boost::gregorian::date>& expires) {
   using namespace boost::posix_time;
@@ -62,27 +63,23 @@ bool GpgFrontend::GpgKeyManager::revSign(
     auto err = check_gpg_error(gpgme_op_revsig(ctx, gpgme_key_t(key),
                                                gpgme_key_t(signing_key),
                                                sign_id.second.c_str(), 0));
-    if (check_gpg_error_2_err_code(err) != GPG_ERR_NO_ERROR)
-      return false;
+    if (check_gpg_error_2_err_code(err) != GPG_ERR_NO_ERROR) return false;
   }
   return true;
 }
 
 bool GpgFrontend::GpgKeyManager::setExpire(
-    const GpgFrontend::GpgKey& key,
-    std::unique_ptr<GpgSubKey>& subkey,
+    const GpgFrontend::GpgKey& key, std::unique_ptr<GpgSubKey>& subkey,
     std::unique_ptr<boost::gregorian::date>& expires) {
   using namespace boost::posix_time;
 
   unsigned long expires_time = 0;
 
-  if (expires != nullptr)
-    expires_time = to_time_t(ptime(*expires));
+  if (expires != nullptr) expires_time = to_time_t(ptime(*expires));
 
   const char* sub_fprs = nullptr;
 
-  if (subkey != nullptr)
-    sub_fprs = subkey->fpr().c_str();
+  if (subkey != nullptr) sub_fprs = subkey->fpr().c_str();
 
   auto err = check_gpg_error(
       gpgme_op_setexpire(ctx, gpgme_key_t(key), expires_time, sub_fprs, 0));
diff --git a/src/gpg/function/GpgKeyManager.h b/src/gpg/function/GpgKeyManager.h
index f50c8dcc..2b07425c 100644
--- a/src/gpg/function/GpgKeyManager.h
+++ b/src/gpg/function/GpgKeyManager.h
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
@@ -40,16 +40,13 @@ class GpgKeyManager : public SingletonFunctionObject<GpgKeyManager> {
    * @param expires expire date and time of the signature
    * @return if successful
    */
-  bool signKey(const GpgKey& target,
-               KeyArgsList& keys,
-               const std::string& uid,
+  bool signKey(const GpgKey& target, KeyArgsList& keys, const std::string& uid,
                const std::unique_ptr<boost::gregorian::date>& expires);
 
   bool revSign(const GpgFrontend::GpgKey& key,
                const GpgFrontend::SignIdArgsListPtr& signature_id);
 
-  bool setExpire(const GpgKey& key,
-                 std::unique_ptr<GpgSubKey>& subkey,
+  bool setExpire(const GpgKey& key, std::unique_ptr<GpgSubKey>& subkey,
                  std::unique_ptr<boost::gregorian::date>& expires);
 
  private:
diff --git a/src/gpg/function/GpgKeyOpera.cpp b/src/gpg/function/GpgKeyOpera.cpp
index c7775d10..2406cbb9 100644
--- a/src/gpg/function/GpgKeyOpera.cpp
+++ b/src/gpg/function/GpgKeyOpera.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
diff --git a/src/gpg/function/GpgKeyOpera.h b/src/gpg/function/GpgKeyOpera.h
index 54f7f3e6..d9573bd7 100644
--- a/src/gpg/function/GpgKeyOpera.h
+++ b/src/gpg/function/GpgKeyOpera.h
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
diff --git a/src/gpg/function/UidOperator.cpp b/src/gpg/function/UidOperator.cpp
index 69caf458..d7acc3b1 100644
--- a/src/gpg/function/UidOperator.cpp
+++ b/src/gpg/function/UidOperator.cpp
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
diff --git a/src/gpg/function/UidOperator.h b/src/gpg/function/UidOperator.h
index e3068b1f..7d5df254 100644
--- a/src/gpg/function/UidOperator.h
+++ b/src/gpg/function/UidOperator.h
@@ -1,7 +1,7 @@
 /**
- * This file is part of GPGFrontend.
+ * This file is part of GpgFrontend.
  *
- * GPGFrontend is free software: you can redistribute it and/or modify
+ * GpgFrontend 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 3 of the License, or
  * (at your option) any later version.
@@ -48,10 +48,8 @@ class UidOperator : public SingletonFunctionObject<UidOperator> {
    * @param email
    * @return
    */
-  bool addUID(const GpgKey& key,
-              const std::string& name,
-              const std::string& comment,
-              const std::string& email);
+  bool addUID(const GpgKey& key, const std::string& name,
+              const std::string& comment, const std::string& email);
 
   /**
    * Revoke(Delete) UID from certain key pair