feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Introduce a non-mutating FileName::pathAppended

Browse Source 
... and start using it. The plan is to replace all appendPath() uses.

Change-Id: I555bcfa742b99b0951b98b0c0e707422c348fadb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-05-15 08:15:19 +02:00
parent 86f072daeb
commit d1f9e466da
5 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libs/utils/fileutils.cpp
View File

@@ -166,10 +166,8 @@ bool FileUtils::copyRecursively(const FileName &srcFilePath, const FileName &tgt
QStringList fileNames = sourceDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot
| QDir::Hidden | QDir::System);
foreach (const QString &fileName, fileNames) {
FileName newSrcFilePath = srcFilePath;
newSrcFilePath.appendPath(fileName);
FileName newTgtFilePath = tgtFilePath;
newTgtFilePath.appendPath(fileName);
const FileName newSrcFilePath = srcFilePath.pathAppended(fileName);
const FileName newTgtFilePath = tgtFilePath.pathAppended(fileName);
if (!copyRecursively(newSrcFilePath, newTgtFilePath, error, copyHelper))
return false;
}
@@ -855,6 +853,17 @@ FileName &FileName::appendPath(const QString &s)
return *this;
}
FileName FileName::pathAppended(const QString &str) const
{
FileName fn = *this;
if (str.isEmpty())
return fn;
if (!isEmpty() && !m_data.endsWith(QLatin1Char('/')))
fn.m_data.append('/');
fn.m_data.append(str);
return fn;
}
FileName FileName::stringAppended(const QString &str) const
{
FileName fn = *this;