From 1df553a68308c7be274fe95890f063ef367a2674 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 13 Sep 2018 11:44:43 +0200 Subject: ProjectExplorer: Rename IncludePathType to HeaderPathType It is the type used by the HeaderPath class, so reflect that in the name. I also considered to rename HeaderPath to IncludePath, but that name is reflected in a lot of users, which would also need to be adjusted for consistency. That would blow up the patch size for little value IMHO. Change-Id: I51421dbd3ab8b2874dc32fc82dc394c9b93ce5e9 Reviewed-by: Marco Bubke --- src/plugins/cpptools/cppsourceprocessor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/cpptools/cppsourceprocessor.cpp') diff --git a/src/plugins/cpptools/cppsourceprocessor.cpp b/src/plugins/cpptools/cppsourceprocessor.cpp index 4ca4ee5721..b16fe4b599 100644 --- a/src/plugins/cpptools/cppsourceprocessor.cpp +++ b/src/plugins/cpptools/cppsourceprocessor.cpp @@ -132,13 +132,13 @@ void CppSourceProcessor::setWorkingCopy(const WorkingCopy &workingCopy) void CppSourceProcessor::setHeaderPaths(const ProjectExplorer::HeaderPaths &headerPaths) { - using ProjectExplorer::IncludePathType; + using ProjectExplorer::HeaderPathType; m_headerPaths.clear(); for (int i = 0, ei = headerPaths.size(); i < ei; ++i) { const ProjectExplorer::HeaderPath &path = headerPaths.at(i); - if (path.type == IncludePathType::User || path.type == IncludePathType::System) + if (path.type == HeaderPathType::User || path.type == HeaderPathType::System) m_headerPaths.append({cleanPath(path.path), path.type}); else addFrameworkPath(path); @@ -165,7 +165,7 @@ void CppSourceProcessor::addFrameworkPath(const ProjectExplorer::HeaderPath &fra // in the frameworks we're linking against. If we would have that, then we could // add only those private frameworks. const ProjectExplorer::HeaderPath cleanFrameworkPath(cleanPath(frameworkPath.path), - ProjectExplorer::IncludePathType::Framework); + ProjectExplorer::HeaderPathType::Framework); if (!m_headerPaths.contains(cleanFrameworkPath)) m_headerPaths.append(cleanFrameworkPath); @@ -178,7 +178,7 @@ void CppSourceProcessor::addFrameworkPath(const ProjectExplorer::HeaderPath &fra QLatin1String("Frameworks")); if (privateFrameworks.exists() && privateFrameworks.isDir()) addFrameworkPath({privateFrameworks.absoluteFilePath(), - ProjectExplorer::IncludePathType::Framework}); + ProjectExplorer::HeaderPathType::Framework}); } } -- cgit v1.2.1