From 59c01481d1d84a77fde8a058b531203f614c98c2 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 17 Aug 2021 13:37:20 +0200 Subject: Core: PatchTool code cosmetics Some more FilePath use, QLatin*, static, ... Also fix default settings values, amends e2eab0e0 insofar. Change-Id: I8e40ca9629351db3b3095636b4ea29a204f86da6 Reviewed-by: Jarek Kobus --- src/plugins/vcsbase/vcsbaseeditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/vcsbase/vcsbaseeditor.cpp') diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 1bfe550bc4..d24b96dd5f 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -1539,7 +1539,7 @@ bool VcsBaseEditorWidget::canApplyDiffChunk(const DiffChunk &dc) const bool VcsBaseEditorWidget::applyDiffChunk(const DiffChunk &dc, bool revert) const { return Core::PatchTool::runPatch(dc.asPatch(d->m_workingDirectory), - d->m_workingDirectory, 0, revert); + FilePath::fromString(d->m_workingDirectory), 0, revert); } QString VcsBaseEditorWidget::fileNameFromDiffSpecification(const QTextBlock &inBlock, QString *header) const -- cgit v1.2.1