Merge pull request 'Replace MOZ_FALLTHROUGH with [[fallthrough]]' (#2379) from 2343-fallthrough-work into master

Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2379

4 files changed, 6 insertions, 6 deletions

diff --git a/mailnews/base/search/src/nsMsgFilterService.cpp b/mailnews/base/search/src/nsMsgFilterService.cpp
index c8f52de5aa..9fd0c23e55 100644
--- a/mailnews/base/search/src/nsMsgFilterService.cpp
+++ b/mailnews/base/search/src/nsMsgFilterService.cpp
@@ -609,7 +609,7 @@ nsresult nsMsgFilterAfterTheFact::ApplyFilter()
         //   would not have run if move succeeded.
         m_nextAction = numActions;
         // Fall through to the copy case.
-        MOZ_FALLTHROUGH;
+        [[fallthrough]];
       case nsMsgFilterAction::CopyToFolder:
       {
         nsCString uri;
diff --git a/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mailnews/base/search/src/nsMsgSearchAdapter.cpp
index a6f8778305..52a76a9dd1 100644
--- a/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+++ b/mailnews/base/search/src/nsMsgSearchAdapter.cpp
@@ -334,7 +334,7 @@ nsresult nsMsgSearchAdapter::EncodeImapTerm (nsIMsgSearchTerm *term, bool really
   case nsMsgSearchAttrib::ToOrCC:
     orHeaderMnemonic = m_kImapCC;
     // fall through to case nsMsgSearchAttrib::To:
-    MOZ_FALLTHROUGH;
+    [[fallthrough]];
   case nsMsgSearchAttrib::To:
     whichMnemonic = m_kImapTo;
     break;
diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.cpp
index 5b82390c00..281d715291 100644
--- a/mailnews/base/src/nsMsgDBView.cpp
+++ b/mailnews/base/src/nsMsgDBView.cpp
@@ -6450,7 +6450,7 @@ NS_IMETHODIMP nsMsgDBView::NoteChange(nsMsgViewIndex firstLineChanged,
       // RowCountChanged() will call our GetRowCount()
       mTree->RowCountChanged(firstLineChanged, numChanged);
       mRemovingRow = false;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case nsMsgViewNotificationCode::all:
       ClearHdrCache();
       break;
@@ -6730,7 +6730,7 @@ nsresult nsMsgDBView::NavigateFromPos(nsMsgNavigationTypeValue motion, nsMsgView
             break;
         case nsMsgNavigationType::firstUnreadMessage:
             startIndex = nsMsgViewIndex_None;        // note fall thru - is this motion ever used?
-            MOZ_FALLTHROUGH;
+            [[fallthrough]];
         case nsMsgNavigationType::nextUnreadMessage:
             for (curIndex = (startIndex == nsMsgViewIndex_None) ? 0 : startIndex; curIndex <= lastIndex && lastIndex != nsMsgViewIndex_None; curIndex++) {
                 uint32_t flags = m_flags[curIndex];
diff --git a/mailnews/base/src/nsMsgGroupView.cpp b/mailnews/base/src/nsMsgGroupView.cpp
index f3d9a27041..1f20a0378b 100644
--- a/mailnews/base/src/nsMsgGroupView.cpp
+++ b/mailnews/base/src/nsMsgGroupView.cpp
@@ -227,7 +227,7 @@ nsresult nsMsgGroupView::HashHdr(nsIMsgDBHdr *msgHdr, nsString& aHashKey)
       break;
     case nsMsgViewSortType::byReceived:
       rcvDate = true;
-      MOZ_FALLTHROUGH;
+      [[fallthrough]];
     case nsMsgViewSortType::byDate:
     {
       uint32_t ageBucket;
@@ -799,7 +799,7 @@ NS_IMETHODIMP nsMsgGroupView::CellTextForColumn(int32_t aRow,
       {
         case nsMsgViewSortType::byReceived:
           rcvDate = true;
-          MOZ_FALLTHROUGH;
+          [[fallthrough]];
         case nsMsgViewSortType::byDate:
         {
           uint32_t ageBucket = 0;