diff options
author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-07-30 17:13:45 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-08-20 10:28:35 +0200 |
commit | 6b5298faf9f605e76e1872c89c594ab1cb9b5363 (patch) | |
tree | 5cf5d018005d75bb072c3d2a006f9a4c72130b28 /src/plugins/cpptools/cppmodelmanagerinterface.cpp | |
parent | b8a6a4dd4e2a02d9afd54303550570f1fcbcb586 (diff) | |
download | qt-creator-6b5298faf9f605e76e1872c89c594ab1cb9b5363.tar.gz |
CppTools: Move Project{Part,Info} to new cppprojects.{h,cpp}
Change-Id: Ieff216017b9da1e6a12121688ea9572bdd81fd9b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.cpp')
-rw-r--r-- | src/plugins/cpptools/cppmodelmanagerinterface.cpp | 126 |
1 files changed, 0 insertions, 126 deletions
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.cpp b/src/plugins/cpptools/cppmodelmanagerinterface.cpp index 8c79e3d0da..d6a4158b0c 100644 --- a/src/plugins/cpptools/cppmodelmanagerinterface.cpp +++ b/src/plugins/cpptools/cppmodelmanagerinterface.cpp @@ -34,8 +34,6 @@ #include <projectexplorer/headerpath.h> #include <projectexplorer/toolchain.h> -#include <QSet> - using namespace CppTools; using namespace ProjectExplorer; @@ -99,71 +97,6 @@ using namespace ProjectExplorer; \sa CppTools::CppModelManagerInterface::updateProjectInfo() */ -ProjectPart::ProjectPart() - : project(0) - , cVersion(C89) - , cxxVersion(CXX11) - , cxxExtensions(NoExtensions) - , qtVersion(UnknownQt) - , cWarningFlags(ProjectExplorer::ToolChain::WarningsDefault) - , cxxWarningFlags(ProjectExplorer::ToolChain::WarningsDefault) - -{ -} - -/*! - \brief Retrieves info from concrete compiler using it's flags. - - \param tc Either nullptr or toolchain for project's active target. - \param cxxflags C++ or Objective-C++ flags. - \param cflags C or ObjectiveC flags if possible, \a cxxflags otherwise. -*/ -void ProjectPart::evaluateToolchain(const ToolChain *tc, - const QStringList &cxxflags, - const QStringList &cflags, - const Utils::FileName &sysRoot) -{ - if (!tc) - return; - - ToolChain::CompilerFlags cxx = tc->compilerFlags(cxxflags); - ToolChain::CompilerFlags c = (cxxflags == cflags) - ? cxx : tc->compilerFlags(cflags); - - if (c & ToolChain::StandardC11) - cVersion = C11; - else if (c & ToolChain::StandardC99) - cVersion = C99; - else - cVersion = C89; - - if (cxx & ToolChain::StandardCxx11) - cxxVersion = CXX11; - else - cxxVersion = CXX98; - - if (cxx & ToolChain::BorlandExtensions) - cxxExtensions |= BorlandExtensions; - if (cxx & ToolChain::GnuExtensions) - cxxExtensions |= GnuExtensions; - if (cxx & ToolChain::MicrosoftExtensions) - cxxExtensions |= MicrosoftExtensions; - if (cxx & ToolChain::OpenMP) - cxxExtensions |= OpenMPExtensions; - - cWarningFlags = tc->warningFlags(cflags); - cxxWarningFlags = tc->warningFlags(cxxflags); - - const QList<ProjectExplorer::HeaderPath> headers = tc->systemHeaderPaths(cxxflags, sysRoot); - foreach (const ProjectExplorer::HeaderPath &header, headers) { - headerPaths << HeaderPath(header.path(), - header.kind() == ProjectExplorer::HeaderPath::FrameworkHeaderPath - ? HeaderPath::FrameworkPath : HeaderPath::IncludePath); - } - - toolchainDefines = tc->predefinedMacros(cxxflags); -} - const QString CppModelManagerInterface::configurationFileName() { return CPlusPlus::Preprocessor::configurationFileName; } @@ -183,62 +116,3 @@ CppModelManagerInterface *CppModelManagerInterface::instance() { return qobject_cast<CppModelManagerInterface *>(CPlusPlus::CppModelManagerBase::instance()); } - -void CppModelManagerInterface::ProjectInfo::clearProjectParts() -{ - m_projectParts.clear(); - m_headerPaths.clear(); - m_sourceFiles.clear(); - m_defines.clear(); -} - -void CppModelManagerInterface::ProjectInfo::appendProjectPart(const ProjectPart::Ptr &part) -{ - if (!part) - return; - - m_projectParts.append(part); - - typedef ProjectPart::HeaderPath HeaderPath; - - // Update header paths - QSet<HeaderPath> incs = QSet<HeaderPath>::fromList(m_headerPaths); - foreach (const HeaderPath &hp, part->headerPaths) { - if (!incs.contains(hp)) { - incs.insert(hp); - m_headerPaths += hp; - } - } - - // Update source files - QSet<QString> srcs = QSet<QString>::fromList(m_sourceFiles); - foreach (const ProjectFile &file, part->files) - srcs.insert(file.path); - m_sourceFiles = srcs.toList(); - - // Update defines - if (!m_defines.isEmpty()) - m_defines.append('\n'); - m_defines.append(part->toolchainDefines); - m_defines.append(part->projectDefines); - if (!part->projectConfigFile.isEmpty()) { - m_defines.append('\n'); - m_defines += readProjectConfigFile(part); - m_defines.append('\n'); - } -} - -QByteArray CppModelManagerInterface::readProjectConfigFile(const ProjectPart::Ptr &part) -{ - QByteArray result; - - QFile f(part->projectConfigFile); - if (f.open(QIODevice::ReadOnly)) { - QTextStream is(&f); - result = is.readAll().toUtf8(); - f.close(); - } - - return result; -} - |