From 21dd4c8b1b0e0e8b5d26d8adaf4a4714cab547b6 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 20 Nov 2013 16:00:35 +0100 Subject: [PATCH] QmlJS: Simplify code, fix MSVC-warning. qmljsviewercontext.cpp:80: warning: C4715: 'QmlJS::ViewerContext::languageIsCompatible': : not all control paths return a value. Change-Id: I22279ef7a43873b9c8f3d73d3826b59d5abaa390 Reviewed-by: Fawzi Mohamed --- src/libs/qmljs/qmljsviewercontext.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/libs/qmljs/qmljsviewercontext.cpp b/src/libs/qmljs/qmljsviewercontext.cpp index 5391a8bc87e..06f5dd1806f 100644 --- a/src/libs/qmljs/qmljsviewercontext.cpp +++ b/src/libs/qmljs/qmljsviewercontext.cpp @@ -58,25 +58,22 @@ bool ViewerContext::languageIsCompatible(Language::Enum l) const { switch (language) { case Language::JavaScript: - return l == Language::JavaScript; case Language::Json: - return l == Language::Json; + case Language::QmlProject: + case Language::QmlQbs: + case Language::QmlTypeInfo: + return language == l; case Language::Qml: return l == Language::Qml || l == Language::QmlQtQuick1 || l == Language::QmlQtQuick2 || Language::JavaScript; - case Language::QmlProject: - return l == Language::QmlProject; - case Language::QmlQbs: - return l == Language::QmlQbs; case Language::QmlQtQuick1: return l == Language::Qml || l == Language::QmlQtQuick1 || Language::JavaScript; case Language::QmlQtQuick2: return l == Language::Qml || l == Language::QmlQtQuick2 || Language::JavaScript; - case Language::QmlTypeInfo: - return l == Language::QmlTypeInfo; case Language::Unknown: // ? - return true; + break; } + return true; } } // namespace QmlJS