diff options
| author | hjk <[email protected]> | 2021-08-09 08:53:40 +0200 |
|---|---|---|
| committer | hjk <[email protected]> | 2021-08-10 07:19:10 +0000 |
| commit | 2ab2d9675338f5434936b315712539f4b01cd2c6 (patch) | |
| tree | 4fa4e62f7359dc24df93f4fabbdf5eba1c430c9c /src/libs/utils/fileutils.cpp | |
| parent | c179ce867c2ee4d41bd6c7f8acd1874d81cb49d2 (diff) | |
Utils: Use FilePath in copy helpers
Change-Id: I81b367a5851c0fbcdf45c63c5536c206845a8337
Reviewed-by: Christian Stenger <[email protected]>
Diffstat (limited to 'src/libs/utils/fileutils.cpp')
| -rw-r--r-- | src/libs/utils/fileutils.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index a2b7726dd89..589d3f307c3 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -283,14 +283,13 @@ TempFileSaver::~TempFileSaver() } #ifdef QT_GUI_LIB -FileUtils::CopyAskingForOverwrite::CopyAskingForOverwrite( - QWidget *dialogParent, const std::function<void(QFileInfo)> &postOperation) +FileUtils::CopyAskingForOverwrite::CopyAskingForOverwrite(QWidget *dialogParent, const std::function<void (FilePath)> &postOperation) : m_parent(dialogParent) , m_postOperation(postOperation) {} -bool FileUtils::CopyAskingForOverwrite::operator()(const QFileInfo &src, - const QFileInfo &dest, +bool FileUtils::CopyAskingForOverwrite::operator()(const FilePath &src, + const FilePath &dest, QString *error) { bool copyFile = true; @@ -302,7 +301,7 @@ bool FileUtils::CopyAskingForOverwrite::operator()(const QFileInfo &src, m_parent, QCoreApplication::translate("Utils::FileUtils", "Overwrite File?"), QCoreApplication::translate("Utils::FileUtils", "Overwrite existing file \"%1\"?") - .arg(FilePath::fromFileInfo(dest).toUserOutput()), + .arg(dest.toUserOutput()), QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll | QMessageBox::Cancel); if (res == QMessageBox::Cancel) { @@ -316,18 +315,16 @@ bool FileUtils::CopyAskingForOverwrite::operator()(const QFileInfo &src, m_overwriteAll = true; } if (copyFile) - QFile::remove(dest.filePath()); + dest.removeFile(); } } if (copyFile) { - if (!dest.absoluteDir().exists()) - dest.absoluteDir().mkpath(dest.absolutePath()); - if (!QFile::copy(src.filePath(), dest.filePath())) { + dest.parentDir().ensureWritableDir(); + if (!src.copyFile(dest)) { if (error) { *error = QCoreApplication::translate("Utils::FileUtils", "Could not copy file \"%1\" to \"%2\".") - .arg(FilePath::fromFileInfo(src).toUserOutput(), - FilePath::fromFileInfo(dest).toUserOutput()); + .arg(src.toUserOutput(), dest.toUserOutput()); } return false; } @@ -340,7 +337,7 @@ bool FileUtils::CopyAskingForOverwrite::operator()(const QFileInfo &src, FilePaths FileUtils::CopyAskingForOverwrite::files() const { - return transform(m_files, &FilePath::fromString); + return m_files; } #endif // QT_GUI_LIB |