summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-29 21:33:57 +0100
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-01-29 21:33:57 +0100
commita6ca348636dd92ab1445cff2286b3293163f5cea (patch)
treea7eba2d2bf7928ebff553f300dd4bacd824bce75 /src/libs/cplusplus
parent07da7ccfdf6e991c282dafdc9b4337db81a1a054 (diff)
downloadqt-creator-a6ca348636dd92ab1445cff2286b3293163f5cea.tar.gz
remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
Diffstat (limited to 'src/libs/cplusplus')
-rw-r--r--src/libs/cplusplus/PreprocessorClient.cpp4
-rw-r--r--src/libs/cplusplus/ResolveExpression.cpp16
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libs/cplusplus/PreprocessorClient.cpp b/src/libs/cplusplus/PreprocessorClient.cpp
index 5b57baa7b2..89dfcd4b06 100644
--- a/src/libs/cplusplus/PreprocessorClient.cpp
+++ b/src/libs/cplusplus/PreprocessorClient.cpp
@@ -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()
*/
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 46403036ae..3fa4fca178 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -477,7 +477,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);
@@ -601,7 +601,7 @@ ResolveExpression::resolveBaseExpression(const QList<Result> &baseResults, int a
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<Result> overloads = resolveMember(arrowAccessOp, classObject->asClass(),
namedTy->name());
@@ -715,16 +715,16 @@ ResolveExpression::resolveMember(Name *memberName, Class *klass,
foreach (Symbol *candidate, candidates) {
FullySpecifiedType ty = candidate->type();
Name *unqualifiedNameId = className;
-
+
if (QualifiedNameId *q = className->asQualifiedNameId())
unqualifiedNameId = q->unqualifiedNameId();
-
+
if (TemplateNameId *templId = unqualifiedNameId->asTemplateNameId()) {
GenTemplateInstance::Substitution subst;
-
+
for (unsigned i = 0; i < templId->templateArgumentCount(); ++i) {
FullySpecifiedType templArgTy = templId->templateArgumentAt(i);
-
+
if (i < klass->templateParameterCount()) {
Name *templArgName = klass->templateParameterAt(i)->name();
if (templArgName && templArgName->identifier()) {
@@ -733,11 +733,11 @@ ResolveExpression::resolveMember(Name *memberName, Class *klass,
}
}
}
-
+
GenTemplateInstance inst(_context, subst);
ty = inst(candidate);
}
-
+
results.append(Result(ty, candidate));
}