diff options
| author | Jonathan White <support@dmapps.us> | 2019-05-13 00:42:55 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2019-05-20 01:21:34 +0300 |
| commit | 2ee97ed1912fd068cd3484c439f2582a5d829ef4 (patch) | |
| tree | da8d11c7102bb0757de7950e98ac3cf42ac2fa2c /src/core | |
| parent | 96438a45b452271fa433e6488b85cb2e054c153c (diff) | |
Code formatting
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Alloc.cpp | 2 | ||||
| -rw-r--r-- | src/core/Bootstrap.cpp | 2 | ||||
| -rw-r--r-- | src/core/Merger.cpp | 6 | ||||
| -rw-r--r-- | src/core/Tools.cpp | 3 | ||||
| -rw-r--r-- | src/core/Translator.h | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/src/core/Alloc.cpp b/src/core/Alloc.cpp index a33b56196..89d044ec3 100644 --- a/src/core/Alloc.cpp +++ b/src/core/Alloc.cpp @@ -78,7 +78,7 @@ void operator delete[](void* ptr) noexcept * Custom insecure delete operator that does not zero out memory before * freeing a buffer. Can be used for better performance. */ -void operator delete(void* ptr, bool) noexcept +void operator delete(void* ptr, bool)noexcept { std::free(ptr); } diff --git a/src/core/Bootstrap.cpp b/src/core/Bootstrap.cpp index 2d1a3e087..204942f4d 100644 --- a/src/core/Bootstrap.cpp +++ b/src/core/Bootstrap.cpp @@ -257,7 +257,7 @@ namespace Bootstrap nullptr, // do not change owner or group pACL, // DACL specified nullptr // do not change SACL - ); + ); Cleanup: diff --git a/src/core/Merger.cpp b/src/core/Merger.cpp index dcbed250f..c70cd4b04 100644 --- a/src/core/Merger.cpp +++ b/src/core/Merger.cpp @@ -625,9 +625,9 @@ Merger::ChangeList Merger::mergeMetadata(const MergeContext& context) // Merge Custom Data if source is newer const auto targetCustomDataModificationTime = sourceMetadata->customData()->getLastModified(); const auto sourceCustomDataModificationTime = targetMetadata->customData()->getLastModified(); - if (!targetMetadata->customData()->contains(CustomData::LastModified) || - (targetCustomDataModificationTime.isValid() && sourceCustomDataModificationTime.isValid() && - targetCustomDataModificationTime > sourceCustomDataModificationTime)) { + if (!targetMetadata->customData()->contains(CustomData::LastModified) + || (targetCustomDataModificationTime.isValid() && sourceCustomDataModificationTime.isValid() + && targetCustomDataModificationTime > sourceCustomDataModificationTime)) { const auto sourceCustomDataKeys = sourceMetadata->customData()->keys(); const auto targetCustomDataKeys = targetMetadata->customData()->keys(); diff --git a/src/core/Tools.cpp b/src/core/Tools.cpp index 46cde95bc..beacbaaad 100644 --- a/src/core/Tools.cpp +++ b/src/core/Tools.cpp @@ -23,6 +23,7 @@ #include "core/Config.h" #include "core/Translator.h" +#include "git-info.h" #include <QCoreApplication> #include <QElapsedTimer> #include <QIODevice> @@ -33,7 +34,6 @@ #include <QSysInfo> #include <QUuid> #include <cctype> -#include "git-info.h" #ifdef Q_OS_WIN #include <windows.h> // for Sleep() @@ -75,7 +75,6 @@ namespace Tools #endif debugInfo.append("\n"); - #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) debugInfo.append(QObject::tr("Operating system: %1\nCPU architecture: %2\nKernel: %3 %4") .arg(QSysInfo::prettyProductName(), diff --git a/src/core/Translator.h b/src/core/Translator.h index cfc49d710..23a18422c 100644 --- a/src/core/Translator.h +++ b/src/core/Translator.h @@ -18,9 +18,9 @@ #ifndef KEEPASSX_TRANSLATOR_H #define KEEPASSX_TRANSLATOR_H +#include <QLocale> #include <QPair> #include <QString> -#include <QLocale> class Translator { |