From f77cd97cacd1603fdca0c3fda405d351a1ccda93 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Tue, 26 Apr 2016 09:44:30 +0200
Subject: Avoid default cases

Prefer to list all enums to handling defaults, this makes it easier to
catch missing cases in the future.

Change-Id: Idae2f445bd907f62202a6b68da0d030e21863afe
Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 src/webenginewidgets/api/qwebenginepage.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index b4a821faa..7795cc41d 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -724,7 +724,9 @@ QAction *QWebEnginePage::action(WebAction action) const
     case RequestClose:
         text = tr("Close Page");
         break;
-    default:
+    case NoWebAction:
+    case WebActionCount:
+        Q_UNREACHABLE();
         break;
     }
 
@@ -897,8 +899,11 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
     case RequestClose:
         d->adapter->requestClose();
         break;
-    default:
+    case NoWebAction:
+        break;
+    case WebActionCount:
         Q_UNREACHABLE();
+        break;
     }
 }
 
@@ -954,11 +959,10 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData
             QMenu::exec(view->actions(), event.globalPos(), 0, view);
             break;
         }
-        // fall through
-    default:
+        // fallthrough
+    case Qt::NoContextMenu:
         event.ignore();
         return false;
-        break;
     }
     view->d_func()->m_pendingContextMenuEvent = false;
     return true;
@@ -1007,8 +1011,6 @@ void QWebEnginePagePrivate::javascriptDialog(QSharedPointer<JavaScriptDialogCont
     case InternalAuthorizationDialog:
         accepted = (QMessageBox::question(view, controller->title(), controller->message(), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes);
         break;
-    default:
-        Q_UNREACHABLE();
     }
     if (accepted)
         controller->accept();
@@ -1173,7 +1175,7 @@ void QWebEnginePage::setFeaturePermission(const QUrl &securityOrigin, QWebEngine
         else
             d->adapter->grantMouseLockPermission(false);
         break;
-    default:
+    case Notifications:
         break;
     }
 }
@@ -1339,7 +1341,6 @@ QStringList QWebEnginePage::chooseFiles(FileSelectionMode mode, const QStringLis
         if (!str.isNull())
             ret << str;
         break;
-    default:
     case FilePickerController::Open:
         str = QFileDialog::getOpenFileName(view(), QString(), oldFiles.first());
         if (!str.isNull())
-- 
cgit v1.2.3