toolchain: fix enum naming style

Reviewed-By: Tobias Hunger

src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

@@ -408,10 +408,10 @@ void CMakeRunPage::initializePage()
         foreach (ProjectExplorer::ToolChain *tc, tcs) {
             ProjectExplorer::Abi targetAbi = tc->targetAbi();
             QVariant tcVariant = qVariantFromValue(static_cast<void *>(tc));
-            if (targetAbi.os() == ProjectExplorer::Abi::Windows) {
-                if (targetAbi.osFlavor() == ProjectExplorer::Abi::Windows_msvc)
+            if (targetAbi.os() == ProjectExplorer::Abi::WindowsOS) {
+                if (targetAbi.osFlavor() == ProjectExplorer::Abi::WindowsMsvcFlavor)
                     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);
                 else
                     continue;
@@ -449,8 +449,8 @@ void CMakeRunPage::runCMake()
     CMakeManager *cmakeManager = m_cmakeWizard->cmakeManager();
 
     QString generator = QLatin1String("-GCodeBlocks - Unix Makefiles");
-    if (tc->targetAbi().os() == ProjectExplorer::Abi::Windows) {
-        if (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::Windows_msvc)
+    if (tc->targetAbi().os() == ProjectExplorer::Abi::WindowsOS) {
+        if (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::WindowsMsvcFlavor)
             generator = QLatin1String("-GCodeBlocks - NMake Makefiles");
         else
             generator = QLatin1String("-GCodeBlocks - MinGW Makefiles");

src/plugins/debugger/cdb/cdbengine.cpp

@@ -299,7 +299,7 @@ static inline bool validMode(DebuggerStartMode sm)
     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.").
             arg(abi.toString());
@@ -337,11 +337,11 @@ bool isCdbEngineEnabled()
 #endif
 }
 
-ConfigurationCheck checkCdbConfiguration(const ProjectExplorer::Abi &abi)
+ConfigurationCheck checkCdbConfiguration(const Abi &abi)
 {
     ConfigurationCheck check;
-    if (abi.binaryFormat() == ProjectExplorer::Abi::Format_PE
-            && abi.osFlavor() != ProjectExplorer::Abi::Windows_msys) {
+    if (abi.binaryFormat() == Abi::PEFormat
+            && abi.osFlavor() != Abi::WindowsMSysFlavor) {
         if (!isCdbEngineEnabled()) {
             check.errorMessage = msgCdbDisabled(abi);
             check.settingsPage = CdbOptionsPage::settingsId();
@@ -637,11 +637,11 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
     // Determine binary (force MSVC), extension lib name and path to use
     // The extension is passed as relative name with the path variable set
     //(does not work with absolute path names)
-    ProjectExplorer::Abi abi = sp.toolChainAbi;
-    if (abi.osFlavor() == ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR || abi.osFlavor() == ProjectExplorer::Abi::Windows_msys)
-        abi = ProjectExplorer::Abi(abi.architecture(), abi.os(),
-                                   ProjectExplorer::Abi::Windows_msvc,
-                                   abi.binaryFormat(), abi.wordWidth());
+    Abi abi = sp.toolChainAbi;
+    if (abi.osFlavor() == Abi::UnknownFlavor
+            || abi.osFlavor() == Abi::WindowsMSysFlavor)
+        abi = Abi(abi.architecture(), abi.os(), Abi::WindowsMsvcFlavor,
+                  abi.binaryFormat(), abi.wordWidth());
     const QString executable = debuggerCore()->debuggerForAbi(abi);
     if (executable.isEmpty()) {
         *errorMessage = tr("There is no CDB executable specified.");

src/plugins/debugger/debuggerplugin.cpp

@@ -1354,7 +1354,7 @@ void DebuggerPluginPrivate::startExternalApplication()
     // Fixme: 1 of 3 testing hacks.
     if (sp.processArgs.startsWith(__("@tcf@ ")) || sp.processArgs.startsWith(__("@sym@ ")))
         // 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()) {
 #ifdef Q_OS_WIN
@@ -1438,9 +1438,9 @@ void DebuggerPluginPrivate::startRemoteCdbSession()
     DebuggerStartParameters sp;
     Abi hostAbi = Abi::hostAbi();
     sp.toolChainAbi = ProjectExplorer::Abi(hostAbi.architecture(),
-                                           ProjectExplorer::Abi::Windows,
-                                           ProjectExplorer::Abi::Windows_msvc,
-                                           ProjectExplorer::Abi::Format_PE,
+                                           ProjectExplorer::Abi::WindowsOS,
+                                           ProjectExplorer::Abi::WindowsMsvcFlavor,
+                                           ProjectExplorer::Abi::PEFormat,
                                            true);
     sp.startMode = AttachToRemote;
     StartRemoteCdbDialog dlg(mainWindow());

src/plugins/debugger/debuggerrunner.cpp

@@ -167,9 +167,9 @@ DebuggerEngineType DebuggerRunControlPrivate::engineForExecutable
     // executables.
     Abi hostAbi = Abi::hostAbi();
     ConfigurationCheck check = checkDebugConfiguration(Abi(hostAbi.architecture(),
-                                                           Abi::Windows,
+                                                           Abi::WindowsOS,
                                                            hostAbi.osFlavor(),
-                                                           Abi::Format_PE,
+                                                           Abi::PEFormat,
                                                            hostAbi.wordWidth()));
     if (!check) {
         m_errorMessage = check.errorMessage;
@@ -224,16 +224,16 @@ DebuggerEngineType DebuggerRunControlPrivate::engineForMode
 static DebuggerEngineType engineForToolChain(const Abi &toolChain)
 {
     switch (toolChain.binaryFormat()) {
-    case Abi::Format_ELF:
-    case Abi::Format_Mach_O:
+    case Abi::ElfFormat:
+    case Abi::MachOFormat:
 #ifdef WITH_LLDB
             // lldb override
             if (Core::ICore::instance()->settings()->value("LLDB/enabled").toBool())
                 return LldbEngineType;
 #endif
             return GdbEngineType;
-   case Abi::Format_PE:
-        if (toolChain.osFlavor() == Abi::Windows_msys)
+   case Abi::PEFormat:
+        if (toolChain.osFlavor() == Abi::WindowsMSysFlavor)
             return GdbEngineType;
         return CdbEngineType;
     default:
@@ -385,9 +385,9 @@ ConfigurationCheck checkDebugConfiguration(const Abi &abi)
     if (!(debuggerCore()->activeLanguages() & CppLanguage))
         return result;
 
-    if (abi.binaryFormat() == Abi::Format_ELF ||
-            abi.binaryFormat() == Abi::Format_Mach_O ||
-            (abi.binaryFormat() == Abi::Format_PE && abi.osFlavor() == Abi::Windows_msys)) {
+    if (abi.binaryFormat() == Abi::ElfFormat ||
+            abi.binaryFormat() == Abi::MachOFormat ||
+            (abi.binaryFormat() == Abi::PEFormat && abi.osFlavor() == Abi::WindowsMSysFlavor)) {
         if (debuggerCore()->debuggerForAbi(abi).isEmpty()) {
             result.errorMessage = msgNoBinaryForToolChain(abi);
             if (!result.errorMessage.isEmpty())
@@ -395,8 +395,8 @@ ConfigurationCheck checkDebugConfiguration(const Abi &abi)
             result.errorMessage += QLatin1Char(' ') + msgEngineNotAvailable("Gdb");
             result.settingsPage = _(Constants::DEBUGGER_COMMON_SETTINGS_ID);
         }
-    } else if (abi.binaryFormat() == Abi::Format_PE
-                && abi.osFlavor() != Abi::Windows_msys) {
+    } else if (abi.binaryFormat() == Abi::PEFormat
+                && abi.osFlavor() != Abi::WindowsMSysFlavor) {
         result = checkCdbConfiguration(abi);
         if (!result) {
             if (!result.errorMessage.isEmpty())

src/plugins/debugger/gdb/gdbengine.cpp

@@ -102,6 +102,8 @@
 #endif
 #include <ctype.h>
 
+using namespace ProjectExplorer;
+
 namespace Debugger {
 namespace Internal {
 
@@ -1805,7 +1807,7 @@ QString msgNoBinaryForToolChain(const ProjectExplorer::Abi &tc)
 AbstractGdbAdapter *GdbEngine::createAdapter()
 {
     const DebuggerStartParameters &sp = startParameters();
-    if (sp.toolChainAbi.os() == ProjectExplorer::Abi::Symbian) {
+    if (sp.toolChainAbi.os() == ProjectExplorer::Abi::SymbianOS) {
         // FIXME: 1 of 3 testing hacks.
         if (sp.debugClient == DebuggerStartParameters::DebugClientCoda)
             return new CodaGdbAdapter(this);
@@ -4208,13 +4210,14 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb,
     const DebuggerStartParameters &sp = startParameters();
     m_gdb = QString::fromLocal8Bit(qgetenv("QTC_DEBUGGER_PATH"));
     if (m_gdb.isEmpty() && sp.startMode != StartRemoteGdb) {
-        // We want the MinGW gdb also in case we got started using some compatible ABI.
-        ProjectExplorer::Abi abi = startParameters().toolChainAbi;
-        if (abi.os() == ProjectExplorer::Abi::Windows) {
-            if (abi.osFlavor() == ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR || abi.osFlavor() == ProjectExplorer::Abi::Windows_msvc)
-                abi = ProjectExplorer::Abi(abi.architecture(), abi.os(),
-                                           ProjectExplorer::Abi::Windows_msys,
-                                           abi.binaryFormat(), abi.wordWidth());
+        // We want the MinGW gdb also in case we got started using
+        // some compatible ABI.
+        Abi abi = startParameters().toolChainAbi;
+        if (abi.os() == Abi::WindowsOS) {
+            if (abi.osFlavor() == Abi::UnknownFlavor
+                    || abi.osFlavor() == Abi::WindowsMsvcFlavor)
+                abi = Abi(abi.architecture(), abi.os(), Abi::WindowsMSysFlavor,
+                          abi.binaryFormat(), abi.wordWidth());
         }
         m_gdb = debuggerCore()->debuggerForAbi(abi);
     }

src/plugins/debugger/gdb/remotegdbserveradapter.cpp

@@ -77,9 +77,9 @@ RemoteGdbServerAdapter::RemoteGdbServerAdapter(GdbEngine *engine,
 
 AbstractGdbAdapter::DumperHandling RemoteGdbServerAdapter::dumperHandling() const
 {
-    if (m_abi.os() == ProjectExplorer::Abi::Symbian
-            || m_abi.os() == ProjectExplorer::Abi::Windows
-            || m_abi.binaryFormat() == ProjectExplorer::Abi::Format_ELF)
+    if (m_abi.os() == ProjectExplorer::Abi::SymbianOS
+            || m_abi.os() == ProjectExplorer::Abi::WindowsOS
+            || m_abi.binaryFormat() == ProjectExplorer::Abi::ElfFormat)
         return DumperLoadedByGdb;
     return DumperLoadedByGdbPreload;
 }

src/plugins/projectexplorer/abi.h

@@ -48,63 +48,63 @@ class PROJECTEXPLORER_EXPORT Abi
 {
 public:
     enum Architecture {
-        UNKNOWN_ARCHITECTURE,
-        ARM,
-        x86,
-        Itanium,
-        Mips,
-        PowerPC
+        UnknownArchitecture,
+        ArmArchitecture,
+        X86Architecture,
+        ItaniumArchitecture,
+        MipsArcitecture,
+        PowerPCArchitecture
     };
 
     enum OS {
-        UNKNOWN_OS,
-        Linux,
-        Mac,
-        Symbian,
-        UNIX,
-        Windows
+        UnknownOS,
+        LinuxOS,
+        MacOS,
+        SymbianOS,
+        UnixOS,
+        WindowsOS
     };
 
-    enum OSFlavour {
-        UNKNOWN_OSFLAVOUR,
+    enum OSFlavor {
+        UnknownFlavor,
 
         // Linux
-        Linux_generic,
-        Linux_harmattan,
-        Linux_maemo,
-        Linux_meego,
+        GenericLinuxFlavor,
+        HarmattanLinuxFlavor,
+        MaemoLinuxFlavor,
+        MeegoLinuxFlavor,
 
         // Mac
-        Mac_generic,
+        GenericMacFlavor,
 
         // Symbian
-        Symbian_device,
-        Symbian_emulator,
+        SymbianDeviceFlavor,
+        SymbianEmulatorFlavor,
 
         // Unix
-        Unix_generic,
+        GenericUnixFlavor,
 
         // Windows
-        Windows_msvc,
-        Windows_msys,
-        Windows_ce
+        WindowsMsvcFlavor,
+        WindowsMSysFlavor,
+        WindowsCEFlavor
     };
 
     enum BinaryFormat {
-        UNKNOWN_FORMAT,
-        Format_ELF,
-        Format_Mach_O,
-        Format_PE,
-        Format_Runtime_QML
+        UnknownFormat,
+        ElfFormat,
+        MachOFormat,
+        PEFormat,
+        RuntimeQmlFormat
     };
 
     Abi() :
-        m_architecture(UNKNOWN_ARCHITECTURE), m_os(UNKNOWN_OS),
-        m_osFlavor(UNKNOWN_OSFLAVOUR), m_binaryFormat(UNKNOWN_FORMAT), m_wordWidth(0)
+        m_architecture(UnknownArchitecture), m_os(UnknownOS),
+        m_osFlavor(UnknownFlavor), m_binaryFormat(UnknownFormat), m_wordWidth(0)
     { }
 
     Abi(const Architecture &a, const OS &o,
-        const OSFlavour &so, const BinaryFormat &f, unsigned char w);
+        const OSFlavor &so, const BinaryFormat &f, unsigned char w);
     Abi(const QString &abiString);
 
     bool operator == (const Abi &other) const;
@@ -114,7 +114,7 @@ public:
 
     Architecture architecture() const { return m_architecture; }
     OS os() const { return m_os; }
-    OSFlavour osFlavor() const { return m_osFlavor; }
+    OSFlavor osFlavor() const { return m_osFlavor; }
     BinaryFormat binaryFormat() const { return m_binaryFormat; }
     unsigned char wordWidth() const { return m_wordWidth; }
 
@@ -122,7 +122,7 @@ public:
 
     static QString toString(const Architecture &a);
     static QString toString(const OS &o);
-    static QString toString(const OSFlavour &of);
+    static QString toString(const OSFlavor &of);
     static QString toString(const BinaryFormat &bf);
     static QString toString(int w);
 
@@ -132,7 +132,7 @@ public:
 private:
     Architecture m_architecture;
     OS m_os;
-    OSFlavour m_osFlavor;
+    OSFlavor m_osFlavor;
     BinaryFormat m_binaryFormat;
     unsigned char m_wordWidth;
 };

src/plugins/projectexplorer/gcctoolchain.cpp

@@ -165,10 +165,10 @@ static ProjectExplorer::Abi guessGccAbi(const QString &m)
 
     QStringList parts = machine.split(QRegExp("[ /-]"));
 
-    ProjectExplorer::Abi::Architecture arch = ProjectExplorer::Abi::UNKNOWN_ARCHITECTURE;
-    ProjectExplorer::Abi::OS os = ProjectExplorer::Abi::UNKNOWN_OS;
-    ProjectExplorer::Abi::OSFlavour flavor = ProjectExplorer::Abi::UNKNOWN_OSFLAVOUR;
-    ProjectExplorer::Abi::BinaryFormat format = ProjectExplorer::Abi::UNKNOWN_FORMAT;
+    ProjectExplorer::Abi::Architecture arch = ProjectExplorer::Abi::UnknownArchitecture;
+    ProjectExplorer::Abi::OS os = ProjectExplorer::Abi::UnknownOS;
+    ProjectExplorer::Abi::OSFlavor flavor = ProjectExplorer::Abi::UnknownFlavor;
+    ProjectExplorer::Abi::BinaryFormat format = ProjectExplorer::Abi::UnknownFormat;
     int width = 0;
     int unknownCount = 0;
 
@@ -178,40 +178,40 @@ static ProjectExplorer::Abi guessGccAbi(const QString &m)
             continue;
         } else if (p == QLatin1String("i386") || p == QLatin1String("i486") || p == QLatin1String("i586")
                    || p == QLatin1String("i686") || p == QLatin1String("x86")) {
-            arch = ProjectExplorer::Abi::x86;
+            arch = ProjectExplorer::Abi::X86Architecture;
             width = 32;
         } else if (p == QLatin1String("arm")) {
-            arch = ProjectExplorer::Abi::ARM;
+            arch = ProjectExplorer::Abi::ArmArchitecture;
             width = 32;
         } else if (p == QLatin1String("x86_64")) {
-            arch = ProjectExplorer::Abi::x86;
+            arch = ProjectExplorer::Abi::X86Architecture;
             width = 64;
         } else if (p == QLatin1String("w64")) {
             width = 64;
         } else if (p == QLatin1String("linux")) {
-            os = ProjectExplorer::Abi::Linux;
-            flavor = ProjectExplorer::Abi::Linux_generic;
-            format = ProjectExplorer::Abi::Format_ELF;
+            os = ProjectExplorer::Abi::LinuxOS;
+            flavor = ProjectExplorer::Abi::GenericLinuxFlavor;
+            format = ProjectExplorer::Abi::ElfFormat;
         } else if (p == QLatin1String("symbianelf")) {
-            os = ProjectExplorer::Abi::Symbian;
-            flavor = ProjectExplorer::Abi::Symbian_device;
-            format = ProjectExplorer::Abi::Format_ELF;
+            os = ProjectExplorer::Abi::SymbianOS;
+            flavor = ProjectExplorer::Abi::SymbianDeviceFlavor;
+            format = ProjectExplorer::Abi::ElfFormat;
             width = 32;
         } else if (p == QLatin1String("mingw32")) {
-            arch = ProjectExplorer::Abi::x86;
-            os = ProjectExplorer::Abi::Windows;
-            flavor = ProjectExplorer::Abi::Windows_msys;
-            format = ProjectExplorer::Abi::Format_PE;
+            arch = ProjectExplorer::Abi::X86Architecture;
+            os = ProjectExplorer::Abi::WindowsOS;
+            flavor = ProjectExplorer::Abi::WindowsMSysFlavor;
+            format = ProjectExplorer::Abi::PEFormat;
             if (width == 0)
                 width = 32;
         } else if (p == QLatin1String("apple")) {
-            os = ProjectExplorer::Abi::Mac;
-            flavor = ProjectExplorer::Abi::Mac_generic;
-            format = ProjectExplorer::Abi::Format_Mach_O;
+            os = ProjectExplorer::Abi::MacOS;
+            flavor = ProjectExplorer::Abi::GenericMacFlavor;
+            format = ProjectExplorer::Abi::MachOFormat;
         } else if (p == QLatin1String("darwin10")) {
             width = 64;
         } else if (p == QLatin1String("gnueabi")) {
-            format = ProjectExplorer::Abi::Format_ELF;
+            format = ProjectExplorer::Abi::ElfFormat;
         } else {
             ++unknownCount;
         }

src/plugins/projectexplorer/msvctoolchain.cpp

@@ -286,7 +286,7 @@ MsvcToolChain::MsvcToolChain(Type type, const QString &name, Platform platform,
     m_varsBat(varsBat),
     m_varsBatArg(varsBatArg),
     m_is64bit(true),
-    m_architecture(Abi::x86)
+    m_architecture(Abi::X86Architecture)
 {
     Q_ASSERT(!name.isEmpty());
     Q_ASSERT(!m_varsBat.isEmpty());
@@ -298,7 +298,7 @@ MsvcToolChain::MsvcToolChain(Type type, const QString &name, Platform platform,
         m_is64bit = false;
         break;
     case ProjectExplorer::Internal::MsvcToolChain::ia64:
-        m_architecture = Abi::Itanium;
+        m_architecture = Abi::ItaniumArchitecture;
         break;
     case ProjectExplorer::Internal::MsvcToolChain::s64:
     case ProjectExplorer::Internal::MsvcToolChain::amd64:
@@ -318,7 +318,7 @@ QString MsvcToolChain::typeName() const
 
 Abi MsvcToolChain::targetAbi() const
 {
-    return Abi(m_architecture, Abi::Windows, Abi::Windows_msvc, Abi::Format_PE, m_is64bit ? 64 : 32);
+    return Abi(m_architecture, Abi::WindowsOS, Abi::WindowsMsvcFlavor, Abi::PEFormat, m_is64bit ? 64 : 32);
 }
 
 bool MsvcToolChain::isValid() const

src/plugins/projectexplorer/projectexplorer.pro

@@ -229,7 +229,7 @@ RESOURCES += projectexplorer.qrc
 !isEmpty($$(QTC_CPU)) {
     DEFINES += QTC_CPU=$$(QTC_CPU)
 } else {
-    DEFINES += QTC_CPU=x86
+    DEFINES += QTC_CPU=X86Architecture
 }
 
 DEFINES += PROJECTEXPLORER_LIBRARY

src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

@@ -291,7 +291,7 @@ ProjectExplorer::Abi QmlProjectRunConfiguration::abi() const
 {
     ProjectExplorer::Abi hostAbi = ProjectExplorer::Abi::hostAbi();
     return ProjectExplorer::Abi(hostAbi.architecture(), hostAbi.os(), hostAbi.osFlavor(),
-                                ProjectExplorer::Abi::Format_Runtime_QML, hostAbi.wordWidth());
+                                ProjectExplorer::Abi::RuntimeQmlFormat, hostAbi.wordWidth());
 }
 
 QVariantMap QmlProjectRunConfiguration::toMap() const

src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp

@@ -84,8 +84,8 @@ DebuggingHelperBuildTask::DebuggingHelperBuildTask(QtVersion *version, Tools too
     ProjectExplorer::ToolChain *tc = tcList.at(0);
     tc->addToEnvironment(m_environment);
 
-    if (tc->targetAbi().os() == ProjectExplorer::Abi::Linux
-        && ProjectExplorer::Abi::hostAbi().os() == ProjectExplorer::Abi::Windows)
+    if (tc->targetAbi().os() == ProjectExplorer::Abi::LinuxOS
+        && ProjectExplorer::Abi::hostAbi().os() == ProjectExplorer::Abi::WindowsOS)
         m_target = QLatin1String("-unix");
     m_qmakeCommand = version->qmakeCommand();
     m_makeCommand = tc->makeCommand();

src/plugins/qt4projectmanager/librarydetailscontroller.cpp

@@ -89,8 +89,8 @@ LibraryDetailsController::LibraryDetailsController(
     // if its toolchain is maemo behave the same as we would be on linux
     if (qt4BuildConfiguration
             && qt4BuildConfiguration->toolChain()
-            && (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::Linux_harmattan
-                || qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::Linux_maemo))
+            && (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavour
+                || qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavour))
         m_creatorPlatform = CreatorLinux;
 #endif
 

src/plugins/qt4projectmanager/makestep.cpp

@@ -174,7 +174,7 @@ bool MakeStep::init()
     // but for now this is the least invasive change
 
     if (toolchain
-            && toolchain->targetAbi().binaryFormat() != ProjectExplorer::Abi::Format_PE
+            && toolchain->targetAbi().binaryFormat() != ProjectExplorer::Abi::PEFormat
             && m_makeCmd.isEmpty())
         Utils::QtcProcess::addArg(&args, QLatin1String("-w"));
 
@@ -303,7 +303,7 @@ void MakeStepConfigWidget::updateDetails()
     QString args = m_makeStep->userArguments();
     ProjectExplorer::ToolChain *toolChain = bc->toolChain();
     if (toolChain
-        && toolChain->targetAbi().binaryFormat() != ProjectExplorer::Abi::Format_PE
+        && toolChain->targetAbi().binaryFormat() != ProjectExplorer::Abi::PEFormat
         && m_makeStep->m_makeCmd.isEmpty())
         Utils::QtcProcess::addArg(&args, QLatin1String("-w"));
     param.setArguments(args);

src/plugins/qt4projectmanager/qmakestep.cpp

@@ -157,8 +157,8 @@ QStringList QMakeStep::moreArguments()
     QStringList arguments;
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
     ProjectExplorer::ToolChain *tc = bc->toolChain();
-    if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::Linux_harmattan
-               || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::Linux_maemo))
+    if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavour
+               || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavour))
         arguments << QLatin1String("-unix");
 #endif
     if (!bc->qtVersion()->supportsShadowBuilds()) {

src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp

@@ -176,13 +176,13 @@ void MaemoToolChain::setQtVersionId(int id)
 
     QtVersion *version = QtVersionManager::instance()->version(id);
     Q_ASSERT(version);
-    ProjectExplorer::Abi::OSFlavour flavour = ProjectExplorer::Abi::Linux_harmattan;
+    ProjectExplorer::Abi::OSFlavor flavour = ProjectExplorer::Abi::HarmattanLinuxFlavor;
     if (MaemoGlobal::isValidMaemo5QtVersion(version))
-        flavour = ProjectExplorer::Abi::Linux_maemo;
+        flavour = ProjectExplorer::Abi::MaemoLinuxFlavor;
     else if (MaemoGlobal::isValidHarmattanQtVersion(version))
-        flavour = ProjectExplorer::Abi::Linux_harmattan;
+        flavour = ProjectExplorer::Abi::HarmattanLinuxFlavor;
     else if (MaemoGlobal::isValidMeegoQtVersion(version))
-        flavour = ProjectExplorer::Abi::Linux_meego;
+        flavour = ProjectExplorer::Abi::MeegoLinuxFlavor;
     else
         return;
 

src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp

@@ -150,10 +150,10 @@ QList<ProjectExplorer::ToolChain *> GcceToolChainFactory::autoDetect()
         GcceToolChain *tc = new GcceToolChain(true);
         tc->setCompilerPath(fullPath);
         tc->setDisplayName(tr("GCCE (%1)").arg(gcceVersion(fullPath)));
-        if (tc->targetAbi() == ProjectExplorer::Abi(ProjectExplorer::Abi::ARM,
-                                                    ProjectExplorer::Abi::Symbian,
-                                                    ProjectExplorer::Abi::Symbian_device,
-                                                    ProjectExplorer::Abi::Format_ELF,
+        if (tc->targetAbi() == ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture,
+                                                    ProjectExplorer::Abi::SymbianOS,
+                                                    ProjectExplorer::Abi::SymbianDeviceFlavor,
+                                                    ProjectExplorer::Abi::ElfFormat,
                                                     32))
         result.append(tc);
     }

src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp

@@ -147,8 +147,8 @@ QString RvctToolChain::typeName() const
 
 ProjectExplorer::Abi RvctToolChain::targetAbi() const
 {
-    return ProjectExplorer::Abi(ProjectExplorer::Abi::ARM, ProjectExplorer::Abi::Symbian,
-                                ProjectExplorer::Abi::Symbian_device, ProjectExplorer::Abi::Format_ELF,
+    return ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::SymbianOS,
+                                ProjectExplorer::Abi::SymbianDeviceFlavor, ProjectExplorer::Abi::ElfFormat,
                                 32);
 }
 

src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp

@@ -298,7 +298,7 @@ QString S60DeviceRunConfiguration::localExecutableFileName() const
         return QString();
 
     const ProjectExplorer::Abi hostAbi = ProjectExplorer::Abi::hostAbi();
-    if (hostAbi.os() == ProjectExplorer::Abi::Linux) {
+    if (hostAbi.os() == ProjectExplorer::Abi::LinuxOS) {
         return executableFromPackageUnix(ti.buildDir + QLatin1Char('/') + ti.target + QLatin1String("_template.pkg"));
     }
 

src/plugins/qt4projectmanager/qt-s60/s60manager.cpp

@@ -154,7 +154,7 @@ S60Manager::~S60Manager()
 
 QString S60Manager::platform(const ProjectExplorer::ToolChain *tc)
 {
-    if (!tc || tc->targetAbi().os() == ProjectExplorer::Abi::Symbian)
+    if (!tc || tc->targetAbi().os() == ProjectExplorer::Abi::SymbianOS)
         return QString();
     QString target = tc->defaultMakeTarget();
     return target.right(target.lastIndexOf(QLatin1Char('-')));

src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp

@@ -140,9 +140,9 @@ QString WinscwToolChain::typeName() const
 
 ProjectExplorer::Abi WinscwToolChain::targetAbi() const
 {
-    return ProjectExplorer::Abi(ProjectExplorer::Abi::ARM, ProjectExplorer::Abi::Symbian,
-                                ProjectExplorer::Abi::Symbian_emulator,
-                                ProjectExplorer::Abi::Format_ELF, false);
+    return ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::SymbianOS,
+                                ProjectExplorer::Abi::SymbianEmulatorFlavor,
+                                ProjectExplorer::Abi::ElfFormat, false);
 }
 
 bool WinscwToolChain::isValid() const

src/plugins/qt4projectmanager/qtoptionspage.cpp

@@ -671,7 +671,7 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item)
 
         ProjectExplorer::Abi qtAbi = qtVersion->qtAbis().at(0);
 
-        if (qtAbi.os() == ProjectExplorer::Abi::Symbian) {
+        if (qtAbi.os() == ProjectExplorer::Abi::SymbianOS) {
             makeS60Visible(true);
             m_versionUi->s60SDKPath->setPath(QDir::toNativeSeparators(m_versions.at(index)->s60SDKDirectory()));
             m_versionUi->sbsV2Path->setPath(m_versions.at(index)->sbsV2Directory());

src/plugins/qt4projectmanager/qtversionmanager.cpp

@@ -1496,36 +1496,36 @@ void QtVersion::updateAbiAndMkspec() const
     // Evaluate all the information we have:
     if (!ce_sdk.isEmpty() && !ce_arch.isEmpty()) {
         // Treat windows CE as desktop.
-        m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ARM, ProjectExplorer::Abi::Windows,
-                                           ProjectExplorer::Abi::Windows_ce, ProjectExplorer::Abi::Format_PE, false));
+        m_abis.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::WindowsOS,
+                                           ProjectExplorer::Abi::WindowsCEFlavor, ProjectExplorer::Abi::PEFormat, false));
         m_targetIds.insert(Constants::DESKTOP_TARGET_ID);