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

Merge remote branch 'origin/1.3'

Browse Source 
Trailing whitespace removal re-applied manually.
This commit is contained in:
Oswald Buddenhagen
2010-01-29 22:49:55 +01:00
parent 4320314046 a6ca348636
commit 75b42f18d8
302 changed files with 940 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/cplusplus/PreprocessorClient.cpp
View File

@@ -62,10 +62,10 @@ using namespace CPlusPlus;
/*!
\fn void Client::startExpandingMacro(unsigned offset, const Macro &macro, const QByteArray &originalText, bool inCondition = false, const QVector<MacroArgumentReference> &actuals = QVector<MacroArgumentReference>())
Called when starting to expand a macro. The parameter \a inCondition indicates whether the
expansion is happening inside a preprocessor conditional.
\sa stopExpandingMacro()
*/

16
src/libs/cplusplus/ResolveExpression.cpp
View File

@@ -473,7 +473,7 @@ bool ResolveExpression::visit(CallAST *ast)
}
}
} else if (Function *funTy = ty->asFunctionType()) {
} else if (Function *funTy = ty->asFunctionType()) {
if (maybeValidPrototype(funTy, actualArgumentCount))
addResult(funTy->returnType().simplified(), lastVisibleSymbol);
@@ -597,7 +597,7 @@ ResolveExpression::resolveBaseExpression(const QList<LookupItem> &baseResults, i
const Name *arrowAccessOp = control()->operatorNameId(OperatorNameId::ArrowOp);
const QList<Symbol *> candidates = resolveClass(namedTy->name(), result, _context);
foreach (Symbol *classObject, candidates) {
foreach (Symbol *classObject, candidates) {
const QList<LookupItem> overloads = resolveMember(arrowAccessOp, classObject->asClass(),
namedTy->name());
@@ -715,16 +715,16 @@ ResolveExpression::resolveMember(const Name *memberName, Class *klass,
foreach (Symbol *candidate, candidates) {
FullySpecifiedType ty = candidate->type();
const Name *unqualifiedNameId = className;
if (const QualifiedNameId *q = className->asQualifiedNameId())
unqualifiedNameId = q->unqualifiedNameId();
if (const TemplateNameId *templId = unqualifiedNameId->asTemplateNameId()) {
GenTemplateInstance::Substitution subst;
for (unsigned i = 0; i < templId->templateArgumentCount(); ++i) {
FullySpecifiedType templArgTy = templId->templateArgumentAt(i);
if (i < klass->templateParameterCount()) {
const Name *templArgName = klass->templateParameterAt(i)->name();
if (templArgName && templArgName->identifier()) {
@@ -733,11 +733,11 @@ ResolveExpression::resolveMember(const Name *memberName, Class *klass,
}
}
}
GenTemplateInstance inst(_context, subst);
ty = inst(candidate);
}
results.append(LookupItem(ty, candidate));
}