aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaturneric <[email protected]>2023-02-25 09:12:19 +0000
committerSaturneric <[email protected]>2023-02-25 09:12:19 +0000
commit3c63ef69ff5fa6c5b355324dd6a3523fcc8ec042 (patch)
tree1407140c54c0916b763392fdd8c14745ef7e5af6
parentfix: improve ci configs (diff)
downloadGpgFrontend-3c63ef69ff5fa6c5b355324dd6a3523fcc8ec042.tar.gz
GpgFrontend-3c63ef69ff5fa6c5b355324dd6a3523fcc8ec042.zip
fix: solve codacy issues
-rw-r--r--src/core/common/CoreCommonUtil.cpp10
-rw-r--r--src/core/common/CoreCommonUtil.h6
-rw-r--r--src/core/function/gpg/GpgKeyImportExporter.cpp2
-rw-r--r--src/init.cpp2
-rw-r--r--src/ui/thread/VersionCheckTask.cpp10
5 files changed, 18 insertions, 12 deletions
diff --git a/src/core/common/CoreCommonUtil.cpp b/src/core/common/CoreCommonUtil.cpp
index 9d0d0bd5..93cad60a 100644
--- a/src/core/common/CoreCommonUtil.cpp
+++ b/src/core/common/CoreCommonUtil.cpp
@@ -32,25 +32,25 @@ namespace GpgFrontend {
std::unique_ptr<CoreCommonUtil> CoreCommonUtil::instance_ = nullptr; ///<
-CoreCommonUtil *CoreCommonUtil::GetInstance() {
+CoreCommonUtil* CoreCommonUtil::GetInstance() {
if (instance_ == nullptr) {
instance_ = std::make_unique<CoreCommonUtil>();
}
return instance_.get();
}
-void CoreCommonUtil::SetTempCacheValue(const std::string key,
- const std::string value) {
+void CoreCommonUtil::SetTempCacheValue(const std::string& key,
+ const std::string& value) {
temp_cache_[key] = value;
}
-std::string CoreCommonUtil::GetTempCacheValue(const std::string key) {
+std::string CoreCommonUtil::GetTempCacheValue(const std::string& key) {
std::string temp_cache_value;
std::swap(temp_cache_value, temp_cache_[key]);
return temp_cache_value;
}
-void CoreCommonUtil::ResetTempCacheValue(const std::string key) {
+void CoreCommonUtil::ResetTempCacheValue(const std::string& key) {
std::string temp_cache_value;
std::swap(temp_cache_value, temp_cache_[key]);
}
diff --git a/src/core/common/CoreCommonUtil.h b/src/core/common/CoreCommonUtil.h
index 6cbf6405..58bb4d40 100644
--- a/src/core/common/CoreCommonUtil.h
+++ b/src/core/common/CoreCommonUtil.h
@@ -52,7 +52,7 @@ class GPGFRONTEND_CORE_EXPORT CoreCommonUtil : public QObject {
* @brief set a temp cache under a certain key
*
*/
- void SetTempCacheValue(const std::string, const std::string);
+ void SetTempCacheValue(const std::string &, const std::string &);
/**
* @brief after get the temp cache, its value will be imediately ease in
@@ -60,14 +60,14 @@ class GPGFRONTEND_CORE_EXPORT CoreCommonUtil : public QObject {
*
* @return std::string
*/
- std::string GetTempCacheValue(const std::string);
+ std::string GetTempCacheValue(const std::string &);
/**
* @brief imediately ease temp cache in storage
*
* @return std::string
*/
- void ResetTempCacheValue(const std::string);
+ void ResetTempCacheValue(const std::string &);
signals:
diff --git a/src/core/function/gpg/GpgKeyImportExporter.cpp b/src/core/function/gpg/GpgKeyImportExporter.cpp
index 81f67e78..01349c94 100644
--- a/src/core/function/gpg/GpgKeyImportExporter.cpp
+++ b/src/core/function/gpg/GpgKeyImportExporter.cpp
@@ -133,7 +133,7 @@ bool GpgFrontend::GpgKeyImportExporter::ExportAllKeys(
result = ExportKeys(uid_list, temp_buffer, true) & result;
}
out_buffer->append(*temp_buffer);
- return true;
+ return result;
}
/**
diff --git a/src/init.cpp b/src/init.cpp
index 6109fa47..80c34800 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -40,8 +40,8 @@
#ifdef WINDOWS
int setenv(const char *name, const char *value, int overwrite)
{
- int errcode = 0;
if(!overwrite) {
+ int errcode = 0;
size_t envsize = 0;
errcode = getenv_s(&envsize, NULL, 0, name);
if(errcode || envsize) return errcode;
diff --git a/src/ui/thread/VersionCheckTask.cpp b/src/ui/thread/VersionCheckTask.cpp
index 9bda0ddd..e9490e1c 100644
--- a/src/ui/thread/VersionCheckTask.cpp
+++ b/src/ui/thread/VersionCheckTask.cpp
@@ -137,8 +137,14 @@ void VersionCheckTask::slot_parse_current_version_info() {
try {
if (current_reply_ == nullptr ||
current_reply_->error() != QNetworkReply::NoError) {
- SPDLOG_ERROR("current version request network error: {}",
- current_reply_->errorString().toStdString());
+ if (current_reply_ != nullptr) {
+ SPDLOG_ERROR("current version request network error: {}",
+ current_reply_->errorString().toStdString());
+ } else {
+ SPDLOG_ERROR(
+ "current version request network error, null reply object");
+ }
+
version_.current_version_found = false;
version_.load_info_done = false;
} else {