From 8d736eb601e79e8fe1a866eb67e626b33f651d7a Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 5 Sep 2018 23:12:04 +0200 Subject: [PATCH] qa: Try to avoid fall-through warnings GCC8 warns again about some intentional fallthroughs. Try to fix this by adding comments. --- src/qtui/chatscene.cpp | 11 ++++++++--- src/qtui/settingspages/ignorelistmodel.cpp | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 5c81bf7e..92ad3725 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -1294,9 +1294,12 @@ void ChatScene::webPreviewNextStep() case WebPreview::ShowPreview: qWarning() << "ChatScene::webPreviewNextStep() called while in ShowPreview Step!"; qWarning() << "removing preview"; - if (webPreview.previewItem && webPreview.previewItem->scene()) + if (webPreview.previewItem && webPreview.previewItem->scene()) { removeItem(webPreview.previewItem); - // Fall through to deletion! + } + + // Intentional fallthrough + case WebPreview::HidePreview: if (webPreview.previewItem) { delete webPreview.previewItem; @@ -1323,7 +1326,9 @@ void ChatScene::clearWebPreview(ChatItem *parentItem) if (webPreview.previewItem && webPreview.previewItem->scene()) removeItem(webPreview.previewItem); } - // fall through into to set hidden state + + // Intentional fallthrough + case WebPreview::DelayPreview: // we're just loading, so haven't shown the preview yet. webPreview.previewState = WebPreview::HidePreview; diff --git a/src/qtui/settingspages/ignorelistmodel.cpp b/src/qtui/settingspages/ignorelistmodel.cpp index 6f639bd6..0af0364d 100644 --- a/src/qtui/settingspages/ignorelistmodel.cpp +++ b/src/qtui/settingspages/ignorelistmodel.cpp @@ -92,6 +92,7 @@ QVariant IgnoreListModel::data(const QModelIndex &index, int role) const else return tr("By Message"); } + // Intentional fallthrough case Qt::EditRole: switch (index.column()) { case 0: -- 2.20.1