From 7f505011b2d7ac23862a5b7899a435610ad36cef Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Fri, 11 Jun 2010 13:37:01 +1000
Subject: [PATCH] Fix dead/unnecessary code.

---
 src/plugins/qmldesigner/designercore/model/modelmerger.cpp | 4 ++--
 src/plugins/qmldesigner/designercore/model/viewlogger.cpp  | 2 --
 src/shared/cplusplus/CheckDeclaration.cpp                  | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
index 922e8c88e3b..549b9861ee8 100644
--- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
@@ -170,9 +170,9 @@ void ModelMerger::replaceModel(const ModelNode &modelNode)
 {
      RewriterTransaction transaction(view()->beginRewriterTransaction());
 
-     foreach (const Import &import, modelNode.model()->imports()) {
+//     foreach (const Import &import, modelNode.model()->imports()) {
         //view()->model()->addImport(import); //### 
-     }
+//     }
     view()->model()->setFileUrl(modelNode.model()->fileUrl());
 
     ModelNode rootNode(view()->rootModelNode());
diff --git a/src/plugins/qmldesigner/designercore/model/viewlogger.cpp b/src/plugins/qmldesigner/designercore/model/viewlogger.cpp
index 1cb8a1b4e5e..4f4c02896c3 100644
--- a/src/plugins/qmldesigner/designercore/model/viewlogger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/viewlogger.cpp
@@ -50,8 +50,6 @@ static QString serialize(AbstractView::PropertyChangeFlags change)
         tokenList.append(QLatin1String("EmptyPropertiesRemoved"));
 
     return tokenList.join(" ");
-
-    return QString();
 }
 
 static QString indent(const QString &name = QString()) {
diff --git a/src/shared/cplusplus/CheckDeclaration.cpp b/src/shared/cplusplus/CheckDeclaration.cpp
index 2e5db3f73da..a0ae84fa5a7 100644
--- a/src/shared/cplusplus/CheckDeclaration.cpp
+++ b/src/shared/cplusplus/CheckDeclaration.cpp
@@ -874,8 +874,6 @@ void CheckDeclaration::checkQEnumsQFlagsNames(NameListAST *nameListAst,
                                               const char *declName)
 {
     for (NameListAST *iter = nameListAst; iter; iter = iter->next) {
-        if (!iter)
-            continue;
 
         const Name *name = semantic()->check(iter->value, _scope);
         if (!name)