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

ScxmlEditor: silent fallthrough warnings

Browse Source 
Change-Id: I7bd7140f05e8342a2e10713eb1646e0bd3f028ff
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Nikita Baryshnikov
2017-08-21 11:55:18 +03:00
parent 66423bcb3e
commit bf46cf8eaf
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/scxmleditor/common/stateproperties.cpp
View File

@@ -30,6 +30,7 @@
#include "scxmluifactory.h" #include "scxmluifactory.h"
#include <coreplugin/minisplitter.h> #include <coreplugin/minisplitter.h>
#include <utils/qtcfallthrough.h>
#include <QHeaderView> #include <QHeaderView>
#include <QLabel> #include <QLabel>
@@ -84,6 +85,7 @@ void StateProperties::tagChange(ScxmlDocument::TagChange change, ScxmlTag *tag,
case ScxmlDocument::TagContentChanged: case ScxmlDocument::TagContentChanged:
if (tag != m_tag) if (tag != m_tag)
return; return;
Q_FALLTHROUGH();
case ScxmlDocument::TagCurrentChanged: case ScxmlDocument::TagCurrentChanged:
setTag(tag); setTag(tag);
break; break;

4
src/plugins/scxmleditor/plugin_interface/connectableitem.cpp
View File

@@ -33,6 +33,8 @@
#include "serializer.h" #include "serializer.h"
#include "stateitem.h" #include "stateitem.h"
#include <utils/qtcfallthrough.h>
#include <QDebug> #include <QDebug>
#include <QPainter> #include <QPainter>
#include <QPen> #include <QPen>
@@ -491,7 +493,7 @@ QVariant ConnectableItem::itemChange(GraphicsItemChange change, const QVariant &
case ItemParentHasChanged: case ItemParentHasChanged:
updateTransitions(true); updateTransitions(true);
updateTransitionAttributes(true); updateTransitionAttributes(true);
// FIXME: intended fallthrough? Q_FALLTHROUGH();
case ItemPositionHasChanged: case ItemPositionHasChanged:
if (!m_releasedFromParent && !blockUpdates()) if (!m_releasedFromParent && !blockUpdates())
checkParentBoundingRect(); checkParentBoundingRect();

2
src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
View File

@@ -541,7 +541,7 @@ void GraphicsScene::endTagChange(ScxmlDocument::TagChange change, ScxmlTag *tag,
item->finalizeCreation(); item->finalizeCreation();
} }
} }
// FIXME: intended fallthrough? break;
case ScxmlDocument::TagAddChild: { case ScxmlDocument::TagAddChild: {
ScxmlTag *childTag = tag->child(value.toInt()); ScxmlTag *childTag = tag->child(value.toInt());
if (childTag) { if (childTag) {

3
src/plugins/scxmleditor/plugin_interface/scattributeitemmodel.cpp
View File

@@ -26,6 +26,8 @@
#include "scattributeitemmodel.h" #include "scattributeitemmodel.h"
#include "mytypes.h" #include "mytypes.h"
#include <utils/qtcfallthrough.h>
#include <QBrush> #include <QBrush>
using namespace ScxmlEditor::PluginInterface; using namespace ScxmlEditor::PluginInterface;
@@ -91,6 +93,7 @@ QVariant SCAttributeItemModel::data(const QModelIndex &index, int role) const
case Qt::DisplayRole: case Qt::DisplayRole:
if (bExtraRow) if (bExtraRow)
return index.column() == 0 ? tr("- name -") : tr(" - value -"); return index.column() == 0 ? tr("- name -") : tr(" - value -");
Q_FALLTHROUGH();
case Qt::EditRole: { case Qt::EditRole: {
if (index.column() == 0) { if (index.column() == 0) {
if (bEditable) { if (bEditable) {