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

Core: filepathify file renaming

Browse Source 
Change-Id: I3d4f39e34e65cde3df7b7c19570e3a54d0625d53
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
David Schulz
2021-06-11 14:34:34 +02:00
parent 55b91a7617
commit f66df921d7
32 changed files with 203 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -619,25 +619,25 @@ bool QmakePriFile::deleteFiles(const QStringList &filePaths)
return true;
}
bool QmakePriFile::canRenameFile(const QString &filePath, const QString &newFilePath)
bool QmakePriFile::canRenameFile(const FilePath &oldFilePath, const FilePath &newFilePath)
{
if (newFilePath.isEmpty())
return false;
bool changeProFileOptional = deploysFolder(QFileInfo(filePath).absolutePath());
bool changeProFileOptional = deploysFolder(oldFilePath.absolutePath().toString());
if (changeProFileOptional)
return true;
return renameFile(filePath, newFilePath, Change::TestOnly);
return renameFile(oldFilePath, newFilePath, Change::TestOnly);
}
bool QmakePriFile::renameFile(const QString &filePath, const QString &newFilePath)
bool QmakePriFile::renameFile(const FilePath &oldFilePath, const FilePath &newFilePath)
{
if (newFilePath.isEmpty())
return false;
bool changeProFileOptional = deploysFolder(QFileInfo(filePath).absolutePath());
if (renameFile(filePath, newFilePath, Change::Save))
bool changeProFileOptional = deploysFolder(oldFilePath.absolutePath().toString());
if (renameFile(oldFilePath, newFilePath, Change::Save))
return true;
return changeProFileOptional;
}
@@ -798,7 +798,7 @@ bool QmakePriFile::prepareForChange()
return saveModifiedEditors() && ensureWriteableProFile(filePath().toString());
}
bool QmakePriFile::renameFile(const QString &oldName, const QString &newName, Change mode)
bool QmakePriFile::renameFile(const FilePath &oldFilePath, const FilePath &newFilePath, Change mode)
{
if (!prepareForChange())
return false;
@@ -812,14 +812,12 @@ bool QmakePriFile::renameFile(const QString &oldName, const QString &newName, Ch
QDir priFileDir = QDir(m_qmakeProFile->directoryPath().toString());
ProWriter::VarLocations removedLocations;
const QStringList notChanged = ProWriter::removeFiles(
includeFile,
&lines,
priFileDir,
QStringList(oldName),
varNamesForRemoving(),
&removedLocations
);
const QStringList notChanged = ProWriter::removeFiles(includeFile,
&lines,
priFileDir,
{oldFilePath.toString()},
varNamesForRemoving(),
&removedLocations);
includeFile->deref();
if (!notChanged.isEmpty())
@@ -828,7 +826,7 @@ bool QmakePriFile::renameFile(const QString &oldName, const QString &newName, Ch
int endLine = lines.count();
reverseForeach(removedLocations,
[this, &newName, &lines, &endLine](const ProWriter::VarLocation &loc) {
[this, &newFilePath, &lines, &endLine](const ProWriter::VarLocation &loc) {
QStringList currentLines = lines.mid(loc.second, endLine - loc.second);
const QString currentContents = currentLines.join('\n');
@@ -841,7 +839,11 @@ bool QmakePriFile::renameFile(const QString &oldName, const QString &newName, Ch
QMakeParser::FullGrammar);
QTC_ASSERT(proFile, return); // The file should still be valid after what we did.
ProWriter::addFiles(proFile, &currentLines, {newName}, loc.first, continuationIndent());
ProWriter::addFiles(proFile,
&currentLines,
{newFilePath.toString()},
loc.first,
continuationIndent());
lines = lines.mid(0, loc.second) + currentLines + lines.mid(endLine);
endLine = loc.second;
proFile->deref();