feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Simplify code, fix MSVC-warning.

Browse Source 
qmljsviewercontext.cpp:80: warning: C4715:
'QmlJS::ViewerContext::languageIsCompatible':
: not all control paths return a value.

Change-Id: I22279ef7a43873b9c8f3d73d3826b59d5abaa390
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Friedemann Kleint
2013-11-20 16:00:35 +01:00
parent 11807f0db2
commit 21dd4c8b1b
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/qmljs/qmljsviewercontext.cpp
View File

@@ -58,25 +58,22 @@ bool ViewerContext::languageIsCompatible(Language::Enum l) const
{ {
switch (language) { switch (language) {
case Language::JavaScript: case Language::JavaScript:
return l == Language::JavaScript;
case Language::Json: case Language::Json:
return l == Language::Json; case Language::QmlProject:
case Language::QmlQbs:
case Language::QmlTypeInfo:
return language == l;
case Language::Qml: case Language::Qml:
return l == Language::Qml || l == Language::QmlQtQuick1 || l == Language::QmlQtQuick2 return l == Language::Qml || l == Language::QmlQtQuick1 || l == Language::QmlQtQuick2
|| Language::JavaScript; || Language::JavaScript;
case Language::QmlProject:
return l == Language::QmlProject;
case Language::QmlQbs:
return l == Language::QmlQbs;
case Language::QmlQtQuick1: case Language::QmlQtQuick1:
return l == Language::Qml || l == Language::QmlQtQuick1 || Language::JavaScript; return l == Language::Qml || l == Language::QmlQtQuick1 || Language::JavaScript;
case Language::QmlQtQuick2: case Language::QmlQtQuick2:
return l == Language::Qml || l == Language::QmlQtQuick2 || Language::JavaScript; return l == Language::Qml || l == Language::QmlQtQuick2 || Language::JavaScript;
case Language::QmlTypeInfo:
return l == Language::QmlTypeInfo;
case Language::Unknown: // ? case Language::Unknown: // ?
return true; break;
} }
return true;
} }
} // namespace QmlJS } // namespace QmlJS