X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=02f5facafeb3f05f1e5810b766a8498622af6b44;hb=46bba99808aad823adc53744e6d93f5af9bf729d;hp=5c81bf7e8cb8e51e6e6cb747fc26194f88a9dedd;hpb=d1aa795013aaebe5ca57353d6077b0007b489832;p=quassel.git

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 5c81bf7e..02f5faca 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -31,12 +31,6 @@
 #include <QPersistentModelIndex>
 #include <QUrl>
 
-#ifdef HAVE_KDE4
-#  include <KMenuBar>
-#else
-#  include <QMenuBar>
-#endif
-
 #ifdef HAVE_WEBENGINE
 #  include <QWebEngineView>
 #elif defined HAVE_WEBKIT
@@ -1294,9 +1288,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 +1320,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;