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

Improved string concat to avoid "//" in paths

Browse Source
This commit is contained in:
Klaus Basan
2019-06-29 03:40:20 +02:00
parent 6d0a4f115b
commit 83dd48a897
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackmisc/fileutils.cpp
View File

@@ -26,6 +26,7 @@
#include <QtGlobal> #include <QtGlobal>
#include <QMap> #include <QMap>
#include <algorithm> #include <algorithm>
#include <QStringBuilder>
using namespace BlackConfig; using namespace BlackConfig;
using namespace BlackMisc::Math; using namespace BlackMisc::Math;
@@ -115,7 +116,13 @@ 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 + QChar('/') + path2); if (path1.endsWith('/'))
{
// avoid double /
if (path2.startsWith('/')) { return QDir::cleanPath(path1 % path2.mid(1)); }
return QDir::cleanPath(path1 % path2);
}
return QDir::cleanPath(path1 % QChar('/') % path2);
} }
QString CFileUtils::appendFilePathsAndFixUnc(const QString &path1, const QString &path2) QString CFileUtils::appendFilePathsAndFixUnc(const QString &path1, const QString &path2)

4
src/blackmisc/network/url.cpp
View File

@@ -53,8 +53,8 @@ namespace BlackMisc
QString CUrl::appendPath(const QString &pathToAppend) QString CUrl::appendPath(const QString &pathToAppend)
{ {
QString p(getPath()); if (pathToAppend.isEmpty()) { return m_path; }
p = p.append("/").append(pathToAppend.trimmed()).replace("//", "/"); const QString p = CFileUtils::appendFilePaths(this->getPath(), pathToAppend);
this->setPath(p); this->setPath(p);
return m_path; return m_path;
} }