ProjectExplorer: Shorten space needed to store a FileType

Use class enum to shorten the FileType to quint16. This frees up a couple
of bytes per FileNode and we can have many of those.

Change-Id: I3a9ae25059690fefa15305a4268269647d6dc1c9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

19 files changed, 84 insertions, 83 deletions

diff --git a/src/plugins/appmanager/project/appmanagerproject.cpp b/src/plugins/appmanager/project/appmanagerproject.cpp
index 4ce362ebad..d67ad4731f 100644
--- a/src/plugins/appmanager/project/appmanagerproject.cpp
+++ b/src/plugins/appmanager/project/appmanagerproject.cpp
@@ -156,7 +156,7 @@ void AppManagerProject::addNodes(const QSet<QString> &nodes)
         path = QDir(projectDirectory().toString()).relativeFilePath(node).split(QDir::separator());
         path.pop_back();
         FolderNode *folder = findFolderFor(path);
-        auto fileNode = new FileNode(FileName::fromString(node), SourceType, false);
+        auto fileNode = new FileNode(FileName::fromString(node), FileType::Source, false);
         folder->addFileNodes({fileNode});
     }
 }
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index d07d355234..c37d144438 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -222,8 +222,9 @@ void AutotoolsProject::makefileParsingFinished()
     QList<FileNode *> fileNodes = Utils::transform(files, [dir](const QString &f) {
         const Utils::FileName path = Utils::FileName::fromString(dir.absoluteFilePath(f));
         return new FileNode(path,
-                            (f == QLatin1String("Makefile.am") || f == QLatin1String("configure.ac"))
-                            ? ProjectFileType : ResourceType, false);
+                            (f == QLatin1String("Makefile.am") ||
+                             f == QLatin1String("configure.ac")) ? FileType::Project : FileType::Resource,
+                            false);
     });
     rootProjectNode()->buildTree(fileNodes);
 
diff --git a/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp b/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp
index ef2c522212..0895bd8999 100644
--- a/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp
@@ -437,7 +437,7 @@ void CMakeCbpParser::parseUnit()
             if (!fileName.endsWith(".rule") && !m_processedUnits.contains(fileName)) {
                 // Now check whether we found a virtual element beneath
                 if (m_parsingCMakeUnit) {
-                    m_cmakeFileList.append( new FileNode(fileName, ProjectFileType, false));
+                    m_cmakeFileList.append( new FileNode(fileName, FileType::Project, false));
                 } else {
                     bool generated = false;
                     QString onlyFileName = fileName.fileName();
@@ -447,9 +447,9 @@ void CMakeCbpParser::parseUnit()
                         generated = true;
 
                     if (fileName.endsWith(".qrc"))
-                        m_fileList.append( new FileNode(fileName, ResourceType, generated));
+                        m_fileList.append( new FileNode(fileName, FileType::Resource, generated));
                     else
-                        m_fileList.append( new FileNode(fileName, SourceType, generated));
+                        m_fileList.append( new FileNode(fileName, FileType::Source, generated));
                 }
                 m_unitTargetMap.insert(fileName, m_unitTargets);
                 m_processedUnits.insert(fileName);
diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp
index 248e97a302..10cde3bf62 100644
--- a/src/plugins/cmakeprojectmanager/servermodereader.cpp
+++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp
@@ -224,7 +224,7 @@ void ServerModeReader::generateProjectTree(CMakeProjectNode *root)
             const int oldCount = knownFiles.count();
             knownFiles.insert(s);
             if (oldCount != knownFiles.count())
-                fileGroupNodes.append(new FileNode(s, SourceType, fg->isGenerated));
+                fileGroupNodes.append(new FileNode(s, FileType::Source, fg->isGenerated));
         }
     }
     root->buildTree(fileGroupNodes);
@@ -418,7 +418,7 @@ void ServerModeReader::extractCMakeInputsData(const QVariantMap &data)
             const int oldCount = m_cmakeFiles.count();
             m_cmakeFiles.insert(sfn);
             if (!isCMake && oldCount < m_cmakeFiles.count())
-                m_cmakeInputsFileNodes.append(new FileNode(sfn, ProjectFileType, isTemporary));
+                m_cmakeInputsFileNodes.append(new FileNode(sfn, FileType::Project, isTemporary));
         }
     }
 }
diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.cpp b/src/plugins/cmakeprojectmanager/tealeafreader.cpp
index ca109a2018..dd885c43ac 100644
--- a/src/plugins/cmakeprojectmanager/tealeafreader.cpp
+++ b/src/plugins/cmakeprojectmanager/tealeafreader.cpp
@@ -418,7 +418,7 @@ void TeaLeafReader::extractData()
     resetData();
 
     m_projectName = m_parameters.projectName;
-    m_files.append(new FileNode(topCMake, ProjectFileType, false));
+    m_files.append(new FileNode(topCMake, FileType::Project, false));
     // Do not insert topCMake into m_cmakeFiles: The project already watches that!
 
     // Find cbp file
@@ -450,7 +450,7 @@ void TeaLeafReader::extractData()
 
     // Make sure the top cmakelists.txt file is always listed:
     if (!contains(m_files, [topCMake](FileNode *fn) { return fn->filePath() == topCMake; })) {
-        m_files.append(new FileNode(topCMake, ProjectFileType, false));
+        m_files.append(new FileNode(topCMake, FileType::Project, false));
     }
 
     m_buildTargets = cbpparser.buildTargets();
diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp
index 8f8d791969..32e86796cc 100644
--- a/src/plugins/designer/resourcehandler.cpp
+++ b/src/plugins/designer/resourcehandler.cpp
@@ -68,7 +68,7 @@ void QrcFilesVisitor::visitProjectNode(ProjectNode *projectNode)
 void QrcFilesVisitor::visitFolderNode(FolderNode *folderNode)
 {
     foreach (const FileNode *fileNode, folderNode->fileNodes()) {
-        if (fileNode->fileType() == ResourceType)
+        if (fileNode->fileType() == FileType::Resource)
             m_qrcFiles.append(fileNode->filePath().toString());
     }
     if (dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(folderNode))
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index e33d20dd94..264b2e8b24 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -92,15 +92,15 @@ GenericProject::GenericProject(Manager *manager, const QString &fileName)
     DocumentManager::addDocument(m_configIDocument);
 
     FileNode *projectFilesNode = new FileNode(Utils::FileName::fromString(m_filesFileName),
-                                              ProjectFileType,
+                                              FileType::Project,
                                               /* generated = */ false);
 
     FileNode *projectIncludesNode = new FileNode(Utils::FileName::fromString(m_includesFileName),
-                                                 ProjectFileType,
+                                                 FileType::Project,
                                                  /* generated = */ false);
 
     FileNode *projectConfigNode = new FileNode(Utils::FileName::fromString(m_configFileName),
-                                               ProjectFileType,
+                                               FileType::Project,
                                                /* generated = */ false);
 
     rootProjectNode()->addFileNodes(QList<FileNode *>() << projectFilesNode
@@ -277,9 +277,9 @@ void GenericProject::refresh(RefreshOptions options)
 
     if (options & Files) {
         QList<FileNode *> fileNodes = Utils::transform(files(), [](const QString &f) {
-            FileType fileType = SourceType; // ### FIXME
+            FileType fileType = FileType::Source; // ### FIXME
             if (f.endsWith(QLatin1String(".qrc")))
-                fileType = ResourceType;
+                fileType = FileType::Resource;
             return new FileNode(Utils::FileName::fromString(f), fileType, false);
         });
         rootProjectNode()->buildTree(fileNodes);
diff --git a/src/plugins/nim/project/nimproject.cpp b/src/plugins/nim/project/nimproject.cpp
index 2df8e66317..cd93719103 100644
--- a/src/plugins/nim/project/nimproject.cpp
+++ b/src/plugins/nim/project/nimproject.cpp
@@ -110,7 +110,7 @@ void NimProject::collectProjectFiles()
         m_futureInterface.reportStarted();
         QList<FileNode *> nodes
                 = FileNode::scanForFiles(projectDirectory(),
-                                         [](const FileName &fn) { return new FileNode(fn, SourceType, false); },
+                                         [](const FileName &fn) { return new FileNode(fn, FileType::Source, false); },
                                          &m_futureInterface);
         m_futureInterface.setProgressValue(m_futureInterface.progressMaximum());
         m_futureInterface.reportResult(nodes);
diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp
index 2021487bb6..88e49c696c 100644
--- a/src/plugins/projectexplorer/projectmodels.cpp
+++ b/src/plugins/projectexplorer/projectmodels.cpp
@@ -58,8 +58,8 @@ bool sortNodes(Node *n1, Node *n2)
     // project files
     FileNode *file1 = n1->asFileNode();
     FileNode *file2 = n2->asFileNode();
-    if (file1 && file1->fileType() == ProjectFileType) {
-        if (file2 && file2->fileType() == ProjectFileType) {
+    if (file1 && file1->fileType() == FileType::Project) {
+        if (file2 && file2->fileType() == FileType::Project) {
             const QString fileName1 = file1->filePath().fileName();
             const QString fileName2 = file2->filePath().fileName();
 
@@ -72,7 +72,7 @@ bool sortNodes(Node *n1, Node *n2)
             return true; // project file is before everything else
         }
     } else {
-        if (file2 && file2->fileType() == ProjectFileType)
+        if (file2 && file2->fileType() == FileType::Project)
             return false;
     }
 
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index f2e39b9591..15b6e30b72 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -54,15 +54,15 @@ enum class NodeType : quint16 {
 };
 
 // File types common for qt projects
-enum FileType {
-    UnknownFileType = 0,
-    HeaderType,
-    SourceType,
-    FormType,
-    StateChartType,
-    ResourceType,
-    QMLType,
-    ProjectFileType,
+enum class FileType : quint16 {
+    Unknown = 0,
+    Header,
+    Source,
+    Form,
+    StateChart,
+    Resource,
+    QML,
+    Project,
     FileTypeSize
 };
 
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp
index a2453ad45b..aabe26c719 100644
--- a/src/plugins/pythoneditor/pythoneditorplugin.cpp
+++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp
@@ -598,7 +598,7 @@ class PythonFileNode : public FileNode
 {
 public:
     PythonFileNode(const Utils::FileName &filePath, const QString &nodeDisplayName)
-        : FileNode(filePath, SourceType, false)
+        : FileNode(filePath, FileType::Source, false)
         , m_displayName(nodeDisplayName)
     {}
 
diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp
index e9a772c48f..dee9bf364e 100644
--- a/src/plugins/qbsprojectmanager/qbsnodes.cpp
+++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp
@@ -323,7 +323,7 @@ QbsGroupNode::QbsGroupNode(const qbs::GroupData &grp, const QString &productPath
     setIcon(m_groupIcon);
 
     QbsFileNode *idx = new QbsFileNode(Utils::FileName::fromString(grp.location().filePath()),
-                                       ProjectExplorer::ProjectFileType, false,
+                                       ProjectExplorer::FileType::Project, false,
                                        grp.location().line());
     addFileNodes(QList<ProjectExplorer::FileNode *>() << idx);
 
@@ -493,8 +493,8 @@ void QbsGroupNode::setupFolder(ProjectExplorer::FolderNode *root,
     foreach (FileTreeNode *c, fileTree->children) {
         Utils::FileName path = Utils::FileName::fromString(c->path());
         const ProjectExplorer::FileType newFileType =
-                fileTypeHash.value(c->path(), ProjectExplorer::UnknownFileType);
-        const bool isQrcFile = newFileType == ProjectExplorer::ResourceType;
+                fileTypeHash.value(c->path(), ProjectExplorer::FileType::Unknown);
+        const bool isQrcFile = newFileType == ProjectExplorer::FileType::Resource;
 
         // Handle files:
         if (c->isFile() && !isQrcFile) {
@@ -555,23 +555,23 @@ void QbsGroupNode::setupFolder(ProjectExplorer::FolderNode *root,
 
 ProjectExplorer::FileType QbsGroupNode::fileType(const qbs::ArtifactData &artifact)
 {
-    QTC_ASSERT(artifact.isValid(), return ProjectExplorer::UnknownFileType);
+    QTC_ASSERT(artifact.isValid(), return ProjectExplorer::FileType::Unknown);
 
     if (artifact.fileTags().contains(QLatin1String("c"))
             || artifact.fileTags().contains(QLatin1String("cpp"))
             || artifact.fileTags().contains(QLatin1String("objc"))
             || artifact.fileTags().contains(QLatin1String("objcpp"))) {
-        return ProjectExplorer::SourceType;
+        return ProjectExplorer::FileType::Source;
     }
     if (artifact.fileTags().contains(QLatin1String("hpp")))
-        return ProjectExplorer::HeaderType;
+        return ProjectExplorer::FileType::Header;
     if (artifact.fileTags().contains(QLatin1String("qrc")))
-        return ProjectExplorer::ResourceType;
+        return ProjectExplorer::FileType::Resource;
     if (artifact.fileTags().contains(QLatin1String("ui")))
-        return ProjectExplorer::FormType;
+        return ProjectExplorer::FileType::Form;
     if (artifact.fileTags().contains(QLatin1String("scxml")))
-        return ProjectExplorer::StateChartType;
-    return ProjectExplorer::UnknownFileType;
+        return ProjectExplorer::FileType::StateChart;
+    return ProjectExplorer::FileType::Unknown;
 }
 
 // --------------------------------------------------------------------
@@ -591,7 +591,7 @@ QbsProductNode::QbsProductNode(const qbs::Project &project, const qbs::ProductDa
 
     addFolderNodes(QList<ProjectExplorer::FolderNode *>() << m_generatedFilesNode);
     auto idx = new QbsFileNode(Utils::FileName::fromString(prd.location().filePath()),
-                               ProjectExplorer::ProjectFileType, false,
+                               ProjectExplorer::FileType::Project, false,
                                prd.location().line());
     addFileNodes(QList<ProjectExplorer::FileNode *>() << idx);
 
@@ -828,7 +828,7 @@ void QbsProjectNode::ctor()
 
     setIcon(m_projectIcon);
     addFileNodes(QList<ProjectExplorer::FileNode *>()
-                 << new ProjectExplorer::FileNode(filePath(), ProjectExplorer::ProjectFileType, false));
+                 << new ProjectExplorer::FileNode(filePath(), ProjectExplorer::FileType::Project, false));
 }
 
 QbsProductNode *QbsProjectNode::findProductNode(const QString &uniqueName)
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 5edf855dc7..7c4ab9e588 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -95,19 +95,19 @@ struct FileTypeDataStorage {
 };
 
 static const FileTypeDataStorage fileTypeDataStorage[] = {
-    { HeaderType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Headers"),
+    { FileType::Header, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Headers"),
       ProjectExplorer::Constants::FILEOVERLAY_H, "*.h; *.hh; *.hpp; *.hxx;"},
-    { SourceType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Sources"),
+    { FileType::Source, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Sources"),
       ProjectExplorer::Constants::FILEOVERLAY_CPP, "*.c; *.cc; *.cpp; *.cp; *.cxx; *.c++;" },
-    { FormType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Forms"),
+    { FileType::Form, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Forms"),
       Constants::FILEOVERLAY_UI, "*.ui;" },
-    { StateChartType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "State charts"),
+    { FileType::StateChart, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "State charts"),
       ProjectExplorer::Constants::FILEOVERLAY_SCXML, "*.scxml;" },
-    { ResourceType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Resources"),
+    { FileType::Resource, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Resources"),
       ProjectExplorer::Constants::FILEOVERLAY_QRC, "*.qrc;" },
-    { QMLType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "QML"),
+    { FileType::QML, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "QML"),
       ProjectExplorer::Constants::FILEOVERLAY_QML, "*.qml;" },
-    { UnknownFileType, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Other files"),
+    { FileType::Unknown, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Other files"),
       ProjectExplorer::Constants::FILEOVERLAY_UNKNOWN, "*;" }
 };
 
@@ -129,7 +129,7 @@ class QmakeNodeStaticData {
 public:
     class FileTypeData {
     public:
-        FileTypeData(FileType t = UnknownFileType,
+        FileTypeData(FileType t = FileType::Unknown,
                      const QString &tN = QString(),
                      const QString &aff = QString(),
                      const QIcon &i = QIcon()) :
@@ -321,7 +321,7 @@ struct InternalNode
     QList<InternalNode *> virtualfolders;
     QMap<QString, InternalNode *> subnodes;
     FileNameList files;
-    FileType type = UnknownFileType;
+    FileType type = FileType::Unknown;
     int priority = 0;
     QString displayName;
     QString typeName;
@@ -440,7 +440,7 @@ struct InternalNode
     // Makes the projectNode's subtree below the given folder match this internal node's subtree
     void updateSubFolders(FolderNode *folder)
     {
-        if (type == ResourceType)
+        if (type == FileType::Resource)
             updateResourceFiles(folder);
         else
             updateFiles(folder, type);
@@ -715,7 +715,7 @@ void QmakePriFileNode::update(const Internal::PriFileEvalResult &result)
 {
     // add project file node
     if (m_fileNodes.isEmpty())
-        addFileNodes(QList<FileNode *>() << new FileNode(m_projectFilePath, ProjectFileType, false));
+        addFileNodes(QList<FileNode *>() << new FileNode(m_projectFilePath, FileType::Project, false));
 
     m_recursiveEnumerateFiles = result.recursiveEnumerateFiles;
     watchFolders(result.folders.toSet());
@@ -931,7 +931,7 @@ QList<ProjectAction> QmakePriFileNode::supportedActions(Node *node) const
     }
 
     FileNode *fileNode = node->asFileNode();
-    if ((fileNode && fileNode->fileType() != ProjectFileType)
+    if ((fileNode && fileNode->fileType() != FileType::Project)
             || dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(node)) {
         actions << Rename;
         actions << DuplicateFile;
@@ -1347,11 +1347,11 @@ QStringList QmakePriFileNode::varNames(FileType type, QtSupport::ProFileReader *
 {
     QStringList vars;
     switch (type) {
-    case HeaderType:
+    case FileType::Header:
         vars << QLatin1String("HEADERS");
         vars << QLatin1String("PRECOMPILED_HEADER");
         break;
-    case SourceType: {
+    case FileType::Source: {
         vars << QLatin1String("SOURCES");
         QStringList listOfExtraCompilers = readerExact->values(QLatin1String("QMAKE_EXTRA_COMPILERS"));
         foreach (const QString &var, listOfExtraCompilers) {
@@ -1367,19 +1367,19 @@ QStringList QmakePriFileNode::varNames(FileType type, QtSupport::ProFileReader *
         }
         break;
     }
-    case ResourceType:
+    case FileType::Resource:
         vars << QLatin1String("RESOURCES");
         break;
-    case FormType:
+    case FileType::Form:
         vars << QLatin1String("FORMS");
         break;
-    case StateChartType:
+    case FileType::StateChart:
         vars << QLatin1String("STATECHARTS");
         break;
-    case ProjectFileType:
+    case FileType::Project:
         vars << QLatin1String("SUBDIRS");
         break;
-    case QMLType:
+    case FileType::QML:
         vars << QLatin1String("OTHER_FILES");
         vars << QLatin1String("DISTFILES");
         break;
@@ -1456,10 +1456,10 @@ QStringList QmakePriFileNode::varNamesForRemoving()
 
 QSet<FileName> QmakePriFileNode::filterFilesProVariables(FileType fileType, const QSet<FileName> &files)
 {
-    if (fileType != QMLType && fileType != UnknownFileType)
+    if (fileType != FileType::QML && fileType != FileType::Unknown)
         return files;
     QSet<FileName> result;
-    if (fileType == QMLType) {
+    if (fileType == FileType::QML) {
         foreach (const FileName &file, files)
             if (file.toString().endsWith(QLatin1String(".qml")))
                 result << file;
@@ -1474,9 +1474,9 @@ QSet<FileName> QmakePriFileNode::filterFilesProVariables(FileType fileType, cons
 QSet<FileName> QmakePriFileNode::filterFilesRecursiveEnumerata(FileType fileType, const QSet<FileName> &files)
 {
     QSet<FileName> result;
-    if (fileType != QMLType && fileType != UnknownFileType)
+    if (fileType != FileType::QML && fileType != FileType::Unknown)
         return result;
-    if (fileType == QMLType) {
+    if (fileType == FileType::QML) {
         foreach (const FileName &file, files)
             if (file.toString().endsWith(QLatin1String(".qml")))
                 result << file;
@@ -2462,7 +2462,7 @@ QStringList QmakeProFileNode::generatedFiles(const QString &buildDir,
     // ui_*.h files into a special directory, or even change the .h suffix, we
     // cannot help doing this here.
     switch (sourceFile->fileType()) {
-    case FormType: {
+    case FileType::Form: {
         FileName location;
         auto it = m_varValues.constFind(UiDirVar);
         if (it != m_varValues.constEnd() && !it.value().isEmpty())
@@ -2476,7 +2476,7 @@ QStringList QmakeProFileNode::generatedFiles(const QString &buildDir,
                             + singleVariableValue(HeaderExtensionVar));
         return QStringList(QDir::cleanPath(location.toString()));
     }
-    case StateChartType: {
+    case FileType::StateChart: {
         if (buildDir.isEmpty())
             return QStringList();
         QString location = QDir::cleanPath(FileName::fromString(buildDir).appendPath(
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index 4a06be86ad..92b95f390b 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -136,14 +136,14 @@ public:
     void clear();
     bool equals(const QmakeProjectFiles &f) const;
 
-    QStringList files[FileTypeSize];
-    QStringList generatedFiles[FileTypeSize];
+    QStringList files[static_cast<int>(FileType::FileTypeSize)];
+    QStringList generatedFiles[static_cast<int>(FileType::FileTypeSize)];
     QStringList proFiles;
 };
 
 void QmakeProjectFiles::clear()
 {
-    for (int i = 0; i < FileTypeSize; ++i) {
+    for (int i = 0; i < static_cast<int>(FileType::FileTypeSize); ++i) {
         files[i].clear();
         generatedFiles[i].clear();
     }
@@ -152,7 +152,7 @@ void QmakeProjectFiles::clear()
 
 bool QmakeProjectFiles::equals(const QmakeProjectFiles &f) const
 {
-    for (int i = 0; i < FileTypeSize; ++i)
+    for (int i = 0; i < static_cast<int>(FileType::FileTypeSize); ++i)
         if (files[i] != f.files[i] || generatedFiles[i] != f.generatedFiles[i])
             return false;
     if (proFiles != f.proFiles)
@@ -170,7 +170,7 @@ QDebug operator<<(QDebug d, const  QmakeProjectFiles &f)
 {
     QDebug nsp = d.nospace();
     nsp << "QmakeProjectFiles: proFiles=" <<  f.proFiles << '\n';
-    for (int i = 0; i < FileTypeSize; ++i)
+    for (int i = 0; i < static_cast<int>(FileType::FileTypeSize); ++i)
         nsp << "Type " << i << " files=" << f.files[i] <<  " generated=" << f.generatedFiles[i] << '\n';
     return d;
 }
@@ -209,7 +209,7 @@ void ProjectFilesVisitor::findProjectFiles(QmakeProFileNode *rootNode, QmakeProj
     files->clear();
     ProjectFilesVisitor visitor(files);
     rootNode->accept(&visitor);
-    for (int i = 0; i < FileTypeSize; ++i) {
+    for (int i = 0; i < static_cast<int>(FileType::FileTypeSize); ++i) {
         Utils::sort(files->files[i]);
         unique(files->files[i]);
         Utils::sort(files->generatedFiles[i]);
@@ -228,10 +228,10 @@ void ProjectFilesVisitor::visitProjectNode(ProjectNode *projectNode)
 void ProjectFilesVisitor::visitFolderNode(FolderNode *folderNode)
 {
     if (dynamic_cast<ResourceEditor::ResourceTopLevelNode *>(folderNode))
-        m_files->files[ResourceType].push_back(folderNode->filePath().toString());
+        m_files->files[static_cast<int>(FileType::Resource)].push_back(folderNode->filePath().toString());
 
     foreach (FileNode *fileNode, folderNode->fileNodes()) {
-        const int type = fileNode->fileType();
+        const int type = static_cast<int>(fileNode->fileType());
         QStringList &targetList = fileNode->isGenerated() ? m_files->generatedFiles[type] : m_files->files[type];
         targetList.push_back(fileNode->filePath().toString());
     }
@@ -822,7 +822,7 @@ QString QmakeProject::displayName() const
 QStringList QmakeProject::files(FilesMode fileMode) const
 {
     QStringList files;
-    for (int i = 0; i < FileTypeSize; ++i) {
+    for (int i = 0; i < static_cast<int>(FileType::FileTypeSize); ++i) {
         if (fileMode & SourceFiles)
             files += m_projectFiles->files[i];
         if (fileMode & GeneratedFiles)
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
index a1d269a188..bd6ed110b9 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp
@@ -328,7 +328,7 @@ void QmakeProjectManagerPlugin::updateContextActions(ProjectExplorer::Node *node
     }
     ProjectExplorer::FileNode *fileNode = node ? node->asFileNode() : nullptr;
     bool buildFilePossible = subProjectNode && fileNode
-            && (fileNode->fileType() == ProjectExplorer::SourceType);
+            && (fileNode->fileType() == ProjectExplorer::FileType::Source);
 
     m_qmakeProjectManager->setContextNode(subProjectNode);
     m_qmakeProjectManager->setContextProject(qmakeProject);
diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
index 282990b242..6062d117ab 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
@@ -60,14 +60,14 @@ void QmlProjectNode::refresh()
     using namespace ProjectExplorer;
 
     FileNode *projectFilesNode = new FileNode(m_project->filesFileName(),
-                                              ProjectFileType,
+                                              FileType::Project,
                                               /* generated = */ false);
 
     QStringList files = m_project->files();
     files.removeAll(m_project->filesFileName().toString());
 
     QList<FileNode *> fileNodes = Utils::transform(files, [](const QString &f) {
-        FileType fileType = SourceType; // ### FIXME
+        FileType fileType = FileType::Source; // ### FIXME
         return new FileNode(Utils::FileName::fromString(f), fileType, false);
 
     });
@@ -89,7 +89,7 @@ QList<ProjectExplorer::ProjectAction> QmlProjectNode::supportedActions(Node *nod
     actions.append(ProjectExplorer::EraseFile);
     if (node->nodeType() == ProjectExplorer::NodeType::File) {
         ProjectExplorer::FileNode *fileNode = static_cast<ProjectExplorer::FileNode *>(node);
-        if (fileNode->fileType() != ProjectExplorer::ProjectFileType)
+        if (fileNode->fileType() != ProjectExplorer::FileType::Project)
             actions.append(ProjectExplorer::Rename);
     }
     return actions;
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp
index 423bfc763b..e912e3d24b 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.cpp
+++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp
@@ -136,7 +136,7 @@ Utils::FileName QScxmlcGenerator::tmpFile() const
 
 FileType QScxmlcGeneratorFactory::sourceType() const
 {
-    return StateChartType;
+    return FileType::StateChart;
 }
 
 QString QScxmlcGeneratorFactory::sourceTag() const
diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp
index ff8c93e1bb..a88619e521 100644
--- a/src/plugins/qtsupport/uicgenerator.cpp
+++ b/src/plugins/qtsupport/uicgenerator.cpp
@@ -88,7 +88,7 @@ FileNameToContentsHash UicGenerator::handleProcessFinished(QProcess *process)
 
 FileType UicGeneratorFactory::sourceType() const
 {
-    return FormType;
+    return FileType::Form;
 }
 
 QString UicGeneratorFactory::sourceTag() const
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp
index f76bdd11de..5133686f2e 100644
--- a/src/plugins/resourceeditor/resourcenode.cpp
+++ b/src/plugins/resourceeditor/resourcenode.cpp
@@ -593,7 +593,7 @@ bool ResourceFileWatcher::reload(QString *errorString, ReloadFlag flag, ChangeTy
 }
 
 ResourceFileNode::ResourceFileNode(const Utils::FileName &filePath, const QString &qrcPath, const QString &displayName)
-    : ProjectExplorer::FileNode(filePath, ProjectExplorer::UnknownFileType, false)
+    : ProjectExplorer::FileNode(filePath, ProjectExplorer::FileType::Unknown, false)
     , m_qrcPath(qrcPath)
     , m_displayName(displayName)
 {