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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Conflicts:
    src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
    src/plugins/git/gitplugin.cpp

Change-Id: I78a21510d484b655e01141a3543e08ee2123f9cd
This commit is contained in:
Eike Ziller
2015-11-23 14:25:38 +01:00
parent 22e3a7b3a4 499589096a
commit 3f63635053
132 changed files with 6287 additions and 2315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/cppeditor/cppinsertvirtualmethods.cpp
View File

@@ -567,15 +567,15 @@ public:
// Determine base classes
QList<const Class *> baseClasses;
QQueue<LookupScope *> baseClassQueue;
QSet<LookupScope *> visitedBaseClasses;
if (LookupScope *clazz = interface.context().lookupType(m_classAST->symbol))
QQueue<ClassOrNamespace *> baseClassQueue;
QSet<ClassOrNamespace *> visitedBaseClasses;
if (ClassOrNamespace *clazz = interface.context().lookupType(m_classAST->symbol))
baseClassQueue.enqueue(clazz);
while (!baseClassQueue.isEmpty()) {
LookupScope *clazz = baseClassQueue.dequeue();
ClassOrNamespace *clazz = baseClassQueue.dequeue();
visitedBaseClasses.insert(clazz);
const QList<LookupScope *> bases = clazz->usings();
foreach (LookupScope *baseClass, bases) {
const QList<ClassOrNamespace *> bases = clazz->usings();
foreach (ClassOrNamespace *baseClass, bases) {
foreach (Symbol *symbol, baseClass->symbols()) {
Class *base = symbol->asClass();
if (base
@@ -769,7 +769,7 @@ public:
const LookupContext targetContext(headerFile->cppDocument(), snapshot());
const Class *targetClass = m_classAST->symbol;
LookupScope *targetCoN = targetContext.lookupType(targetClass->enclosingScope());
ClassOrNamespace *targetCoN = targetContext.lookupType(targetClass->enclosingScope());
if (!targetCoN)
targetCoN = targetContext.globalNamespace();
UseMinimalNames useMinimalNames(targetCoN);
@@ -866,7 +866,7 @@ public:
implementationDoc->translationUnit()->getPosition(insertPos, &line, &column);
Scope *targetScope = implementationDoc->scopeAt(line, column);
const LookupContext targetContext(implementationDoc, snapshot());
LookupScope *targetCoN = targetContext.lookupType(targetScope);
ClassOrNamespace *targetCoN = targetContext.lookupType(targetScope);
if (!targetCoN)
targetCoN = targetContext.globalNamespace();