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

CppTools: Simplify ProjectUpdateInfo

Browse Source 
...by using KitInfo.

Change-Id: I17b4dd6c368ba8b10b765f12a4663c041c9be7e5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-01-08 12:33:18 +01:00
parent 4ce9ec5d63
commit 7b494c068e
10 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
View File

@@ -280,6 +280,5 @@ void AutotoolsProject::updateCppCodeModel()
rpp.setMacros(m_makefileParserThread->macros());
rpp.setFiles(m_files);
m_cppCodeModelUpdater->update(
{this, kitInfo.cToolChain, kitInfo.cxxToolChain, kitInfo.kit, {rpp}});
m_cppCodeModelUpdater->update({this, kitInfo, {rpp}});
}

3
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -296,8 +296,7 @@ void CMakeProject::updateProjectData(CMakeBuildConfiguration *bc)
rpp.setFlagsForC({kitInfo.cToolChain, rpp.flagsForC.commandLineFlags});
}
m_cppCodeModelUpdater->update(
{this, kitInfo.cToolChain, kitInfo.cxxToolChain, kitInfo.kit, rpps});
m_cppCodeModelUpdater->update({this, kitInfo, rpps});
updateQmlJSCodeModel();

11
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
View File

@@ -30,6 +30,7 @@
#include <coreplugin/icontext.h>
#include <cpptools/projectinfo.h>
#include <cpptools/cppkitinfo.h>
#include <cpptools/cppprojectupdater.h>
#include <projectexplorer/gcctoolchain.h>
#include <projectexplorer/headerpath.h>
@@ -358,10 +359,10 @@ void CompilationDatabaseProject::buildTreeAndProjectParts(const Utils::FileName
auto root = std::make_unique<DBProjectNode>(projectDirectory());
CppTools::KitInfo kitInfo(this);
QTC_ASSERT(kitInfo.isValid(), return);
CppTools::RawProjectParts rpps;
Utils::FileName commonPath;
ToolChain *cToolchain = nullptr;
ToolChain *cxxToolchain = nullptr;
std::sort(array.begin(), array.end(), [](const Entry &lhs, const Entry &rhs) {
return std::lexicographical_compare(lhs.flags.begin(), lhs.flags.end(),
@@ -383,8 +384,8 @@ void CompilationDatabaseProject::buildTreeAndProjectParts(const Utils::FileName
CppTools::RawProjectPart rpp = makeRawProjectPart(projectFile,
m_kit.get(),
cToolchain,
cxxToolchain,
kitInfo.cToolChain,
kitInfo.cxxToolChain,
entry.workingDir,
entry.fileName,
entry.flags);
@@ -401,7 +402,7 @@ void CompilationDatabaseProject::buildTreeAndProjectParts(const Utils::FileName
setRootProjectNode(std::move(root));
m_cppCodeModelUpdater->update({this, cToolchain, cxxToolchain, m_kit.get(), rpps});
m_cppCodeModelUpdater->update({this, kitInfo, rpps});
emitParsingFinished(true);
}

3
src/plugins/cpptools/cppkitinfo.cpp
View File

@@ -51,6 +51,9 @@ KitInfo::KitInfo(Project *project)
cToolChain = ToolChainKitInformation::toolChain(kit, Constants::C_LANGUAGE_ID);
cxxToolChain = ToolChainKitInformation::toolChain(kit, Constants::CXX_LANGUAGE_ID);
}
// Sysroot
sysRootPath = ProjectExplorer::SysRootKitInformation::sysRoot(kit).toString();
}
bool KitInfo::isValid() const

2
src/plugins/cpptools/cppkitinfo.h
View File

@@ -49,6 +49,8 @@ public:
ProjectExplorer::ToolChain *cxxToolChain = nullptr;
ProjectPart::QtVersion projectPartQtVersion = ProjectPart::NoQt;
QString sysRootPath;
};
} // namespace CppTools

31
src/plugins/cpptools/projectinfo.cpp
View File

@@ -25,6 +25,8 @@
#include "projectinfo.h"
#include "cppkitinfo.h"
#include <projectexplorer/abi.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/kitinformation.h>
@@ -33,7 +35,7 @@
namespace CppTools {
ToolChainInfo::ToolChainInfo(const ProjectExplorer::ToolChain *toolChain,
const ProjectExplorer::Kit *kit)
const QString &sysRootPath)
{
if (toolChain) {
// Keep the following cheap/non-blocking for the ui thread...
@@ -46,36 +48,21 @@ ToolChainInfo::ToolChainInfo(const ProjectExplorer::ToolChain *toolChain,
// ...and save the potentially expensive operations for later so that
// they can be run from a worker thread.
sysRootPath = ProjectExplorer::SysRootKitInformation::sysRoot(kit).toString();
this->sysRootPath = sysRootPath;
headerPathsRunner = toolChain->createBuiltInHeaderPathsRunner();
macroInspectionRunner = toolChain->createMacroInspectionRunner();
}
}
ProjectUpdateInfo::ProjectUpdateInfo(ProjectExplorer::Project *project,
const ProjectExplorer::ToolChain *cToolChain,
const ProjectExplorer::ToolChain *cxxToolChain,
const ProjectExplorer::Kit *kit,
const KitInfo &kitInfo,
const RawProjectParts &rawProjectParts)
: project(project)
, rawProjectParts(rawProjectParts)
, cToolChain(cToolChain)
, cxxToolChain(cxxToolChain)
, cToolChainInfo(ToolChainInfo(cToolChain, kit))
, cxxToolChainInfo(ToolChainInfo(cxxToolChain, kit))
{
}
ProjectUpdateInfo::ProjectUpdateInfo(ProjectExplorer::Project *project,
const ToolChainInfo &cToolChainInfo,
const ToolChainInfo &cxxToolChainInfo,
const RawProjectParts &rawProjectParts)
: project(project)
, rawProjectParts(rawProjectParts)
, cToolChain(nullptr)
, cxxToolChain(nullptr)
, cToolChainInfo(cToolChainInfo)
, cxxToolChainInfo(cxxToolChainInfo)
, cToolChain(kitInfo.cToolChain)
, cxxToolChain(kitInfo.cxxToolChain)
, cToolChainInfo(ToolChainInfo(cToolChain, kitInfo.sysRootPath))
, cxxToolChainInfo(ToolChainInfo(cxxToolChain, kitInfo.sysRootPath))
{
}

12
src/plugins/cpptools/projectinfo.h
View File

@@ -40,12 +40,14 @@
namespace CppTools {
class KitInfo;
class ToolChainInfo
{
public:
ToolChainInfo() = default;
ToolChainInfo(const ProjectExplorer::ToolChain *toolChain,
const ProjectExplorer::Kit *kit);
const QString &sysRootPath);
bool isValid() const { return type.isValid(); }
@@ -66,13 +68,7 @@ class CPPTOOLS_EXPORT ProjectUpdateInfo
public:
ProjectUpdateInfo() = default;
ProjectUpdateInfo(ProjectExplorer::Project *project,
const ProjectExplorer::ToolChain *cToolChain,
const ProjectExplorer::ToolChain *cxxToolChain,
const ProjectExplorer::Kit *kit,
const RawProjectParts &rawProjectParts);
ProjectUpdateInfo(ProjectExplorer::Project *project,
const ToolChainInfo &cToolChainInfo,
const ToolChainInfo &cxxToolChainInfo,
const KitInfo &kitInfo,
const RawProjectParts &rawProjectParts);
bool isValid() const { return project && !rawProjectParts.isEmpty(); }

3
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -438,8 +438,7 @@ void GenericProject::refreshCppCodeModel()
rpp.setConfigFileName(m_configFileName);
rpp.setFiles(m_files);
m_cppCodeModelUpdater->update(
{this, kitInfo.cToolChain, kitInfo.cxxToolChain, kitInfo.kit, {rpp}});
m_cppCodeModelUpdater->update({this, kitInfo, {rpp}});
}
void GenericProject::updateDeploymentData()

3
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -1052,8 +1052,7 @@ void QbsProject::updateCppCodeModel()
}
CppTools::GeneratedCodeModelSupport::update(m_extraCompilers);
m_cppCodeModelUpdater->update(
{this, kitInfo.cToolChain, kitInfo.cxxToolChain, kitInfo.kit, rpps});
m_cppCodeModelUpdater->update({this, kitInfo, rpps});
}
void QbsProject::updateQmlJsCodeModel()

3
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -323,8 +323,7 @@ void QmakeProject::updateCppCodeModel()
}
CppTools::GeneratedCodeModelSupport::update(generators);
m_cppCodeModelUpdater->update(
{this, kitInfo.cToolChain, kitInfo.cxxToolChain, kitInfo.kit, rpps});
m_cppCodeModelUpdater->update({this, kitInfo, rpps});
}
void QmakeProject::updateQmlJSCodeModel()