From 82be99a53ea99ea3a63a76a3a1fa895753b7a919 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 20 May 2020 13:22:10 +0200 Subject: [PATCH] Utils: Rename FilePath::rawFileName to rawFilePath Change-Id: Idf8cad2b18087f511aa1efe54adbb5a427660016 Reviewed-by: Eike Ziller --- src/libs/utils/pathchooser.cpp | 6 +++--- src/libs/utils/pathchooser.h | 2 +- src/plugins/projectexplorer/runconfigurationaspects.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 53de5680dd0..01e2fa3e5fe 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -312,17 +312,17 @@ void PathChooser::setEnvironment(const Environment &env) QString PathChooser::rawPath() const { - return rawFileName().toString(); + return rawFilePath().toString(); } -FilePath PathChooser::rawFileName() const +FilePath PathChooser::rawFilePath() const { return FilePath::fromString(QDir::fromNativeSeparators(d->m_lineEdit->text())); } FilePath PathChooser::filePath() const { - return FilePath::fromUserInput(d->expandedPath(rawFileName().toString())); + return FilePath::fromUserInput(d->expandedPath(rawFilePath().toString())); } // FIXME: try to remove again diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h index ade301b3d0b..cc864b48be1 100644 --- a/src/libs/utils/pathchooser.h +++ b/src/libs/utils/pathchooser.h @@ -91,7 +91,7 @@ public: FilePath filePath() const; QString rawPath() const; // The raw unexpanded input. - FilePath rawFileName() const; // The raw unexpanded input. + FilePath rawFilePath() const; // The raw unexpanded input as FilePath. static QString expandedDirectory(const QString &input, const Environment &env, const QString &baseDir); diff --git a/src/plugins/projectexplorer/runconfigurationaspects.cpp b/src/plugins/projectexplorer/runconfigurationaspects.cpp index 238cd4a698a..0324b673d55 100644 --- a/src/plugins/projectexplorer/runconfigurationaspects.cpp +++ b/src/plugins/projectexplorer/runconfigurationaspects.cpp @@ -151,7 +151,7 @@ void WorkingDirectoryAspect::addToLayout(LayoutBuilder &builder) m_chooser->setFilePath(m_workingDirectory.isEmpty() ? m_defaultWorkingDirectory : m_workingDirectory); connect(m_chooser.data(), &PathChooser::pathChanged, this, [this]() { - m_workingDirectory = m_chooser->rawFileName(); + m_workingDirectory = m_chooser->rawFilePath(); m_resetButton->setEnabled(m_workingDirectory != m_defaultWorkingDirectory); });