diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-25 10:20:06 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-25 10:20:06 +0100 |
| commit | 32c938c4a032c7ef20de419a3886d2a2226d75df (patch) | |
| tree | 14bf3b2aa9aa09b7b51a66a2b1d942de30fe7781 /src/plugins/scxmleditor | |
| parent | 333d30dce5c96a19c93ebca7783dbbd8fbca6530 (diff) | |
| parent | ebede577b6b452f2901fa8ee5739d2008c790860 (diff) | |
Merge remote-tracking branch 'origin/4.6'
Change-Id: I724da8f761275865e735e7dce10c3b2b2d99fe94
Diffstat (limited to 'src/plugins/scxmleditor')
| -rw-r--r-- | src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp index 41e114e160a..4bf84f8782b 100644 --- a/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp +++ b/src/plugins/scxmleditor/plugin_interface/scxmltagutils.cpp @@ -29,6 +29,7 @@ #include "serializer.h" #include <utils/qtcassert.h> +#include <utils/qtcfallthrough.h> #include <QAction> #include <QPointF> @@ -112,7 +113,7 @@ QVector<TagType> allowedChildTypes(TagType tagType) case State: childTags << Initial; childTags << Final; - // FALL THROUGH + Q_FALLTHROUGH(); case Parallel: childTags << OnEntry; childTags << OnExit; @@ -135,7 +136,7 @@ QVector<TagType> allowedChildTypes(TagType tagType) case If: childTags << ElseIf; childTags << Else; - // FALL THROUGH + Q_FALLTHROUGH(); case Transition: case OnEntry: case OnExit: @@ -169,7 +170,7 @@ QVector<TagType> allowedChildTypes(TagType tagType) break; case Invoke: childTags << Finalize; - // FALL THROUGH + Q_FALLTHROUGH(); case Donedata: case Send: childTags << Param; @@ -211,7 +212,7 @@ QVector<TagType> childTypes(TagType tagType) case If: childTags << ElseIf; childTags << Else; - // FALL THROUGH + Q_FALLTHROUGH(); case Transition: case OnEntry: case OnExit: @@ -245,7 +246,7 @@ QVector<TagType> childTypes(TagType tagType) break; case Invoke: childTags << Finalize; - // FALL THROUGH + Q_FALLTHROUGH(); case Donedata: case Send: childTags << Param; |