From a33ae02927f8266da669830b67bf84854241d61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Tue, 10 Feb 2009 17:37:18 +0100
Subject: [PATCH] Revert now unnecessary checks for null-types
This reverts commits:
c721304a4731a91a9e143a54d2ab3ef89526e05e
885d908ea336de72e7fce2141c1060e425f2af0a
a0909989f7d71ee754cdb61202a519cabff25f7c
fb4ad59ddbf727f13f29df6bcff80a88e1e1a319
0a9a67cf547701a278f19dbe2b9fb0a70a36cdb8
0d1624d4d1d5ce4e350476fbc86a361fad2ef6b8
d018cfd5cb4aad0101c321fe2fcf9b21598e9590
0504fdd00bce8d9580a52335093b57215f4272da
a2fd10fe193dbf8369e43d7df9a59503c8853b2b
Conflicts:
src/plugins/cpptools/cppcodecompletion.cpp
Reviewed-by: Roberto Raggi
---
src/libs/cplusplus/OverviewModel.cpp | 2 +-
src/plugins/cppeditor/cppeditor.cpp | 2 --
src/plugins/cppeditor/cpphoverhandler.cpp | 2 +-
src/plugins/cpptools/cppcodecompletion.cpp | 21 ++++-----------------
src/shared/cplusplus/CheckExpression.cpp | 4 ++--
5 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/src/libs/cplusplus/OverviewModel.cpp b/src/libs/cplusplus/OverviewModel.cpp
index 0855bcbd8f6..1bef20f36d3 100644
--- a/src/libs/cplusplus/OverviewModel.cpp
+++ b/src/libs/cplusplus/OverviewModel.cpp
@@ -171,7 +171,7 @@ QVariant OverviewModel::data(const QModelIndex &index, int role) const
if (! symbol->isScopedSymbol() || symbol->isFunction()) {
QString type = _overview.prettyType(symbol->type());
if (! type.isEmpty()) {
- if (symbol->type() && ! symbol->type()->isFunctionType())
+ if (! symbol->type()->isFunctionType())
name += QLatin1String(": ");
name += type;
}
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index d66e590593b..b0eb63ffe35 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -593,8 +593,6 @@ Symbol *CPPEditor::findDefinition(Symbol *symbol)
{
if (symbol->isFunction())
return 0; // symbol is a function definition.
- else if (! symbol->type())
- return 0;
Function *funTy = symbol->type()->asFunctionType();
if (! funTy)
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index 2547b8564d9..3959d953f92 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -256,7 +256,7 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
const QList<TypeOfExpression::Result> types =
typeOfExpression(expression, doc, lastSymbol);
- if (!types.isEmpty() && types.first().first) {
+ if (!types.isEmpty()) {
FullySpecifiedType firstType = types.first().first;
Symbol *symbol = types.first().second;
FullySpecifiedType docType = firstType;
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index dcf41e3e744..f9ea3b0bbe9 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -578,8 +578,6 @@ bool CppCodeCompletion::completeFunction(FullySpecifiedType exprTy,
QSet<QString> signatures;
foreach (TypeOfExpression::Result p, resolvedTypes) {
FullySpecifiedType ty = p.first;
- if (! ty)
- continue;
if (Function *fun = ty->asFunctionType()) {
if (TextEditor::CompletionItem item = toCompletionItem(fun)) {
QString signature;
@@ -602,7 +600,7 @@ bool CppCodeCompletion::completeFunction(FullySpecifiedType exprTy,
bool CppCodeCompletion::completeMember(const QList<TypeOfExpression::Result> &results,
const LookupContext &context)
{
- if (results.isEmpty() || ! results.first().first)
+ if (results.isEmpty())
return false;
TypeOfExpression::Result result = results.first();
@@ -898,10 +896,7 @@ bool CppCodeCompletion::completeConstructors(Class *klass)
for (unsigned i = 0; i < klass->memberCount(); ++i) {
Symbol *member = klass->memberAt(i);
- FullySpecifiedType memberTy = member->type();
- if (! memberTy)
- continue;
- else if (! memberTy->isFunctionType())
+ if (! member->type()->isFunctionType())
continue;
else if (! member->identity())
continue;
@@ -935,12 +930,8 @@ bool CppCodeCompletion::completeQtMethod(CPlusPlus::FullySpecifiedType,
QSet<QString> signatures;
foreach (TypeOfExpression::Result p, results) {
FullySpecifiedType ty = p.first;
- if (! ty)
- continue;
-
if (ReferenceType *refTy = ty->asReferenceType())
ty = refTy->elementType();
-
if (PointerType *ptrTy = ty->asPointerType())
ty = ptrTy->elementType();
else
@@ -968,8 +959,6 @@ bool CppCodeCompletion::completeQtMethod(CPlusPlus::FullySpecifiedType,
for (unsigned i = 0; i < scope->symbolCount(); ++i) {
Symbol *member = scope->symbolAt(i);
- if (! member->type())
- continue;
Function *fun = member->type()->asFunctionType();
if (! fun)
continue;
@@ -1127,15 +1116,13 @@ void CppCodeCompletion::complete(const TextEditor::CompletionItem &item)
extraChars += QLatin1Char('(');
// If the function takes no arguments, automatically place the closing parenthesis
- if (function->argumentCount() == 0 || (function->argumentCount() == 1 &&
- function->argumentAt(0)->type() &&
+ if (function->argumentCount() == 0 || (function->argumentCount() == 1 &&
function->argumentAt(0)->type()->isVoidType())) {
extraChars += QLatin1Char(')');
// If the function doesn't return anything, automatically place the semicolon,
// unless we're doing a scope completion (then it might be function definition).
- FullySpecifiedType retTy = function->returnType();
- if (retTy && retTy->isVoidType() && m_completionOperator != T_COLON_COLON) {
+ if (function->returnType()->isVoidType() && m_completionOperator != T_COLON_COLON) {
extraChars += QLatin1Char(';');
}
}
diff --git a/src/shared/cplusplus/CheckExpression.cpp b/src/shared/cplusplus/CheckExpression.cpp
index aaf24c48e15..a2b6c68677a 100644
--- a/src/shared/cplusplus/CheckExpression.cpp
+++ b/src/shared/cplusplus/CheckExpression.cpp
@@ -320,8 +320,8 @@ bool CheckExpression::visit(QtMethodAST *ast)
Scope dummy;
FullySpecifiedType methTy = semantic()->check(ast->declarator, FullySpecifiedType(),
&dummy, &name);
- Function *fty = 0;
- if (! methTy || 0 == (fty = methTy->asFunctionType()))
+ Function *fty = methTy->asFunctionType();
+ if (! fty)
translationUnit()->warning(ast->firstToken(), "expected a function declarator");
else {
for (unsigned i = 0; i < fty->argumentCount(); ++i) {
--
GitLab