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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/ios/iosrunfactories.cpp
	src/plugins/nim/project/nimproject.h
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
	src/plugins/qnx/qnxrunconfigurationfactory.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/winrt/winrtrunfactories.cpp

Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539
This commit is contained in:
Eike Ziller
2018-03-13 11:25:38 +01:00
parent f1985df55d 0bcc983cdb
commit 0b10ecc718
74 changed files with 2241 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/cppelementevaluator.cpp
View File

@@ -63,6 +63,11 @@ CppElement::CppElement() : helpCategory(TextEditor::HelpItem::Unknown)
CppElement::~CppElement()
{}
CppClass *CppElement::toCppClass()
{
return nullptr;
}
class Unknown : public CppElement
{
public:
@@ -156,6 +161,11 @@ bool CppClass::operator==(const CppClass &other)
return this->declaration == other.declaration;
}
CppClass *CppClass::toCppClass()
{
return this;
}
void CppClass::lookupBases(Symbol *declaration, const LookupContext &context)
{
typedef QPair<ClassOrNamespace *, CppClass *> Data;

10
src/plugins/cpptools/cppelementevaluator.h
View File

@@ -81,6 +81,8 @@ private:
QString m_diagnosis;
};
class CppClass;
class CPPTOOLS_EXPORT CppElement
{
protected:
@@ -89,6 +91,8 @@ protected:
public:
virtual ~CppElement();
virtual CppClass *toCppClass();
TextEditor::HelpItem::Category helpCategory;
QStringList helpIdCandidates;
QString helpMark;
@@ -96,7 +100,7 @@ public:
QString tooltip;
};
class CppDeclarableElement : public CppElement
class CPPTOOLS_EXPORT CppDeclarableElement : public CppElement
{
public:
explicit CppDeclarableElement(CPlusPlus::Symbol *declaration);
@@ -109,7 +113,7 @@ public:
QIcon icon;
};
class CppClass : public CppDeclarableElement
class CPPTOOLS_EXPORT CppClass : public CppDeclarableElement
{
public:
CppClass();
@@ -117,6 +121,8 @@ public:
bool operator==(const CppClass &other);
CppClass *toCppClass() final;
void lookupBases(CPlusPlus::Symbol *declaration, const CPlusPlus::LookupContext &context);
void lookupDerived(CPlusPlus::Symbol *declaration, const CPlusPlus::Snapshot &snapshot);

32
src/plugins/cpptools/tidychecks.ui
View File

@@ -30,82 +30,82 @@
<widget class="QListWidget" name="checksList">
<item>
<property name="text">
<string>android-*</string>
<string notr="true">android-*</string>
</property>
</item>
<item>
<property name="text">
<string>boost-*</string>
<string notr="true">boost-*</string>
</property>
</item>
<item>
<property name="text">
<string>bugprone-*</string>
<string notr="true">bugprone-*</string>
</property>
</item>
<item>
<property name="text">
<string>cert-*</string>
<string notr="true">cert-*</string>
</property>
</item>
<item>
<property name="text">
<string>cppcoreguidelines-*</string>
<string notr="true">cppcoreguidelines-*</string>
</property>
</item>
<item>
<property name="text">
<string>clang-analyzer-*</string>
<string notr="true">clang-analyzer-*</string>
</property>
</item>
<item>
<property name="text">
<string>clang-diagnostic-*</string>
<string notr="true">clang-diagnostic-*</string>
</property>
</item>
<item>
<property name="text">
<string>google-*</string>
<string notr="true">google-*</string>
</property>
</item>
<item>
<property name="text">
<string>hicpp-*</string>
<string notr="true">hicpp-*</string>
</property>
</item>
<item>
<property name="text">
<string>llvm-*</string>
<string notr="true">llvm-*</string>
</property>
</item>
<item>
<property name="text">
<string>misc-*</string>
<string notr="true">misc-*</string>
</property>
</item>
<item>
<property name="text">
<string>modernize-*</string>
<string notr="true">modernize-*</string>
</property>
</item>
<item>
<property name="text">
<string>mpi-*</string>
<string notr="true">mpi-*</string>
</property>
</item>
<item>
<property name="text">
<string>objc-*</string>
<string notr="true">objc-*</string>
</property>
</item>
<item>
<property name="text">
<string>performance-*</string>
<string notr="true">performance-*</string>
</property>
</item>
<item>
<property name="text">
<string>readability-*</string>
<string notr="true">readability-*</string>
</property>
</item>
</widget>