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

C++: remove C/C++ distinction from ProjectPart fields.

Browse Source 
.. because they now hold only files for a single language+extensions
combination.

Task-number: QTCREATORBUG-11709
Task-number: QTCREATORBUG-12818
Change-Id: If294f6de07d60126be733d98de12b89b8af3efce
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2014-08-21 16:26:06 +02:00
parent 193cb3b9a5
commit 990cedeb1b
13 changed files with 192 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/cpptools/cppprojects.h
View File

@@ -45,27 +45,29 @@ namespace CppTools {
class CPPTOOLS_EXPORT ProjectPart
{
public: // Types
enum CVersion {
enum LanguageVersion {
C89,
C99,
C11
};
enum CXXVersion {
C11,
CXX98,
CXX11
CXX03,
CXX11,
CXX14,
CXX17
};
enum CXXExtension {
NoExtensions = 0x0,
GnuExtensions = 0x1,
MicrosoftExtensions = 0x2,
BorlandExtensions = 0x4,
OpenMPExtensions = 0x8,
enum LanguageExtension {
NoExtensions = 0,
GnuExtensions = 1 << 0,
MicrosoftExtensions = 1 << 1,
BorlandExtensions = 1 << 2,
OpenMPExtensions = 1 << 3,
ObjectiveCExtensions = 1 << 4,
AllExtensions = GnuExtensions | MicrosoftExtensions | BorlandExtensions | OpenMPExtensions
| ObjectiveCExtensions
};
Q_DECLARE_FLAGS(CXXExtensions, CXXExtension)
Q_DECLARE_FLAGS(LanguageExtensions, LanguageExtension)
enum QtVersion {
UnknownQt = -1,
@@ -101,8 +103,7 @@ public: // methods
ProjectPart();
void evaluateToolchain(const ProjectExplorer::ToolChain *tc,
const QStringList &cxxflags,
const QStringList &cflags,
const QStringList &commandLineFlags,
const Utils::FileName &sysRoot);
Ptr copy() const;
@@ -121,12 +122,10 @@ public: // fields
QByteArray toolchainDefines;
QList<HeaderPath> headerPaths;
QStringList precompiledHeaders;
CVersion cVersion;
CXXVersion cxxVersion;
CXXExtensions cxxExtensions;
LanguageVersion languageVersion;
LanguageExtensions languageExtensions;
QtVersion qtVersion;
ProjectExplorer::ToolChain::WarningFlags cWarningFlags;
ProjectExplorer::ToolChain::WarningFlags cxxWarningFlags;
ProjectExplorer::ToolChain::WarningFlags warningFlags;
};
inline uint qHash(const ProjectPart::HeaderPath &key, uint seed = 0)
@@ -182,7 +181,8 @@ public:
private:
void createProjectPart(const QStringList &theSources, const QString &partName,
ProjectPart::CVersion cVersion, ProjectPart::CXXVersion cxxVersion);
ProjectPart::LanguageVersion languageVersion,
ProjectPart::LanguageExtensions languageExtensions);
private:
ProjectPart::Ptr m_templatePart;