Use c++17 fallthrough attribute when C++17 is enabled or just a comme…

…nt "falls through" as a fallback
psi-im · Dec 28, 2017 · a061cc3 · a061cc3
1 parent 3163bf4
commit a061cc3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/src/common.h b/src/common.h
@@ -29,6 +29,12 @@
 #include <QColor>
 #include <QGridLayout>
 
+#if __cplusplus < 201703L
+# define PSI_FALLSTHROUGH
+#else
+# define PSI_FALLSTHROUGH [[fallthrough]]
+#endif
+
 class QMenu;
 class TabbableWidget;
 

diff --git a/src/historydlg.cpp b/src/historydlg.cpp
@@ -498,7 +498,7 @@ void DisplayProxy::handleResult()
         break;
     case ReqLatest:
         can_forward = false;
-        __attribute__((fallthrough));
+        PSI_FALLSTHROUGH; // falls through
     case ReqNext:
     case ReqPrevious:
         displayResult(r, queryParams.direction);

diff --git a/src/messageview.cpp b/src/messageview.cpp
@@ -211,7 +211,7 @@ QVariantMap MessageView::toVariantMap(bool isMuc, bool formatted) const
         case MUCJoin:
         case MUCPart:
             m["nopartjoin"] = isJoinLeaveHidden();
-            __attribute__((fallthrough));
+            PSI_FALLSTHROUGH; // falls through
         case Status:
             m["sender"] = _nick;
             m["status"] = _status;

diff --git a/src/widgets/psitiplabel.cpp b/src/widgets/psitiplabel.cpp
@@ -12,6 +12,7 @@
 
 #include "psirichtext.h"
 #include "psioptions.h"
+#include "common.h"
 
 PsiTipLabel *PsiTipLabel::instance_ = 0;
 
@@ -244,7 +245,7 @@ bool PsiTipLabel::eventFilter(QObject *, QEvent *e)
             || (key == Qt::Key_Shift || key == Qt::Key_Control
             || key == Qt::Key_Alt || key == Qt::Key_Meta))
             break;
-        __attribute__((fallthrough));
+        PSI_FALLSTHROUGH; // falls through
     }
     case QEvent::Leave:
     case QEvent::WindowActivate: