ProjectExplorer: Introduce ToolChainKitAspect::{c,cxx}ToolChain

Special accessors to the repeatedly used C and C++ cases to denoise
and slim down user code.  Plus some code cosmetics nearby.

Change-Id: Iba4662bd4731d8c4256e658529f39d5c995691ce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 13 insertions, 14 deletions

diff --git a/src/plugins/perfprofiler/perfdatareader.cpp b/src/plugins/perfprofiler/perfdatareader.cpp
index 4902c1fd20..48dcaf645f 100644
--- a/src/plugins/perfprofiler/perfdatareader.cpp
+++ b/src/plugins/perfprofiler/perfdatareader.cpp
@@ -54,6 +54,8 @@
 #include <QTextStream>
 #include <QtEndian>
 
+using namespace ProjectExplorer;
+
 namespace PerfProfiler {
 namespace Internal {
 
@@ -289,15 +291,14 @@ bool PerfDataReader::acceptsSamples() const
     return m_recording;
 }
 
-QStringList PerfDataReader::collectArguments(const QString &executableDirPath,
-                                             const ProjectExplorer::Kit *kit) const
+QStringList PerfDataReader::collectArguments(const QString &executableDirPath, const Kit *kit) const
 {
     QStringList arguments;
     if (!executableDirPath.isEmpty())
-        arguments << QLatin1String("--app") << executableDirPath;
+        arguments << "--app" << executableDirPath;
 
     if (QtSupport::BaseQtVersion *qt = QtSupport::QtKitAspect::qtVersion(kit)) {
-        arguments << QLatin1String("--extra") << QString::fromLatin1("%1%5%2%5%3%5%4")
+        arguments << "--extra" << QString("%1%5%2%5%3%5%4")
                      .arg(QDir::toNativeSeparators(qt->libraryPath().toString()))
                      .arg(QDir::toNativeSeparators(qt->pluginPath().toString()))
                      .arg(QDir::toNativeSeparators(qt->hostBinPath().toString()))
@@ -305,20 +306,18 @@ QStringList PerfDataReader::collectArguments(const QString &executableDirPath,
                      .arg(QDir::listSeparator());
     }
 
-    if (auto toolChain = ProjectExplorer::ToolChainKitAspect::toolChain(
-                kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID)) {
-        ProjectExplorer::Abi::Architecture architecture = toolChain->targetAbi().architecture();
-        if (architecture == ProjectExplorer::Abi::ArmArchitecture &&
-                toolChain->targetAbi().wordWidth() == 64) {
-            arguments << QLatin1String("--arch") << QLatin1String("aarch64");
-        } else if (architecture != ProjectExplorer::Abi::UnknownArchitecture) {
-            arguments << QLatin1String("--arch") << ProjectExplorer::Abi::toString(architecture);
+    if (auto toolChain = ToolChainKitAspect::cxxToolChain(kit)) {
+        Abi::Architecture architecture = toolChain->targetAbi().architecture();
+        if (architecture == Abi::ArmArchitecture && toolChain->targetAbi().wordWidth() == 64) {
+            arguments << "--arch" << "aarch64";
+        } else if (architecture != Abi::UnknownArchitecture) {
+            arguments << "--arch" << Abi::toString(architecture);
         }
     }
 
-    QString sysroot = ProjectExplorer::SysRootKitAspect::sysRoot(kit).toString();
+    QString sysroot = SysRootKitAspect::sysRoot(kit).toString();
     if (!sysroot.isEmpty())
-        arguments << QLatin1String("--sysroot") << sysroot;
+        arguments << "--sysroot" << sysroot;
 
     return arguments;
 }