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

Utils: Move PathChooser::expandedDirectory() to its only user

Browse Source 
... and simplify its use given the always empty base dir there.

Change-Id: Ieeff7f31653db1512edc2cc448f80efc9bb7222e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2023-01-12 10:40:02 +01:00
parent 156ef28d90
commit ea1d729669
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,20 +354,6 @@ FilePath PathChooser::absoluteFilePath() const
return d->m_baseDirectory.resolvePath(filePath()); return d->m_baseDirectory.resolvePath(filePath());
} }
// FIXME: try to remove again
QString PathChooser::expandedDirectory(const QString &input, const Environment &env,
const QString &baseDir)
{
if (input.isEmpty())
return input;
const QString path = QDir::cleanPath(env.expandVariables(input));
if (path.isEmpty())
return path;
if (!baseDir.isEmpty() && QFileInfo(path).isRelative())
return QFileInfo(baseDir + '/' + path).absoluteFilePath();
return path;
}
void PathChooser::setPath(const QString &path) void PathChooser::setPath(const QString &path)
{ {
QTC_ASSERT(!d->m_callGuard.isLocked(), return); QTC_ASSERT(!d->m_callGuard.isLocked(), return);

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

@@ -73,9 +73,6 @@ public:
FilePath rawFilePath() const; // The raw unexpanded input as FilePath. FilePath rawFilePath() const; // The raw unexpanded input as FilePath.
static QString expandedDirectory(const QString &input, const Environment &env,
const QString &baseDir);
FilePath baseDirectory() const; FilePath baseDirectory() const;
void setBaseDirectory(const FilePath &base); void setBaseDirectory(const FilePath &base);

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

@@ -238,7 +238,10 @@ FilePath WorkingDirectoryAspect::workingDirectory() const
QString workingDir = m_workingDirectory.path(); QString workingDir = m_workingDirectory.path();
if (m_macroExpander) if (m_macroExpander)
workingDir = m_macroExpander->expandProcessArgs(workingDir); workingDir = m_macroExpander->expandProcessArgs(workingDir);
return m_workingDirectory.withNewPath(PathChooser::expandedDirectory(workingDir, env, QString()));
QString res = workingDir.isEmpty() ? QString() : QDir::cleanPath(env.expandVariables(workingDir));
return m_workingDirectory.withNewPath(res);
} }
FilePath WorkingDirectoryAspect::defaultWorkingDirectory() const FilePath WorkingDirectoryAspect::defaultWorkingDirectory() const