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

CppTools: Distinguish between ProjectFile::{unclassified,unsupported}

Browse Source 
There was no way to determine whether ProjectFile::classify() was run or
not. Now, ProjectFile::classify() returns ProjectFile::Unsupported
instead of ProjectFile::Unclassified.

Change-Id: I660d0e42044bdefcac38058c6f4a3425983a6d93
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-02-01 09:48:58 +01:00
committed by David Schulz
parent 6bf8f85b33
commit e2e78c6a5d
9 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cpptools/cppprojectfile.cpp
View File

@@ -53,7 +53,7 @@ ProjectFile::Kind ProjectFile::classify(const QString &filePath)
Utils::MimeDatabase mdb;
const Utils::MimeType mimeType = mdb.mimeTypeForFile(filePath);
if (!mimeType.isValid())
return Unclassified;
return Unsupported;
const QString mt = mimeType.name();
if (mt == QLatin1String(CppTools::Constants::C_SOURCE_MIMETYPE))
return CSource;
@@ -71,7 +71,7 @@ ProjectFile::Kind ProjectFile::classify(const QString &filePath)
return CXXSource;
if (mt == QLatin1String(CppTools::Constants::MOC_MIMETYPE))
return CXXSource;
return Unclassified;
return Unsupported;
}
bool ProjectFile::isAmbiguousHeader(const QString &filePath)
@@ -86,7 +86,7 @@ bool ProjectFile::isHeader(ProjectFile::Kind kind)
case ProjectFile::CXXHeader:
case ProjectFile::ObjCHeader:
case ProjectFile::ObjCXXHeader:
case ProjectFile::Unclassified: // no file extension, e.g. stl headers
case ProjectFile::Unsupported: // no file extension, e.g. stl headers
case ProjectFile::AmbiguousHeader:
return true;
default:
@@ -124,6 +124,7 @@ const char *projectFileKindToText(ProjectFile::Kind kind)
{
switch (kind) {
RETURN_TEXT_FOR_CASE(Unclassified);
RETURN_TEXT_FOR_CASE(Unsupported);
RETURN_TEXT_FOR_CASE(AmbiguousHeader);
RETURN_TEXT_FOR_CASE(CHeader);
RETURN_TEXT_FOR_CASE(CSource);