diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-11-29 13:26:05 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-12-08 08:35:42 +0000 |
| commit | 3602033fcac19fed7491b1ff5173da6c58a47c34 (patch) | |
| tree | f11e30143a4258774ed227d6fd72bb8118842812 /src/plugins/cpptools/cppprojectfilecategorizer.cpp | |
| parent | 4580e88cbe4d6ce159a8a49f56d7ca1fcb7e109b (diff) | |
| download | qt-creator-3602033fcac19fed7491b1ff5173da6c58a47c34.tar.gz | |
CppTools: Clean up ProjectFileCategorizer
Change-Id: Ia6954810ad49d43629be2db074d620ab71a09cee
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppprojectfilecategorizer.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppprojectfilecategorizer.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/plugins/cpptools/cppprojectfilecategorizer.cpp b/src/plugins/cpptools/cppprojectfilecategorizer.cpp index 6116e164d0..b4298deca6 100644 --- a/src/plugins/cpptools/cppprojectfilecategorizer.cpp +++ b/src/plugins/cpptools/cppprojectfilecategorizer.cpp @@ -27,21 +27,19 @@ namespace CppTools { -ProjectFileCategorizer::ProjectFileCategorizer(const QString &partName, - const QStringList &files, +ProjectFileCategorizer::ProjectFileCategorizer(const QString &projectPartName, + const QStringList &filePaths, ProjectPartBuilder::FileClassifier fileClassifier) - : m_partName(partName) + : m_partName(projectPartName) { - using CppTools::ProjectFile; + ProjectFiles cHeaders; + ProjectFiles cxxHeaders; - QVector<ProjectFile> cHeaders; - QVector<ProjectFile> cxxHeaders; - - foreach (const QString &file, files) { + foreach (const QString &filePath, filePaths) { const ProjectFile::Kind kind = fileClassifier - ? fileClassifier(file) - : ProjectFile::classify(file); - const ProjectFile projectFile(file, kind); + ? fileClassifier(filePath) + : ProjectFile::classify(filePath); + const ProjectFile projectFile(filePath, kind); switch (kind) { case ProjectFile::CSource: m_cSources += projectFile; break; @@ -71,11 +69,10 @@ ProjectFileCategorizer::ProjectFileCategorizer(const QString &partName, if (hasC || (!hasObjc && !hasObjcxx && !hasCxx)) m_cSources += cHeaders; - m_partCount = - (m_cSources.isEmpty() ? 0 : 1) + - (m_cxxSources.isEmpty() ? 0 : 1) + - (m_objcSources.isEmpty() ? 0 : 1) + - (m_objcxxSources.isEmpty() ? 0 : 1); + m_partCount = (m_cSources.isEmpty() ? 0 : 1) + + (m_cxxSources.isEmpty() ? 0 : 1) + + (m_objcSources.isEmpty() ? 0 : 1) + + (m_objcxxSources.isEmpty() ? 0 : 1); } QString ProjectFileCategorizer::partName(const QString &languageName) const |