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

Utils: Shuffle PathChooser expansion responsibility around

Browse Source 
Change-Id: Iaee0c21e8e1c99cc034bee5b892587d3137b5508
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2021-12-16 11:07:33 +01:00
parent f1ff0a90e0
commit 8295714ff6
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,7 @@ class PathChooserPrivate
public: public:
PathChooserPrivate(); PathChooserPrivate();
FilePath expandedPath(const QString &path) const; FilePath expandedPath(const FilePath &path) const;
QHBoxLayout *m_hLayout = nullptr; QHBoxLayout *m_hLayout = nullptr;
FancyLineEdit *m_lineEdit = nullptr; FancyLineEdit *m_lineEdit = nullptr;
@@ -202,12 +202,12 @@ PathChooserPrivate::PathChooserPrivate()
{ {
} }
FilePath PathChooserPrivate::expandedPath(const QString &input) const FilePath PathChooserPrivate::expandedPath(const FilePath &input) const
{ {
if (input.isEmpty()) if (input.isEmpty())
return {}; return {};
FilePath path = FilePath::fromUserInput(input); FilePath path = input;
Environment env = path.deviceEnvironment(); Environment env = path.deviceEnvironment();
m_environmentChange.applyToEnvironment(env); m_environmentChange.applyToEnvironment(env);
@@ -353,7 +353,7 @@ FilePath PathChooser::rawFilePath() const
FilePath PathChooser::filePath() const FilePath PathChooser::filePath() const
{ {
return d->expandedPath(rawFilePath().toString()); return d->expandedPath(rawFilePath());
} }
FilePath PathChooser::absoluteFilePath() const FilePath PathChooser::absoluteFilePath() const
@@ -529,11 +529,11 @@ FancyLineEdit::ValidationFunction PathChooser::defaultValidationFunction() const
bool PathChooser::validatePath(FancyLineEdit *edit, QString *errorMessage) const bool PathChooser::validatePath(FancyLineEdit *edit, QString *errorMessage) const
{ {
QString path = edit->text(); QString input = edit->text();
if (path.isEmpty()) { if (input.isEmpty()) {
if (!d->m_defaultValue.isEmpty()) { if (!d->m_defaultValue.isEmpty()) {
path = d->m_defaultValue; input = d->m_defaultValue;
} else { } else {
if (errorMessage) if (errorMessage)
*errorMessage = tr("The path must not be empty."); *errorMessage = tr("The path must not be empty.");
@@ -541,10 +541,10 @@ bool PathChooser::validatePath(FancyLineEdit *edit, QString *errorMessage) const
} }
} }
const FilePath filePath = d->expandedPath(path); const FilePath filePath = d->expandedPath(FilePath::fromUserInput(input));
if (filePath.isEmpty()) { if (filePath.isEmpty()) {
if (errorMessage) if (errorMessage)
*errorMessage = tr("The path \"%1\" expanded to an empty string.").arg(QDir::toNativeSeparators(path)); *errorMessage = tr("The path \"%1\" expanded to an empty string.").arg(input);
return false; return false;
} }