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

refs #890, use CFileUtils to append paths

Browse Source
This commit is contained in:
Klaus Basan
2017-02-26 02:19:35 +01:00
committed by Mathew Sutcliffe
parent 2005e1881b
commit 9b4b2f70cc
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackmisc/datacache.cpp
View File

@@ -379,7 +379,7 @@ namespace BlackMisc
m_timestamps.clear(); m_timestamps.clear();
m_originalTimestamps.clear(); m_originalTimestamps.clear();
QFile revisionFile(m_basename + "/.rev"); QFile revisionFile(CFileUtils::appendFilePaths(m_basename, ".rev"));
if ((m_found = revisionFile.exists())) if ((m_found = revisionFile.exists()))
{ {
if (! revisionFile.open(QFile::ReadOnly | QFile::Text)) if (! revisionFile.open(QFile::ReadOnly | QFile::Text))
@@ -465,7 +465,7 @@ namespace BlackMisc
Q_ASSERT(m_updateInProgress); Q_ASSERT(m_updateInProgress);
Q_ASSERT(m_lockFile.isLocked()); Q_ASSERT(m_lockFile.isLocked());
CAtomicFile revisionFile(m_basename + "/.rev"); CAtomicFile revisionFile(CFileUtils::appendFilePaths(m_basename, ".rev"));
if (! revisionFile.open(QFile::WriteOnly | QFile::Text)) if (! revisionFile.open(QFile::WriteOnly | QFile::Text))
{ {
CLogMessage(this).error("Failed to open %1: %2") << revisionFile.fileName() << revisionFile.errorString(); CLogMessage(this).error("Failed to open %1: %2") << revisionFile.fileName() << revisionFile.errorString();
@@ -641,7 +641,7 @@ namespace BlackMisc
return; return;
} }
CAtomicFile revisionFile(m_basename + "/.rev"); CAtomicFile revisionFile(CFileUtils::appendFilePaths(m_basename, ".rev"));
if (revisionFile.exists()) if (revisionFile.exists())
{ {
if (! revisionFile.open(QFile::ReadWrite | QFile::Text)) if (! revisionFile.open(QFile::ReadWrite | QFile::Text))
@@ -678,7 +678,7 @@ namespace BlackMisc
} }
qint64 result = 0; qint64 result = 0;
QFile revisionFile(m_basename + "/.rev"); QFile revisionFile(CFileUtils::appendFilePaths(m_basename, ".rev"));
if (revisionFile.exists()) if (revisionFile.exists())
{ {
if (revisionFile.open(QFile::ReadOnly | QFile::Text)) if (revisionFile.open(QFile::ReadOnly | QFile::Text))

2
src/blackmisc/datacache.h
View File

@@ -297,7 +297,7 @@ namespace BlackMisc
virtual void connectPage(Private::CValuePage *page) override; virtual void connectPage(Private::CValuePage *page) override;
QFileSystemWatcher m_watcher; QFileSystemWatcher m_watcher;
const QString m_revisionFileName { persistentStore() + "/.rev" }; const QString m_revisionFileName { CFileUtils::appendFilePaths(persistentStore(), ".rev") };
CDataCacheSerializer m_serializer { this, m_revisionFileName }; CDataCacheSerializer m_serializer { this, m_revisionFileName };
CDataCacheRevision m_revision { persistentStore() + "/" }; CDataCacheRevision m_revision { persistentStore() + "/" };

2
src/blackmisc/fileutils.cpp
View File

@@ -98,7 +98,7 @@ namespace BlackMisc
{ {
if (path1.isEmpty()) { return QDir::cleanPath(path2); } if (path1.isEmpty()) { return QDir::cleanPath(path2); }
if (path2.isEmpty()) { return QDir::cleanPath(path1); } if (path2.isEmpty()) { return QDir::cleanPath(path1); }
return QDir::cleanPath(path1 + QDir::separator() + path2); return QDir::cleanPath(path1 + QChar('/') + path2);
} }
bool CFileUtils::copyRecursively(const QString &sourceDir, const QString &destinationDir) bool CFileUtils::copyRecursively(const QString &sourceDir, const QString &destinationDir)