diff options
| -rw-r--r-- | src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppcompletionassist.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppsourceprocessor.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/headerpath.h | 5 |
4 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp index ad031ca5f7..1d9d8363e6 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp @@ -479,7 +479,7 @@ bool ClangCompletionAssistProcessor::completeInclude(const QTextCursor &cursor) if (!directoryPrefix.isEmpty()) { realPath += QLatin1Char('/'); realPath += directoryPrefix; - if (headerPath.isFrameworkPath()) + if (headerPath.type == ProjectExplorer::HeaderPathType::Framework) realPath += QLatin1String(".framework/Headers"); } completeIncludePath(realPath, suffixes); diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp index e709dbf573..00acaa9abe 100644 --- a/src/plugins/cpptools/cppcompletionassist.cpp +++ b/src/plugins/cpptools/cppcompletionassist.cpp @@ -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); diff --git a/src/plugins/cpptools/cppsourceprocessor.cpp b/src/plugins/cpptools/cppsourceprocessor.cpp index 0f9b94a30f..54e93ce41a 100644 --- a/src/plugins/cpptools/cppsourceprocessor.cpp +++ b/src/plugins/cpptools/cppsourceprocessor.cpp @@ -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) diff --git a/src/plugins/projectexplorer/headerpath.h b/src/plugins/projectexplorer/headerpath.h index 932c256f33..39d668aeb8 100644 --- a/src/plugins/projectexplorer/headerpath.h +++ b/src/plugins/projectexplorer/headerpath.h @@ -44,11 +44,6 @@ public: : path(path), type(type) { } - bool isFrameworkPath() const - { - return type == HeaderPathType::Framework; - } - bool operator==(const HeaderPath &other) const { return type == other.type && path == other.path; |