From f240abd214f99e7887301626940849e452f7d13a Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 26 Jul 2017 22:40:53 +0300 Subject: [PATCH] Abi: Some more cleanup * Replace << with initializer lists * Replace C-Style cast Change-Id: Ie308e9975a755cccae0fa5ad2655a83a082b4ec7 Reviewed-by: Orgad Shaneh --- src/plugins/projectexplorer/abi.cpp | 33 ++++++++++++----------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index 6f83e2379fc..3c7017ed196 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -580,13 +580,8 @@ Abi Abi::abiFromTargetTriplet(const QString &triple) QString Abi::toString() const { - QStringList dn; - dn << toString(m_architecture); - dn << toString(m_os); - dn << toString(m_osFlavor); - dn << toString(m_binaryFormat); - dn << toString(m_wordWidth); - + const QStringList dn = {toString(m_architecture), toString(m_os), toString(m_osFlavor), + toString(m_binaryFormat), toString(m_wordWidth)}; return dn.join('-'); } @@ -777,24 +772,23 @@ QList Abi::flavorsForOs(const Abi::OS &o) QList result; switch (o) { case BsdOS: - return result << FreeBsdFlavor << OpenBsdFlavor << NetBsdFlavor << UnknownFlavor; + return {FreeBsdFlavor, OpenBsdFlavor, NetBsdFlavor, UnknownFlavor}; case LinuxOS: - return result << GenericLinuxFlavor << AndroidLinuxFlavor << UnknownFlavor; + return {GenericLinuxFlavor, AndroidLinuxFlavor, UnknownFlavor}; case DarwinOS: - return result << GenericDarwinFlavor << UnknownFlavor; + return {GenericDarwinFlavor, UnknownFlavor}; case UnixOS: - return result << GenericUnixFlavor << SolarisUnixFlavor << UnknownFlavor; + return {GenericUnixFlavor, SolarisUnixFlavor, UnknownFlavor}; case WindowsOS: - return result << WindowsMsvc2005Flavor << WindowsMsvc2008Flavor << WindowsMsvc2010Flavor - << WindowsMsvc2012Flavor << WindowsMsvc2013Flavor << WindowsMsvc2015Flavor - << WindowsMsvc2017Flavor - << WindowsMSysFlavor << WindowsCEFlavor << UnknownFlavor; + return {WindowsMsvc2005Flavor, WindowsMsvc2008Flavor, WindowsMsvc2010Flavor, + WindowsMsvc2012Flavor, WindowsMsvc2013Flavor, WindowsMsvc2015Flavor, + WindowsMsvc2017Flavor , WindowsMSysFlavor, WindowsCEFlavor, UnknownFlavor}; case VxWorks: - return result << VxWorksFlavor << UnknownFlavor; + return {VxWorksFlavor, UnknownFlavor}; case QnxOS: - return result << GenericQnxFlavor << UnknownFlavor; + return {GenericQnxFlavor, UnknownFlavor}; case UnknownOS: - return result << UnknownFlavor; + return {UnknownFlavor}; default: break; } @@ -1225,7 +1219,8 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet() const Abi expectedAbi = Abi(Abi::Architecture(architecture), Abi::OS(os), Abi::OSFlavor(osFlavor), - Abi::BinaryFormat(binaryFormat), (unsigned char)wordWidth); + Abi::BinaryFormat(binaryFormat), + static_cast(wordWidth)); QCOMPARE(Abi::abiFromTargetTriplet(QLatin1String(QTest::currentDataTag())), expectedAbi); }