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

ProjectExplorer: Remove HeaderPath::isFrameworkPath

Browse Source 
None of the other types has a query function, so remove this one, too.

Change-Id: I936d162e092c8f9361b0e3bb86676e68905d2f4b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Tobias Hunger
2018-09-13 12:58:38 +02:00
parent 11245564da
commit c763d4d787
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -1271,7 +1271,7 @@ bool InternalCppCompletionAssistProcessor::completeInclude(const QTextCursor &cu
if (!directoryPrefix.isEmpty()) {
realPath += QLatin1Char('/');
realPath += directoryPrefix;
if (headerPath.isFrameworkPath())
if (headerPath.type == ProjectExplorer::HeaderPathType::Framework)
realPath += QLatin1String(".framework/Headers");
}
completeInclude(realPath, suffixes);

4
src/plugins/cpptools/cppsourceprocessor.cpp
View File

@@ -159,7 +159,7 @@ void CppSourceProcessor::setLanguageFeatures(const LanguageFeatures languageFeat
// if the "Frameworks" folder exists inside the top level framework.
void CppSourceProcessor::addFrameworkPath(const ProjectExplorer::HeaderPath &frameworkPath)
{
QTC_ASSERT(frameworkPath.isFrameworkPath(), return);
QTC_ASSERT(frameworkPath.type == ProjectExplorer::HeaderPathType::Framework, return);
// The algorithm below is a bit too eager, but that's because we're not getting
// in the frameworks we're linking against. If we would have that, then we could
@@ -303,7 +303,7 @@ QString CppSourceProcessor::resolveFile_helper(const QString &fileName,
for (; headerPathsIt != headerPathsEnd; ++headerPathsIt) {
if (!headerPathsIt->path.isNull()) {
QString path;
if (headerPathsIt->isFrameworkPath()) {
if (headerPathsIt->type == ProjectExplorer::HeaderPathType::Framework) {
if (index == -1)
continue;
path = headerPathsIt->path + fileName.left(index)