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: 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/shared/cplusplus/CheckExpression.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/shared/cplusplus/CheckExpression.cpp')

diff --git a/src/shared/cplusplus/CheckExpression.cpp b/src/shared/cplusplus/CheckExpression.cpp
index aaf24c48e1..a2b6c68677 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) {
-- 
cgit v1.2.1