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

Utils: Rename FilePath::rawFileName to rawFilePath

Browse Source 
Change-Id: Idf8cad2b18087f511aa1efe54adbb5a427660016
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-05-20 13:22:10 +02:00
parent 40dd6fc185
commit 82be99a53e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/pathchooser.cpp
View File

@@ -312,17 +312,17 @@ void PathChooser::setEnvironment(const Environment &env)
QString PathChooser::rawPath() const 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())); return FilePath::fromString(QDir::fromNativeSeparators(d->m_lineEdit->text()));
} }
FilePath PathChooser::filePath() const FilePath PathChooser::filePath() const
{ {
return FilePath::fromUserInput(d->expandedPath(rawFileName().toString())); return FilePath::fromUserInput(d->expandedPath(rawFilePath().toString()));
} }
// FIXME: try to remove again // FIXME: try to remove again

2
src/libs/utils/pathchooser.h
View File

@@ -91,7 +91,7 @@ public:
FilePath filePath() const; FilePath filePath() const;
QString rawPath() const; // The raw unexpanded input. 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, static QString expandedDirectory(const QString &input, const Environment &env,
const QString &baseDir); const QString &baseDir);

2
src/plugins/projectexplorer/runconfigurationaspects.cpp
View File

@@ -151,7 +151,7 @@ void WorkingDirectoryAspect::addToLayout(LayoutBuilder &builder)
m_chooser->setFilePath(m_workingDirectory.isEmpty() ? m_defaultWorkingDirectory : m_workingDirectory); m_chooser->setFilePath(m_workingDirectory.isEmpty() ? m_defaultWorkingDirectory : m_workingDirectory);
connect(m_chooser.data(), &PathChooser::pathChanged, this, connect(m_chooser.data(), &PathChooser::pathChanged, this,
[this]() { [this]() {
m_workingDirectory = m_chooser->rawFileName(); m_workingDirectory = m_chooser->rawFilePath();
m_resetButton->setEnabled(m_workingDirectory != m_defaultWorkingDirectory); m_resetButton->setEnabled(m_workingDirectory != m_defaultWorkingDirectory);
}); });