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

Utils: Remove Utils::FileUtils::renameFile()

Browse Source 
There's FilePath::renameFile() nowadays.

Change-Id: Id37f24910f0c608ccfa6e52c5608c6707353a073
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-09-13 16:39:39 +02:00
parent 64324db662
commit f6f7f410dd
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/filepath.cpp
View File

@@ -417,13 +417,6 @@ FilePath FileUtils::homePath()
return FilePath::fromString(QDir::cleanPath(QDir::homePath())); return FilePath::fromString(QDir::cleanPath(QDir::homePath()));
} }
bool FileUtils::renameFile(const FilePath &srcFilePath, const FilePath &tgtFilePath)
{
QTC_ASSERT(!srcFilePath.needsDevice(), return false);
QTC_ASSERT(srcFilePath.scheme() == tgtFilePath.scheme(), return false);
return QFile::rename(srcFilePath.path(), tgtFilePath.path());
}
/*! \class Utils::FilePath /*! \class Utils::FilePath

1
src/libs/utils/fileutils.h
View File

@@ -137,7 +137,6 @@ public:
static FilePath commonPath(const FilePath &oldCommonPath, const FilePath &fileName); static FilePath commonPath(const FilePath &oldCommonPath, const FilePath &fileName);
static QByteArray fileId(const FilePath &fileName); static QByteArray fileId(const FilePath &fileName);
static FilePath homePath(); static FilePath homePath();
static bool renameFile(const FilePath &srcFilePath, const FilePath &tgtFilePath);
static void setDeviceFileHooks(const DeviceFileHooks &hooks); static void setDeviceFileHooks(const DeviceFileHooks &hooks);

2
src/plugins/coreplugin/fileutils.cpp
View File

@@ -206,7 +206,7 @@ bool FileUtils::renameFile(const FilePath &orgFilePath, const FilePath &newFileP
if (vc && vc->supportsOperation(IVersionControl::MoveOperation)) if (vc && vc->supportsOperation(IVersionControl::MoveOperation))
result = vc->vcsMove(orgFilePath, newFilePath); result = vc->vcsMove(orgFilePath, newFilePath);
if (!result) // The moving via vcs failed or the vcs does not support moving, fall back if (!result) // The moving via vcs failed or the vcs does not support moving, fall back
result = Utils::FileUtils::renameFile(orgFilePath, newFilePath); result = orgFilePath.renameFile(newFilePath);
if (result) { if (result) {
// yeah we moved, tell the filemanager about it // yeah we moved, tell the filemanager about it
DocumentManager::renamedFile(orgFilePath, newFilePath); DocumentManager::renamedFile(orgFilePath, newFilePath);