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

Utils: Rename PathChooser::{f,setF}ileName() to {f,setF}ilePath()

Browse Source 
It's returning a FilePath, so it's a better fit.

Keep the old versions as inline function now to ease downstream migration.

Change-Id: I535887928018f42b92895c8b0c82527f0d55e5ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
hjk
2020-04-09 11:05:50 +02:00
parent 45ba9fcd53
commit 79b680e7f0
44 changed files with 136 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,7 +310,7 @@ QString PathChooser::rawPath() const
QString PathChooser::path() const
{
return fileName().toString();
return filePath().toString();
}
FilePath PathChooser::rawFileName() const
@@ -318,7 +318,7 @@ FilePath PathChooser::rawFileName() const
return FilePath::fromString(QDir::fromNativeSeparators(d->m_lineEdit->text()));
}
FilePath PathChooser::fileName() const
FilePath PathChooser::filePath() const
{
return FilePath::fromUserInput(d->expandedPath(rawFileName().toString()));
}
@@ -342,7 +342,7 @@ void PathChooser::setPath(const QString &path)
d->m_lineEdit->setTextKeepingActiveCursor(QDir::toNativeSeparators(path));
}
void PathChooser::setFileName(const FilePath &fn)
void PathChooser::setFilePath(const FilePath &fn)
{
d->m_lineEdit->setTextKeepingActiveCursor(fn.toUserOutput());
}