From 8d8e60436da8103f98147c45a9c6da7cd31fcb80 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 1 Aug 2023 20:52:58 +0200 Subject: ProjectExplorer: Simplify return statements Change-Id: Ifef006cd2dcc567097ce16376eab9ccedb092f04 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/project.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/plugins/projectexplorer/project.cpp') diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index c541d04773..85a3850447 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -725,7 +725,7 @@ FilePath Project::projectDirectory() const FilePath Project::projectDirectory(const FilePath &top) { if (top.isEmpty()) - return FilePath(); + return {}; return top.absolutePath(); } @@ -1232,10 +1232,10 @@ void Project::addVariablesToMacroExpander(const QByteArray &prefix, //: %1 is something like "Active project" ::PE::Tr::tr("%1: Variables in the active build environment.") .arg(descriptor), - [bcGetter](const QString &var) { + [bcGetter](const QString &var) -> QString { if (BuildConfiguration *const bc = bcGetter()) return bc->environment().expandedValueForKey(var); - return QString(); + return {}; }); expander->registerVariable(fullPrefix + "RunConfig:Name", @@ -1245,7 +1245,7 @@ void Project::addVariablesToMacroExpander(const QByteArray &prefix, [rcGetter]() -> QString { if (const RunConfiguration *const rc = rcGetter()) return rc->displayName(); - return QString(); + return {}; }); expander->registerFileVariables(fullPrefix + "RunConfig:Executable", //: %1 is something like "Active project" @@ -1262,25 +1262,25 @@ void Project::addVariablesToMacroExpander(const QByteArray &prefix, ::PE::Tr::tr( "%1: Variables in the environment of the active run configuration.") .arg(descriptor), - [rcGetter](const QString &var) { + [rcGetter](const QString &var) -> QString { if (const RunConfiguration *const rc = rcGetter()) { if (const auto envAspect = rc->aspect()) return envAspect->environment().expandedValueForKey(var); } - return QString(); + return {}; }); expander->registerVariable(fullPrefix + "RunConfig:WorkingDir", //: %1 is something like "Active project" ::PE::Tr::tr( "%1: Working directory of the active run configuration.") .arg(descriptor), - [rcGetter] { + [rcGetter]() -> QString { if (const RunConfiguration *const rc = rcGetter()) { if (const auto wdAspect = rc->aspect()) return wdAspect->workingDirectory().toString(); } - return QString(); + return {}; }); } -- cgit v1.2.3