qa: Try to avoid fall-through warnings
authorManuel Nickschas <sputnick@quassel-irc.org>
Wed, 5 Sep 2018 21:12:04 +0000 (23:12 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Thu, 6 Sep 2018 06:02:07 +0000 (08:02 +0200)
GCC8 warns again about some intentional fallthroughs. Try to fix this
by adding comments.

src/qtui/chatscene.cpp
src/qtui/settingspages/ignorelistmodel.cpp

index 5c81bf7..92ad372 100644 (file)
@@ -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;
index 6f639bd..0af0364 100644 (file)
@@ -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: