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

Abi: Some more cleanup

Browse Source 
* Replace << with initializer lists
* Replace C-Style cast

Change-Id: Ie308e9975a755cccae0fa5ad2655a83a082b4ec7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Orgad Shaneh
2017-07-26 22:40:53 +03:00
committed by Orgad Shaneh
parent 3ae0b2eeaf
commit f240abd214
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/projectexplorer/abi.cpp
View File

@@ -580,13 +580,8 @@ Abi Abi::abiFromTargetTriplet(const QString &triple)
QString Abi::toString() const QString Abi::toString() const
{ {
QStringList dn; const QStringList dn = {toString(m_architecture), toString(m_os), toString(m_osFlavor),
dn << toString(m_architecture); toString(m_binaryFormat), toString(m_wordWidth)};
dn << toString(m_os);
dn << toString(m_osFlavor);
dn << toString(m_binaryFormat);
dn << toString(m_wordWidth);
return dn.join('-'); return dn.join('-');
} }
@@ -777,24 +772,23 @@ QList<Abi::OSFlavor> Abi::flavorsForOs(const Abi::OS &o)
QList<OSFlavor> result; QList<OSFlavor> result;
switch (o) { switch (o) {
case BsdOS: case BsdOS:
return result << FreeBsdFlavor << OpenBsdFlavor << NetBsdFlavor << UnknownFlavor; return {FreeBsdFlavor, OpenBsdFlavor, NetBsdFlavor, UnknownFlavor};
case LinuxOS: case LinuxOS:
return result << GenericLinuxFlavor << AndroidLinuxFlavor << UnknownFlavor; return {GenericLinuxFlavor, AndroidLinuxFlavor, UnknownFlavor};
case DarwinOS: case DarwinOS:
return result << GenericDarwinFlavor << UnknownFlavor; return {GenericDarwinFlavor, UnknownFlavor};
case UnixOS: case UnixOS:
return result << GenericUnixFlavor << SolarisUnixFlavor << UnknownFlavor; return {GenericUnixFlavor, SolarisUnixFlavor, UnknownFlavor};
case WindowsOS: case WindowsOS:
return result << WindowsMsvc2005Flavor << WindowsMsvc2008Flavor << WindowsMsvc2010Flavor return {WindowsMsvc2005Flavor, WindowsMsvc2008Flavor, WindowsMsvc2010Flavor,
<< WindowsMsvc2012Flavor << WindowsMsvc2013Flavor << WindowsMsvc2015Flavor WindowsMsvc2012Flavor, WindowsMsvc2013Flavor, WindowsMsvc2015Flavor,
<< WindowsMsvc2017Flavor WindowsMsvc2017Flavor , WindowsMSysFlavor, WindowsCEFlavor, UnknownFlavor};
<< WindowsMSysFlavor << WindowsCEFlavor << UnknownFlavor;
case VxWorks: case VxWorks:
return result << VxWorksFlavor << UnknownFlavor; return {VxWorksFlavor, UnknownFlavor};
case QnxOS: case QnxOS:
return result << GenericQnxFlavor << UnknownFlavor; return {GenericQnxFlavor, UnknownFlavor};
case UnknownOS: case UnknownOS:
return result << UnknownFlavor; return {UnknownFlavor};
default: default:
break; break;
} }
@@ -1225,7 +1219,8 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet()
const Abi expectedAbi = Abi(Abi::Architecture(architecture), const Abi expectedAbi = Abi(Abi::Architecture(architecture),
Abi::OS(os), Abi::OSFlavor(osFlavor), Abi::OS(os), Abi::OSFlavor(osFlavor),
Abi::BinaryFormat(binaryFormat), (unsigned char)wordWidth); Abi::BinaryFormat(binaryFormat),
static_cast<unsigned char>(wordWidth));
QCOMPARE(Abi::abiFromTargetTriplet(QLatin1String(QTest::currentDataTag())), expectedAbi); QCOMPARE(Abi::abiFromTargetTriplet(QLatin1String(QTest::currentDataTag())), expectedAbi);
} }