Directly construct KitAspect::toUserOutput return values

Less dependent on used type and actually saves cycles.

Change-Id: I87344172c330198e98c11205a80862b3b30271e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-05-28 08:28:51 +02:00
parent 92a52a7181
commit 33ea685a91
5 changed files with 10 additions and 12 deletions

View File

@@ -98,8 +98,7 @@ bool AndroidGdbServerKitAspect::isApplicableToKit(const Kit *k) const
KitAspect::ItemList AndroidGdbServerKitAspect::toUserOutput(const Kit *kit) const KitAspect::ItemList AndroidGdbServerKitAspect::toUserOutput(const Kit *kit) const
{ {
return KitAspect::ItemList() return {{tr("GDB server"), AndroidGdbServerKitAspect::gdbServer(kit).toUserOutput()}};
<< qMakePair(tr("GDB server"), AndroidGdbServerKitAspect::gdbServer(kit).toUserOutput());
} }
KitAspectWidget *AndroidGdbServerKitAspect::createConfigWidget(Kit *kit) const KitAspectWidget *AndroidGdbServerKitAspect::createConfigWidget(Kit *kit) const

View File

@@ -275,7 +275,7 @@ void CMakeKitAspect::fix(Kit *k)
KitAspect::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const KitAspect::ItemList CMakeKitAspect::toUserOutput(const Kit *k) const
{ {
const CMakeTool *const tool = cmakeTool(k); const CMakeTool *const tool = cmakeTool(k);
return ItemList() << qMakePair(tr("CMake"), tool ? tool->displayName() : tr("Unconfigured")); return {{tr("CMake"), tool ? tool->displayName() : tr("Unconfigured")}};
} }
KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const KitAspectWidget *CMakeKitAspect::createConfigWidget(Kit *k) const
@@ -755,7 +755,7 @@ KitAspect::ItemList CMakeGeneratorKitAspect::toUserOutput(const Kit *k) const
if (!info.toolset.isEmpty()) if (!info.toolset.isEmpty())
message += "<br/>" + tr("Toolset: %1").arg(info.toolset); message += "<br/>" + tr("Toolset: %1").arg(info.toolset);
} }
return ItemList() << qMakePair(tr("CMake Generator"), message); return {{tr("CMake Generator"), message}};
} }
KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const KitAspectWidget *CMakeGeneratorKitAspect::createConfigWidget(Kit *k) const
@@ -1063,8 +1063,7 @@ void CMakeConfigurationKitAspect::fix(Kit *k)
KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const KitAspect::ItemList CMakeConfigurationKitAspect::toUserOutput(const Kit *k) const
{ {
const QStringList current = toStringList(k); return {{tr("CMake Configuration"), toStringList(k).join("<br>")}};
return ItemList() << qMakePair(tr("CMake Configuration"), current.join(QLatin1String("<br>")));
} }
KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const

View File

@@ -418,7 +418,7 @@ void DebuggerKitAspect::addToMacroExpander(Kit *kit, MacroExpander *expander) co
KitAspect::ItemList DebuggerKitAspect::toUserOutput(const Kit *k) const KitAspect::ItemList DebuggerKitAspect::toUserOutput(const Kit *k) const
{ {
return ItemList() << qMakePair(tr("Debugger"), displayString(k)); return {{tr("Debugger"), displayString(k)}};
} }
DebuggerEngineType DebuggerKitAspect::engineType(const Kit *k) DebuggerEngineType DebuggerKitAspect::engineType(const Kit *k)

View File

@@ -156,7 +156,7 @@ KitAspectWidget *SysRootKitAspect::createConfigWidget(Kit *k) const
KitAspect::ItemList SysRootKitAspect::toUserOutput(const Kit *k) const KitAspect::ItemList SysRootKitAspect::toUserOutput(const Kit *k) const
{ {
return ItemList() << qMakePair(tr("Sys Root"), sysRoot(k).toUserOutput()); return {{tr("Sys Root"), sysRoot(k).toUserOutput()}};
} }
void SysRootKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const void SysRootKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const
@@ -524,7 +524,7 @@ QString ToolChainKitAspect::displayNamePostfix(const Kit *k) const
KitAspect::ItemList ToolChainKitAspect::toUserOutput(const Kit *k) const KitAspect::ItemList ToolChainKitAspect::toUserOutput(const Kit *k) const
{ {
ToolChain *tc = toolChain(k, Constants::CXX_LANGUAGE_ID); ToolChain *tc = toolChain(k, Constants::CXX_LANGUAGE_ID);
return ItemList() << qMakePair(tr("Compiler"), tc ? tc->displayName() : tr("None")); return {{tr("Compiler"), tc ? tc->displayName() : tr("None")}};
} }
void ToolChainKitAspect::addToEnvironment(const Kit *k, Utils::Environment &env) const void ToolChainKitAspect::addToEnvironment(const Kit *k, Utils::Environment &env) const
@@ -830,7 +830,7 @@ KitAspect::ItemList DeviceTypeKitAspect::toUserOutput(const Kit *k) const
if (IDeviceFactory *factory = IDeviceFactory::find(type)) if (IDeviceFactory *factory = IDeviceFactory::find(type))
typeDisplayName = factory->displayName(); typeDisplayName = factory->displayName();
} }
return ItemList() << qMakePair(tr("Device type"), typeDisplayName); return {{tr("Device type"), typeDisplayName}};
} }
const Core::Id DeviceTypeKitAspect::id() const Core::Id DeviceTypeKitAspect::id()
@@ -1020,7 +1020,7 @@ QString DeviceKitAspect::displayNamePostfix(const Kit *k) const
KitAspect::ItemList DeviceKitAspect::toUserOutput(const Kit *k) const KitAspect::ItemList DeviceKitAspect::toUserOutput(const Kit *k) const
{ {
IDevice::ConstPtr dev = device(k); IDevice::ConstPtr dev = device(k);
return ItemList() << qMakePair(tr("Device"), dev.isNull() ? tr("Unconfigured") : dev->displayName()); return {{tr("Device"), dev.isNull() ? tr("Unconfigured") : dev->displayName()}};
} }
void DeviceKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const void DeviceKitAspect::addToMacroExpander(Kit *kit, Utils::MacroExpander *expander) const

View File

@@ -229,7 +229,7 @@ ProjectExplorer::KitAspect::ItemList
QtKitAspect::toUserOutput(const ProjectExplorer::Kit *k) const QtKitAspect::toUserOutput(const ProjectExplorer::Kit *k) const
{ {
BaseQtVersion *version = qtVersion(k); BaseQtVersion *version = qtVersion(k);
return ItemList() << qMakePair(tr("Qt version"), version ? version->displayName() : tr("None")); return {{tr("Qt version"), version ? version->displayName() : tr("None")}};
} }
void QtKitAspect::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const void QtKitAspect::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const