flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 09:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cppcheck and unit test fixes

Browse Source
This commit is contained in:
Klaus Basan
2018-07-31 21:41:34 +02:00
parent fe99eb0fed
commit dd687b7d90
8 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackmisc/directoryutils.cpp
View File

@@ -144,11 +144,11 @@ namespace BlackMisc
return dirs;
}
const QMap<QString, CApplicationInfo> &CDirectoryUtils::applicationDataDirectoryMapWithoutCurrentVersion()
const CDirectoryUtils::FilePerApplication &CDirectoryUtils::applicationDataDirectoryMapWithoutCurrentVersion()
{
static const QMap<QString, CApplicationInfo> dirs = [ = ]
static const FilePerApplication dirs = [ = ]() -> FilePerApplication
{
QMap<QString, CApplicationInfo> directories;
FilePerApplication directories;
for (const QFileInfo &info : CDirectoryUtils::applicationDataDirectories())
{
if (caseInsensitiveStringCompare(info.filePath(), CDirectoryUtils::normalizedApplicationDataDirectory())) { continue; }
@@ -170,6 +170,8 @@ namespace BlackMisc
appInfo.setApplicationDataDirectory(info.filePath());
directories.insert(info.filePath(), appInfo);
}
// https://stackoverflow.com/q/51635959/356726
// cppcheck-suppress returnReference
return directories;
}();
return dirs;

5
src/blackmisc/directoryutils.h
View File

@@ -29,6 +29,9 @@ namespace BlackMisc
class BLACKMISC_EXPORT CDirectoryUtils
{
public:
//! File path and swift application
using FilePerApplication = QMap<QString, CApplicationInfo>;
//! Returns the bin directory. On Windows/Linux this is the same directory as
//! QCoreApplication::applicationDirPath(), but on MacOS the exceutable is
//! located deeper in the hierarchy of the bundles
@@ -59,7 +62,7 @@ namespace BlackMisc
static QStringList applicationDataDirectoryList(bool withoutCurrent = false, bool decodedDirName = false);
//! swift application data sub directories with info if available
static const QMap<QString, CApplicationInfo> &applicationDataDirectoryMapWithoutCurrentVersion();
static const FilePerApplication &applicationDataDirectoryMapWithoutCurrentVersion();
//! Other swift data directories
static bool hasOtherSwiftDataDirectories();

1
src/blackmisc/predicates.h
View File

@@ -69,6 +69,7 @@ namespace BlackMisc
less = less && ! greater && (a.*member)() < (b.*member)();
greater = (b.*member)() < (a.*member)();
});
Q_UNUSED(greater); // CPP style check
return less;
};
}

6
src/blackmisc/statusmessage.h
View File

@@ -167,10 +167,10 @@ namespace BlackMisc
//! \copydoc BlackMisc::StatusSeverity
//! @{
using StatusSeverity = BlackMisc::StatusSeverity;
constexpr static auto SeverityDebug = BlackMisc::SeverityDebug;
constexpr static auto SeverityInfo = BlackMisc::SeverityInfo;
constexpr static auto SeverityDebug = BlackMisc::SeverityDebug;
constexpr static auto SeverityInfo = BlackMisc::SeverityInfo;
constexpr static auto SeverityWarning = BlackMisc::SeverityWarning;
constexpr static auto SeverityError = BlackMisc::SeverityError;
constexpr static auto SeverityError = BlackMisc::SeverityError;
//! @}
//! Properties by index