Commit a8ae618d authored by hjk's avatar hjk

toolchain: fix enum naming style

Reviewed-By: Tobias Hunger
parent 3331aea7
...@@ -408,10 +408,10 @@ void CMakeRunPage::initializePage() ...@@ -408,10 +408,10 @@ void CMakeRunPage::initializePage()
foreach (ProjectExplorer::ToolChain *tc, tcs) { foreach (ProjectExplorer::ToolChain *tc, tcs) {
ProjectExplorer::Abi targetAbi = tc->targetAbi(); ProjectExplorer::Abi targetAbi = tc->targetAbi();
QVariant tcVariant = qVariantFromValue(static_cast<void *>(tc)); QVariant tcVariant = qVariantFromValue(static_cast<void *>(tc));
if (targetAbi.os() == ProjectExplorer::Abi::Windows) { if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) {
if (targetAbi.osFlavor() == ProjectExplorer::Abi::Windows_msvc) if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvcFlavor)
m_generatorComboBox->addItem(tr("NMake Generator (%1)").arg(tc->displayName()), tcVariant); m_generatorComboBox->addItem(tr("NMake Generator (%1)").arg(tc->displayName()), tcVariant);
else if (targetAbi.osFlavor() == ProjectExplorer::Abi::Windows_msys) else if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMSysFlavor)
m_generatorComboBox->addItem(tr("MinGW Generator (%1)").arg(tc->displayName()), tcVariant); m_generatorComboBox->addItem(tr("MinGW Generator (%1)").arg(tc->displayName()), tcVariant);
else else
continue; continue;
...@@ -449,8 +449,8 @@ void CMakeRunPage::runCMake() ...@@ -449,8 +449,8 @@ void CMakeRunPage::runCMake()
CMakeManager *cmakeManager = m_cmakeWizard->cmakeManager(); CMakeManager *cmakeManager = m_cmakeWizard->cmakeManager();
QString generator = QLatin1String("-GCodeBlocks - Unix Makefiles"); QString generator = QLatin1String("-GCodeBlocks - Unix Makefiles");
if (tc->targetAbi().os() == ProjectExplorer::Abi::Windows) { if (tc->targetAbi().os() == ProjectExplorer::Abi::WindowsOS) {
if (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::Windows_msvc) if (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMsvcFlavor)
generator = QLatin1String("-GCodeBlocks - NMake Makefiles"); generator = QLatin1String("-GCodeBlocks - NMake Makefiles");
else else
generator = QLatin1String("-GCodeBlocks - MinGW Makefiles"); generator = QLatin1String("-GCodeBlocks - MinGW Makefiles");
......
...@@ -299,7 +299,7 @@ static inline bool validMode(DebuggerStartMode sm) ...@@ -299,7 +299,7 @@ static inline bool validMode(DebuggerStartMode sm)
return true; return true;
} }
static inline QString msgCdbDisabled(const ProjectExplorer::Abi &abi) static inline QString msgCdbDisabled(const Abi &abi)
{ {
return CdbEngine::tr("The CDB debug engine required for %1 is currently disabled."). return CdbEngine::tr("The CDB debug engine required for %1 is currently disabled.").
arg(abi.toString()); arg(abi.toString());
...@@ -337,11 +337,11 @@ bool isCdbEngineEnabled() ...@@ -337,11 +337,11 @@ bool isCdbEngineEnabled()
#endif #endif
} }
ConfigurationCheck checkCdbConfiguration(const ProjectExplorer::Abi &abi) ConfigurationCheck checkCdbConfiguration(const Abi &abi)
{ {
ConfigurationCheck check; ConfigurationCheck check;
if (abi.binaryFormat() == ProjectExplorer::Abi::Format_PE if (abi.binaryFormat() == Abi::PEFormat
&& abi.osFlavor() != ProjectExplorer::Abi::Windows_msys) { && abi.osFlavor() != Abi::WindowsMSysFlavor) {
if (!isCdbEngineEnabled()) { if (!isCdbEngineEnabled()) {
check.errorMessage = msgCdbDisabled(abi); check.errorMessage = msgCdbDisabled(abi);
check.settingsPage = CdbOptionsPage::settingsId(); check.settingsPage = CdbOptionsPage::settingsId();
...@@ -637,11 +637,11 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa ...@@ -637,11 +637,11 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
// Determine binary (force MSVC), extension lib name and path to use // Determine binary (force MSVC), extension lib name and path to use
// The extension is passed as relative name with the path variable set // The extension is passed as relative name with the path variable set
//(does not work with absolute path names) //(does not work with absolute path names)
ProjectExplorer::Abi abi = sp.toolChainAbi; Abi abi = sp.toolChainAbi;
if (abi.osFlavor() == ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR || abi.osFlavor() == ProjectExplorer::Abi::Windows_msys) if (abi.osFlavor() == Abi::UnknownFlavor
abi = ProjectExplorer::Abi(abi.architecture(), abi.os(), || abi.osFlavor() == Abi::WindowsMSysFlavor)
ProjectExplorer::Abi::Windows_msvc, abi = Abi(abi.architecture(), abi.os(), Abi::WindowsMsvcFlavor,
abi.binaryFormat(), abi.wordWidth()); abi.binaryFormat(), abi.wordWidth());
const QString executable = debuggerCore()->debuggerForAbi(abi); const QString executable = debuggerCore()->debuggerForAbi(abi);
if (executable.isEmpty()) { if (executable.isEmpty()) {
*errorMessage = tr("There is no CDB executable specified."); *errorMessage = tr("There is no CDB executable specified.");
......
...@@ -1354,7 +1354,7 @@ void DebuggerPluginPrivate::startExternalApplication() ...@@ -1354,7 +1354,7 @@ void DebuggerPluginPrivate::startExternalApplication()
// Fixme: 1 of 3 testing hacks. // Fixme: 1 of 3 testing hacks.
if (sp.processArgs.startsWith(__("@tcf@ ")) || sp.processArgs.startsWith(__("@sym@ "))) if (sp.processArgs.startsWith(__("@tcf@ ")) || sp.processArgs.startsWith(__("@sym@ ")))
// Set up an ARM Symbian Abi // Set up an ARM Symbian Abi
sp.toolChainAbi = Abi(Abi::ARM, Abi::Symbian, Abi::Symbian_device, Abi::Format_ELF, false); sp.toolChainAbi = Abi(Abi::ArmArchitecture, Abi::SymbianOS, Abi::SymbianDeviceFlavor, Abi::ElfFormat, false);
if (dlg.breakAtMain()) { if (dlg.breakAtMain()) {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
...@@ -1438,9 +1438,9 @@ void DebuggerPluginPrivate::startRemoteCdbSession() ...@@ -1438,9 +1438,9 @@ void DebuggerPluginPrivate::startRemoteCdbSession()
DebuggerStartParameters sp; DebuggerStartParameters sp;
Abi hostAbi = Abi::hostAbi(); Abi hostAbi = Abi::hostAbi();
sp.toolChainAbi = ProjectExplorer::Abi(hostAbi.architecture(), sp.toolChainAbi = ProjectExplorer::Abi(hostAbi.architecture(),
ProjectExplorer::Abi::Windows, ProjectExplorer::Abi::WindowsOS,
ProjectExplorer::Abi::Windows_msvc, ProjectExplorer::Abi::WindowsMsvcFlavor,
ProjectExplorer::Abi::Format_PE, ProjectExplorer::Abi::PEFormat,
true); true);
sp.startMode = AttachToRemote; sp.startMode = AttachToRemote;
StartRemoteCdbDialog dlg(mainWindow()); StartRemoteCdbDialog dlg(mainWindow());
......
...@@ -167,9 +167,9 @@ DebuggerEngineType DebuggerRunControlPrivate::engineForExecutable ...@@ -167,9 +167,9 @@ DebuggerEngineType DebuggerRunControlPrivate::engineForExecutable
// executables. // executables.
Abi hostAbi = Abi::hostAbi(); Abi hostAbi = Abi::hostAbi();
ConfigurationCheck check = checkDebugConfiguration(Abi(hostAbi.architecture(), ConfigurationCheck check = checkDebugConfiguration(Abi(hostAbi.architecture(),
Abi::Windows, Abi::WindowsOS,
hostAbi.osFlavor(), hostAbi.osFlavor(),
Abi::Format_PE, Abi::PEFormat,
hostAbi.wordWidth())); hostAbi.wordWidth()));
if (!check) { if (!check) {
m_errorMessage = check.errorMessage; m_errorMessage = check.errorMessage;
...@@ -224,16 +224,16 @@ DebuggerEngineType DebuggerRunControlPrivate::engineForMode ...@@ -224,16 +224,16 @@ DebuggerEngineType DebuggerRunControlPrivate::engineForMode
static DebuggerEngineType engineForToolChain(const Abi &toolChain) static DebuggerEngineType engineForToolChain(const Abi &toolChain)
{ {
switch (toolChain.binaryFormat()) { switch (toolChain.binaryFormat()) {
case Abi::Format_ELF: case Abi::ElfFormat:
case Abi::Format_Mach_O: case Abi::MachOFormat:
#ifdef WITH_LLDB #ifdef WITH_LLDB
// lldb override // lldb override
if (Core::ICore::instance()->settings()->value("LLDB/enabled").toBool()) if (Core::ICore::instance()->settings()->value("LLDB/enabled").toBool())
return LldbEngineType; return LldbEngineType;
#endif #endif
return GdbEngineType; return GdbEngineType;
case Abi::Format_PE: case Abi::PEFormat:
if (toolChain.osFlavor() == Abi::Windows_msys) if (toolChain.osFlavor() == Abi::WindowsMSysFlavor)
return GdbEngineType; return GdbEngineType;
return CdbEngineType; return CdbEngineType;
default: default:
...@@ -385,9 +385,9 @@ ConfigurationCheck checkDebugConfiguration(const Abi &abi) ...@@ -385,9 +385,9 @@ ConfigurationCheck checkDebugConfiguration(const Abi &abi)
if (!(debuggerCore()->activeLanguages() & CppLanguage)) if (!(debuggerCore()->activeLanguages() & CppLanguage))
return result; return result;
if (abi.binaryFormat() == Abi::Format_ELF || if (abi.binaryFormat() == Abi::ElfFormat ||
abi.binaryFormat() == Abi::Format_Mach_O || abi.binaryFormat() == Abi::MachOFormat ||
(abi.binaryFormat() == Abi::Format_PE && abi.osFlavor() == Abi::Windows_msys)) { (abi.binaryFormat() == Abi::PEFormat && abi.osFlavor() == Abi::WindowsMSysFlavor)) {
if (debuggerCore()->debuggerForAbi(abi).isEmpty()) { if (debuggerCore()->debuggerForAbi(abi).isEmpty()) {
result.errorMessage = msgNoBinaryForToolChain(abi); result.errorMessage = msgNoBinaryForToolChain(abi);
if (!result.errorMessage.isEmpty()) if (!result.errorMessage.isEmpty())
...@@ -395,8 +395,8 @@ ConfigurationCheck checkDebugConfiguration(const Abi &abi) ...@@ -395,8 +395,8 @@ ConfigurationCheck checkDebugConfiguration(const Abi &abi)
result.errorMessage += QLatin1Char(' ') + msgEngineNotAvailable("Gdb"); result.errorMessage += QLatin1Char(' ') + msgEngineNotAvailable("Gdb");
result.settingsPage = _(Constants::DEBUGGER_COMMON_SETTINGS_ID); result.settingsPage = _(Constants::DEBUGGER_COMMON_SETTINGS_ID);
} }
} else if (abi.binaryFormat() == Abi::Format_PE } else if (abi.binaryFormat() == Abi::PEFormat
&& abi.osFlavor() != Abi::Windows_msys) { && abi.osFlavor() != Abi::WindowsMSysFlavor) {
result = checkCdbConfiguration(abi); result = checkCdbConfiguration(abi);
if (!result) { if (!result) {
if (!result.errorMessage.isEmpty()) if (!result.errorMessage.isEmpty())
......
...@@ -102,6 +102,8 @@ ...@@ -102,6 +102,8 @@
#endif #endif
#include <ctype.h> #include <ctype.h>
using namespace ProjectExplorer;
namespace Debugger { namespace Debugger {
namespace Internal { namespace Internal {
...@@ -1805,7 +1807,7 @@ QString msgNoBinaryForToolChain(const ProjectExplorer::Abi &tc) ...@@ -1805,7 +1807,7 @@ QString msgNoBinaryForToolChain(const ProjectExplorer::Abi &tc)
AbstractGdbAdapter *GdbEngine::createAdapter() AbstractGdbAdapter *GdbEngine::createAdapter()
{ {
const DebuggerStartParameters &sp = startParameters(); const DebuggerStartParameters &sp = startParameters();
if (sp.toolChainAbi.os() == ProjectExplorer::Abi::Symbian) { if (sp.toolChainAbi.os() == ProjectExplorer::Abi::SymbianOS) {
// FIXME: 1 of 3 testing hacks. // FIXME: 1 of 3 testing hacks.
if (sp.debugClient == DebuggerStartParameters::DebugClientCoda) if (sp.debugClient == DebuggerStartParameters::DebugClientCoda)
return new CodaGdbAdapter(this); return new CodaGdbAdapter(this);
...@@ -4208,13 +4210,14 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, ...@@ -4208,13 +4210,14 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb,
const DebuggerStartParameters &sp = startParameters(); const DebuggerStartParameters &sp = startParameters();
m_gdb = QString::fromLocal8Bit(qgetenv("QTC_DEBUGGER_PATH")); m_gdb = QString::fromLocal8Bit(qgetenv("QTC_DEBUGGER_PATH"));
if (m_gdb.isEmpty() && sp.startMode != StartRemoteGdb) { if (m_gdb.isEmpty() && sp.startMode != StartRemoteGdb) {
// We want the MinGW gdb also in case we got started using some compatible ABI. // We want the MinGW gdb also in case we got started using
ProjectExplorer::Abi abi = startParameters().toolChainAbi; // some compatible ABI.
if (abi.os() == ProjectExplorer::Abi::Windows) { Abi abi = startParameters().toolChainAbi;
if (abi.osFlavor() == ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR || abi.osFlavor() == ProjectExplorer::Abi::Windows_msvc) if (abi.os() == Abi::WindowsOS) {
abi = ProjectExplorer::Abi(abi.architecture(), abi.os(), if (abi.osFlavor() == Abi::UnknownFlavor
ProjectExplorer::Abi::Windows_msys, || abi.osFlavor() == Abi::WindowsMsvcFlavor)
abi.binaryFormat(), abi.wordWidth()); abi = Abi(abi.architecture(), abi.os(), Abi::WindowsMSysFlavor,
abi.binaryFormat(), abi.wordWidth());
} }
m_gdb = debuggerCore()->debuggerForAbi(abi); m_gdb = debuggerCore()->debuggerForAbi(abi);
} }
......
...@@ -77,9 +77,9 @@ RemoteGdbServerAdapter::RemoteGdbServerAdapter(GdbEngine *engine, ...@@ -77,9 +77,9 @@ RemoteGdbServerAdapter::RemoteGdbServerAdapter(GdbEngine *engine,
AbstractGdbAdapter::DumperHandling RemoteGdbServerAdapter::dumperHandling() const AbstractGdbAdapter::DumperHandling RemoteGdbServerAdapter::dumperHandling() const
{ {
if (m_abi.os() == ProjectExplorer::Abi::Symbian if (m_abi.os() == ProjectExplorer::Abi::SymbianOS
|| m_abi.os() == ProjectExplorer::Abi::Windows || m_abi.os() == ProjectExplorer::Abi::WindowsOS
|| m_abi.binaryFormat() == ProjectExplorer::Abi::Format_ELF) || m_abi.binaryFormat() == ProjectExplorer::Abi::ElfFormat)
return DumperLoadedByGdb; return DumperLoadedByGdb;
return DumperLoadedByGdbPreload; return DumperLoadedByGdbPreload;
} }
......
...@@ -42,113 +42,113 @@ ...@@ -42,113 +42,113 @@
namespace ProjectExplorer { namespace ProjectExplorer {
Abi::Abi(const Architecture &a, const OS &o, Abi::Abi(const Architecture &a, const OS &o,
const OSFlavour &of, const BinaryFormat &f, unsigned char w) : const OSFlavor &of, const BinaryFormat &f, unsigned char w) :
m_architecture(a), m_os(o), m_osFlavor(of), m_binaryFormat(f), m_wordWidth(w) m_architecture(a), m_os(o), m_osFlavor(of), m_binaryFormat(f), m_wordWidth(w)
{ {
switch (m_os) { switch (m_os) {
case ProjectExplorer::Abi::UNKNOWN_OS: case ProjectExplorer::Abi::UnknownOS:
m_osFlavor = UNKNOWN_OSFLAVOUR; m_osFlavor = UnknownFlavor;
break; break;
case ProjectExplorer::Abi::Linux: case ProjectExplorer::Abi::LinuxOS:
if (m_osFlavor < Linux_generic || m_osFlavor > Linux_meego) if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > MeegoLinuxFlavor)
m_osFlavor = UNKNOWN_OSFLAVOUR; m_osFlavor = UnknownFlavor;
break; break;
case ProjectExplorer::Abi::Mac: case ProjectExplorer::Abi::MacOS:
if (m_osFlavor < Mac_generic || m_osFlavor > Mac_generic) if (m_osFlavor < GenericMacFlavor || m_osFlavor > GenericMacFlavor)
m_osFlavor = UNKNOWN_OSFLAVOUR; m_osFlavor = UnknownFlavor;
break; break;
case ProjectExplorer::Abi::Symbian: case ProjectExplorer::Abi::SymbianOS:
if (m_osFlavor < Symbian_device || m_osFlavor > Symbian_emulator) if (m_osFlavor < SymbianDeviceFlavor || m_osFlavor > SymbianEmulatorFlavor)
m_osFlavor = UNKNOWN_OSFLAVOUR; m_osFlavor = UnknownFlavor;
break; break;
case ProjectExplorer::Abi::UNIX: case ProjectExplorer::Abi::UnixOS:
if (m_osFlavor < Unix_generic || m_osFlavor > Unix_generic) if (m_osFlavor < GenericUnixFlavor || m_osFlavor > GenericUnixFlavor)
m_osFlavor = UNKNOWN_OSFLAVOUR; m_osFlavor = UnknownFlavor;
break; break;
case ProjectExplorer::Abi::Windows: case ProjectExplorer::Abi::WindowsOS:
if (m_osFlavor < Windows_msvc || m_osFlavor > Windows_ce) if (m_osFlavor < WindowsMsvcFlavor || m_osFlavor > WindowsCEFlavor)
m_osFlavor = UNKNOWN_OSFLAVOUR; m_osFlavor = UnknownFlavor;
break; break;
} }
} }
Abi::Abi(const QString &abiString) : Abi::Abi(const QString &abiString) :
m_architecture(UNKNOWN_ARCHITECTURE), m_os(UNKNOWN_OS), m_architecture(UnknownArchitecture), m_os(UnknownOS),
m_osFlavor(UNKNOWN_OSFLAVOUR), m_binaryFormat(UNKNOWN_FORMAT), m_wordWidth(0) m_osFlavor(UnknownFlavor), m_binaryFormat(UnknownFormat), m_wordWidth(0)
{ {
QStringList abiParts = abiString.split(QLatin1Char('-')); QStringList abiParts = abiString.split(QLatin1Char('-'));
if (abiParts.count() >= 1) { if (abiParts.count() >= 1) {
if (abiParts.at(0) == QLatin1String("unknown")) if (abiParts.at(0) == QLatin1String("unknown"))
m_architecture = UNKNOWN_ARCHITECTURE; m_architecture = UnknownArchitecture;
else if (abiParts.at(0) == QLatin1String("arm")) else if (abiParts.at(0) == QLatin1String("arm"))
m_architecture = ARM; m_architecture = ArmArchitecture;
else if (abiParts.at(0) == QLatin1String("x86")) else if (abiParts.at(0) == QLatin1String("x86"))
m_architecture = x86; m_architecture = X86Architecture;
else if (abiParts.at(0) == QLatin1String("mips")) else if (abiParts.at(0) == QLatin1String("mips"))
m_architecture = Mips; m_architecture = MipsArcitecture;
else if (abiParts.at(0) == QLatin1String("ppc")) else if (abiParts.at(0) == QLatin1String("ppc"))
m_architecture = PowerPC; m_architecture = PowerPCArchitecture;
else if (abiParts.at(0) == QLatin1String("itanium")) else if (abiParts.at(0) == QLatin1String("itanium"))
m_architecture = Itanium; m_architecture = ItaniumArchitecture;
else else
return; return;
} }
if (abiParts.count() >= 2) { if (abiParts.count() >= 2) {
if (abiParts.at(1) == QLatin1String("unknown")) if (abiParts.at(1) == QLatin1String("unknown"))
m_os = UNKNOWN_OS; m_os = UnknownOS;
else if (abiParts.at(1) == QLatin1String("linux")) else if (abiParts.at(1) == QLatin1String("linux"))
m_os = Linux; m_os = LinuxOS;
else if (abiParts.at(1) == QLatin1String("macos")) else if (abiParts.at(1) == QLatin1String("macos"))
m_os = Mac; m_os = MacOS;
else if (abiParts.at(1) == QLatin1String("symbian")) else if (abiParts.at(1) == QLatin1String("symbian"))
m_os = Symbian; m_os = SymbianOS;
else if (abiParts.at(1) == QLatin1String("unix")) else if (abiParts.at(1) == QLatin1String("unix"))
m_os = UNIX; m_os = UnixOS;
else if (abiParts.at(1) == QLatin1String("windows")) else if (abiParts.at(1) == QLatin1String("windows"))
m_os = Windows; m_os = WindowsOS;
else else
return; return;
} }
if (abiParts.count() >= 3) { if (abiParts.count() >= 3) {
if (abiParts.at(2) == QLatin1String("unknown")) if (abiParts.at(2) == QLatin1String("unknown"))
m_osFlavor = UNKNOWN_OSFLAVOUR; m_osFlavor = UnknownFlavor;
else if (abiParts.at(2) == QLatin1String("generic") && m_os == Linux) else if (abiParts.at(2) == QLatin1String("generic") && m_os == LinuxOS)
m_osFlavor = Linux_generic; m_osFlavor = GenericLinuxFlavor;
else if (abiParts.at(2) == QLatin1String("maemo") && m_os == Linux) else if (abiParts.at(2) == QLatin1String("maemo") && m_os == LinuxOS)
m_osFlavor = Linux_maemo; m_osFlavor = MaemoLinuxFlavor;
else if (abiParts.at(2) == QLatin1String("meego") && m_os == Linux) else if (abiParts.at(2) == QLatin1String("meego") && m_os == LinuxOS)
m_osFlavor = Linux_meego; m_osFlavor = MeegoLinuxFlavor;
else if (abiParts.at(2) == QLatin1String("generic") && m_os == Mac) else if (abiParts.at(2) == QLatin1String("generic") && m_os == MacOS)
m_osFlavor = Mac_generic; m_osFlavor = GenericMacFlavor;
else if (abiParts.at(2) == QLatin1String("device") && m_os == Symbian) else if (abiParts.at(2) == QLatin1String("device") && m_os == SymbianOS)
m_osFlavor = Symbian_device; m_osFlavor = SymbianDeviceFlavor;
else if (abiParts.at(2) == QLatin1String("emulator") && m_os == Symbian) else if (abiParts.at(2) == QLatin1String("emulator") && m_os == SymbianOS)
m_osFlavor = Symbian_emulator; m_osFlavor = SymbianEmulatorFlavor;
else if (abiParts.at(2) == QLatin1String("generic") && m_os == UNIX) else if (abiParts.at(2) == QLatin1String("generic") && m_os == UnixOS)
m_osFlavor = Unix_generic; m_osFlavor = GenericUnixFlavor;
else if (abiParts.at(2) == QLatin1String("msvc") && m_os == Windows) else if (abiParts.at(2) == QLatin1String("msvc") && m_os == WindowsOS)
m_osFlavor = Windows_msvc; m_osFlavor = WindowsMsvcFlavor;
else if (abiParts.at(2) == QLatin1String("msys") && m_os == Windows) else if (abiParts.at(2) == QLatin1String("msys") && m_os == WindowsOS)
m_osFlavor = Windows_msys; m_osFlavor = WindowsMSysFlavor;
else if (abiParts.at(2) == QLatin1String("ce") && m_os == Windows) else if (abiParts.at(2) == QLatin1String("ce") && m_os == WindowsOS)
m_osFlavor = Windows_ce; m_osFlavor = WindowsCEFlavor;
else else
return; return;
} }
if (abiParts.count() >= 4) { if (abiParts.count() >= 4) {
if (abiParts.at(3) == QLatin1String("unknown")) if (abiParts.at(3) == QLatin1String("unknown"))
m_binaryFormat = UNKNOWN_FORMAT; m_binaryFormat = UnknownFormat;
else if (abiParts.at(3) == QLatin1String("elf")) else if (abiParts.at(3) == QLatin1String("elf"))
m_binaryFormat = Format_ELF; m_binaryFormat = ElfFormat;
else if (abiParts.at(3) == QLatin1String("pe")) else if (abiParts.at(3) == QLatin1String("pe"))
m_binaryFormat = Format_PE; m_binaryFormat = PEFormat;
else if (abiParts.at(3) == QLatin1String("mach_o")) else if (abiParts.at(3) == QLatin1String("mach_o"))
m_binaryFormat = Format_Mach_O; m_binaryFormat = MachOFormat;
else if (abiParts.at(3) == QLatin1String("qml_rt")) else if (abiParts.at(3) == QLatin1String("qml_rt"))
m_binaryFormat = Format_Runtime_QML; m_binaryFormat = RuntimeQmlFormat;
else else
return; return;
} }
...@@ -191,36 +191,36 @@ bool Abi::operator == (const Abi &other) const ...@@ -191,36 +191,36 @@ bool Abi::operator == (const Abi &other) const
bool Abi::isCompatibleWith(const Abi &other) const bool Abi::isCompatibleWith(const Abi &other) const
{ {
return (architecture() == other.architecture() || other.architecture() == Abi::UNKNOWN_ARCHITECTURE) return (architecture() == other.architecture() || other.architecture() == Abi::UnknownArchitecture)
&& (os() == other.os() || other.os() == Abi::UNKNOWN_OS) && (os() == other.os() || other.os() == Abi::UnknownOS)
&& (osFlavor() == other.osFlavor() || other.osFlavor() == Abi::UNKNOWN_OSFLAVOUR) && (osFlavor() == other.osFlavor() || other.osFlavor() == Abi::UnknownFlavor)
&& (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UNKNOWN_FORMAT) && (binaryFormat() == other.binaryFormat() || other.binaryFormat() == Abi::UnknownFormat)
&& ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0); && ((wordWidth() == other.wordWidth() && wordWidth() != 0) || other.wordWidth() == 0);
} }
bool Abi::isValid() const bool Abi::isValid() const
{ {
return m_architecture != UNKNOWN_ARCHITECTURE return m_architecture != UnknownArchitecture
&& m_os != UNKNOWN_OS && m_os != UnknownOS
&& m_osFlavor != UNKNOWN_OSFLAVOUR && m_osFlavor != UnknownFlavor
&& m_binaryFormat != UNKNOWN_FORMAT && m_binaryFormat != UnknownFormat
&& m_wordWidth != 0; && m_wordWidth != 0;
} }
QString Abi::toString(const Architecture &a) QString Abi::toString(const Architecture &a)
{ {
switch (a) { switch (a) {
case ARM: case ArmArchitecture:
return QLatin1String("arm"); return QLatin1String("arm");
case x86: case X86Architecture:
return QLatin1String("x86"); return QLatin1String("x86");
case Mips: case MipsArcitecture:
return QLatin1String("mips"); return QLatin1String("mips");
case PowerPC: case PowerPCArchitecture:
return QLatin1String("ppc"); return QLatin1String("ppc");
case Itanium: case ItaniumArchitecture:
return QLatin1String("itanium"); return QLatin1String("itanium");
case UNKNOWN_ARCHITECTURE: // fall through! case UnknownArchitecture: // fall through!
default: default:
return QLatin1String("unknown"); return QLatin1String("unknown");
} }
...@@ -229,48 +229,48 @@ QString Abi::toString(const Architecture &a) ...@@ -229,48 +229,48 @@ QString Abi::toString(const Architecture &a)
QString Abi::toString(const OS &o) QString Abi::toString(const OS &o)
{ {
switch (o) { switch (o) {
case Linux: case LinuxOS:
return QLatin1String("linux"); return QLatin1String("linux");
case Mac: case MacOS:
return QLatin1String("macos"); return QLatin1String("macos");
case Symbian: case SymbianOS:
return QLatin1String("symbian"); return QLatin1String("symbian");
case UNIX: case UnixOS:
return QLatin1String("unix"); return QLatin1String("unix");