From eca91edd2a91c9596b1f513f83dc1910f28ad3ee Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Mon, 5 Jun 2017 13:07:05 +0200
Subject: [PATCH] Add more Q_FALLTHROUGH

---
 messagecomposer/src/composer/composerviewbase.cpp | 3 +++
 messagecomposer/src/utils/util.cpp                | 6 ++++++
 messagelist/src/core/themedelegate.cpp            | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/messagecomposer/src/composer/composerviewbase.cpp b/messagecomposer/src/composer/composerviewbase.cpp
index b10636f5..addddfa4 100644
--- a/messagecomposer/src/composer/composerviewbase.cpp
+++ b/messagecomposer/src/composer/composerviewbase.cpp
@@ -1914,6 +1914,9 @@ bool ComposerViewBase::determineWhetherToEncrypt(bool doEncryptCompletely, Kleo:
     case Kleo::AskOpportunistic:
         opportunistic = true;
     // fall through...
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+        Q_FALLTHROUGH();
+#endif
     case Kleo::Ask: {
         // the user wants to be asked or has to be asked
 #ifndef QT_NO_CURSOR
diff --git a/messagecomposer/src/utils/util.cpp b/messagecomposer/src/utils/util.cpp
index 9a3b7471..41cce8bb 100644
--- a/messagecomposer/src/utils/util.cpp
+++ b/messagecomposer/src/utils/util.cpp
@@ -161,6 +161,9 @@ void MessageComposer::Util::makeToplevelContentType(KMime::Content *content, Kle
     // fall through (for encryption, there's no difference between
     // SMIME and SMIMEOpaque, since there is no mp/encrypted for
     // S/MIME)
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+        Q_FALLTHROUGH();
+#endif
     case Kleo::SMIMEOpaqueFormat:
 
         qCDebug(MESSAGECOMPOSER_LOG) << "setting headers for SMIME/opaque";
@@ -193,6 +196,9 @@ void MessageComposer::Util::setNestedContentType(KMime::Content *content, Kleo::
             content->contentType()->setParameter(QStringLiteral("name"), QString::fromAscii("smime.p7s"));
             return;
         }
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+        Q_FALLTHROUGH();
+#endif
     // fall through:
     default:
     case Kleo::InlineOpenPGPFormat:
diff --git a/messagelist/src/core/themedelegate.cpp b/messagelist/src/core/themedelegate.cpp
index db8181b5..f5842b97 100644
--- a/messagelist/src/core/themedelegate.cpp
+++ b/messagelist/src/core/themedelegate.cpp
@@ -723,6 +723,9 @@ void ThemeDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
                     );
                 }
                 // fall through anyway
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+        Q_FALLTHROUGH();
+#endif
             }
             case Theme::RoundedRect: {
                 painter->setPen(Qt::NoPen);
@@ -768,6 +771,9 @@ void ThemeDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
                     );
                 }
                 // fall through anyway
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+        Q_FALLTHROUGH();
+#endif
             }
             case Theme::GradientRect: {
                 // FIXME: Could cache this brush
-- 
GitLab