From 9b4b2f70cc5e1977999ce42f28f2a7f804bf1417 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 26 Feb 2017 02:19:35 +0100
Subject: [PATCH] refs #890, use CFileUtils to append paths

---
 src/blackmisc/datacache.cpp | 8 ++++----
 src/blackmisc/datacache.h   | 2 +-
 src/blackmisc/fileutils.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/blackmisc/datacache.cpp b/src/blackmisc/datacache.cpp
index 9871e34b0..08f986e42 100644
--- a/src/blackmisc/datacache.cpp
+++ b/src/blackmisc/datacache.cpp
@@ -379,7 +379,7 @@ namespace BlackMisc
         m_timestamps.clear();
         m_originalTimestamps.clear();
 
-        QFile revisionFile(m_basename + "/.rev");
+        QFile revisionFile(CFileUtils::appendFilePaths(m_basename, ".rev"));
         if ((m_found = revisionFile.exists()))
         {
             if (! revisionFile.open(QFile::ReadOnly | QFile::Text))
@@ -465,7 +465,7 @@ namespace BlackMisc
         Q_ASSERT(m_updateInProgress);
         Q_ASSERT(m_lockFile.isLocked());
 
-        CAtomicFile revisionFile(m_basename + "/.rev");
+        CAtomicFile revisionFile(CFileUtils::appendFilePaths(m_basename, ".rev"));
         if (! revisionFile.open(QFile::WriteOnly | QFile::Text))
         {
             CLogMessage(this).error("Failed to open %1: %2") << revisionFile.fileName() << revisionFile.errorString();
@@ -641,7 +641,7 @@ namespace BlackMisc
             return;
         }
 
-        CAtomicFile revisionFile(m_basename + "/.rev");
+        CAtomicFile revisionFile(CFileUtils::appendFilePaths(m_basename, ".rev"));
         if (revisionFile.exists())
         {
             if (! revisionFile.open(QFile::ReadWrite | QFile::Text))
@@ -678,7 +678,7 @@ namespace BlackMisc
         }
 
         qint64 result = 0;
-        QFile revisionFile(m_basename + "/.rev");
+        QFile revisionFile(CFileUtils::appendFilePaths(m_basename, ".rev"));
         if (revisionFile.exists())
         {
             if (revisionFile.open(QFile::ReadOnly | QFile::Text))
diff --git a/src/blackmisc/datacache.h b/src/blackmisc/datacache.h
index b032df213..6053c7fb6 100644
--- a/src/blackmisc/datacache.h
+++ b/src/blackmisc/datacache.h
@@ -297,7 +297,7 @@ namespace BlackMisc
         virtual void connectPage(Private::CValuePage *page) override;
 
         QFileSystemWatcher m_watcher;
-        const QString m_revisionFileName { persistentStore() + "/.rev" };
+        const QString m_revisionFileName { CFileUtils::appendFilePaths(persistentStore(), ".rev") };
 
         CDataCacheSerializer m_serializer { this, m_revisionFileName };
         CDataCacheRevision m_revision { persistentStore() + "/" };
diff --git a/src/blackmisc/fileutils.cpp b/src/blackmisc/fileutils.cpp
index 72cafc880..0614a1800 100644
--- a/src/blackmisc/fileutils.cpp
+++ b/src/blackmisc/fileutils.cpp
@@ -98,7 +98,7 @@ namespace BlackMisc
     {
         if (path1.isEmpty()) { return QDir::cleanPath(path2); }
         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)