diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/m_gpg_info/GnuPGInfoGatheringModule.cpp | 4 | ||||
| -rw-r--r-- | src/m_key_server_sync/VKSInterface.cpp | 1 | ||||
| -rw-r--r-- | src/m_paper_key/parse.cpp | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/m_gpg_info/GnuPGInfoGatheringModule.cpp b/src/m_gpg_info/GnuPGInfoGatheringModule.cpp index 99972de..2b4de05 100644 --- a/src/m_gpg_info/GnuPGInfoGatheringModule.cpp +++ b/src/m_gpg_info/GnuPGInfoGatheringModule.cpp @@ -306,7 +306,7 @@ void GetGpgComponentInfos(void *data, int exit_code, const char *out, auto component_desc = info_split_list[1].trimmed(); auto component_path = info_split_list[2].trimmed(); -#ifdef __MINGW32__ +#if defined(_WIN32) || defined(WIN32) // replace some special substrings on windows // platform component_path.replace("%3a", ":"); @@ -382,7 +382,7 @@ void GetGpgDirectoryInfos(void *, int exit_code, const char *out, auto configuration_name = info_split_list[0].trimmed(); auto configuration_value = info_split_list[1].trimmed(); -#ifdef __MINGW32__ +#if defined(_WIN32) || defined(WIN32) // replace some special substrings on windows // platform configuration_value.replace("%3a", ":"); diff --git a/src/m_key_server_sync/VKSInterface.cpp b/src/m_key_server_sync/VKSInterface.cpp index eb16097..f896935 100644 --- a/src/m_key_server_sync/VKSInterface.cpp +++ b/src/m_key_server_sync/VKSInterface.cpp @@ -39,7 +39,6 @@ #include <QString> #include <QUrl> #include <QUrlQuery> -#include <utility> // #include <GFModuleCommonUtils.hpp> diff --git a/src/m_paper_key/parse.cpp b/src/m_paper_key/parse.cpp index 1fe130e..a8e6938 100644 --- a/src/m_paper_key/parse.cpp +++ b/src/m_paper_key/parse.cpp @@ -314,8 +314,7 @@ struct packet *read_secrets_file(FILE *secrets, enum data_type input_type) { linenum = atoi(line); if (linenum != next_linenum) { - FLOG_ERROR("missing line number %u (saw %u)", next_linenum, - linenum); + FLOG_ERROR("missing line number %u (saw %u)", next_linenum, linenum); free_packet(packet); return NULL; } else |