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

ProjectNodes: Add method to query FileType

Browse Source 
Add methods to get the FileType based on filepath or mimetype.

Use that method in treescanner.

Change-Id: I3de50d7afd8262cc86ae722e7de4ca53921153d2
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2017-03-10 17:03:51 +01:00
parent 7648504a30
commit a70370cc04
3 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/cmakeprojectmanager/treescanner.cpp
View File

@@ -141,29 +141,7 @@ bool TreeScanner::isMimeBinary(const Utils::MimeType &mimeType, const Utils::Fil
FileType TreeScanner::genericFileType(const Utils::MimeType &mimeType, const Utils::FileName &/*fn*/)
{
FileType type = FileType::Unknown;
if (mimeType.isValid()) {
const QString mt = mimeType.name();
if (mt == CppTools::Constants::C_SOURCE_MIMETYPE
|| mt == CppTools::Constants::CPP_SOURCE_MIMETYPE
|| mt == CppTools::Constants::OBJECTIVE_C_SOURCE_MIMETYPE
|| mt == CppTools::Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE
|| mt == CppTools::Constants::QDOC_MIMETYPE
|| mt == CppTools::Constants::MOC_MIMETYPE)
type = FileType::Source;
else if (mt == CppTools::Constants::C_HEADER_MIMETYPE
|| mt == CppTools::Constants::CPP_HEADER_MIMETYPE)
type = FileType::Header;
else if (mt == ProjectExplorer::Constants::FORM_MIMETYPE)
type = FileType::Form;
else if (mt == ProjectExplorer::Constants::RESOURCE_MIMETYPE)
type = FileType::Resource;
else if (mt == ProjectExplorer::Constants::SCXML_MIMETYPE)
type = FileType::StateChart;
else if (mt == ProjectExplorer::Constants::QML_MIMETYPE)
type = FileType::QML;
}
return type;
return Node::fileTypeForMimeType(mimeType);
}
void TreeScanner::scanForFiles(FutureInterface *fi, const Utils::FileName& directory, const FileFilter &filter, const FileTypeFactory &factory)

29
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -36,6 +36,8 @@
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
#include <utils/mimetypes/mimedatabase.h>
#include <utils/mimetypes/mimetype.h>
#include <utils/qtcassert.h>
#include <QFileInfo>
@@ -233,6 +235,33 @@ void Node::setParentFolderNode(FolderNode *parentFolder)
m_parentFolderNode = parentFolder;
}
FileType Node::fileTypeForMimeType(const Utils::MimeType &mt)
{
FileType type = FileType::Source;
if (mt.isValid()) {
const QString mtName = mt.name();
if (mtName == Constants::C_HEADER_MIMETYPE
|| mtName == Constants::CPP_HEADER_MIMETYPE)
type = FileType::Header;
else if (mtName == Constants::FORM_MIMETYPE)
type = FileType::Form;
else if (mtName == Constants::RESOURCE_MIMETYPE)
type = FileType::Resource;
else if (mtName == Constants::SCXML_MIMETYPE)
type = FileType::StateChart;
else if (mtName == Constants::QML_MIMETYPE)
type = FileType::QML;
} else {
type = FileType::Unknown;
}
return type;
}
FileType Node::fileTypeForFileName(const Utils::FileName &file)
{
return fileTypeForMimeType(Utils::mimeTypeForFile(file.toString()));
}
/*!
\class ProjectExplorer::FileNode

5
src/plugins/projectexplorer/projectnodes.h
View File

@@ -36,6 +36,8 @@
#include <functional>
namespace Utils { class MimeType; }
namespace ProjectExplorer {
class RunConfiguration;
class Project;
@@ -141,6 +143,9 @@ public:
static bool sortByPath(const Node *a, const Node *b);
void setParentFolderNode(FolderNode *parentFolder);
static FileType fileTypeForMimeType(const Utils::MimeType &mt);
static FileType fileTypeForFileName(const Utils::FileName &file);
protected:
Node(NodeType nodeType, const Utils::FileName &filePath, int line = -1);