From 8e94ad5d15c36f205e3828a612eaa2ce7922beef Mon Sep 17 00:00:00 2001
From: Valentin Fokin <fokinv@inf.u-szeged.hu>
Date: Tue, 20 Mar 2018 17:22:55 +0100
Subject: Remove MediaNone, CanDoNone flags from QWebEngineContextMenuData

Task-number: QTBUG-66994
Change-Id: I8e5ce23e2326fff078e11cadc70274641eeef132
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 src/webenginewidgets/api/qwebenginecontextmenudata.cpp | 12 ++----------
 src/webenginewidgets/api/qwebenginecontextmenudata.h   |  2 --
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/webenginewidgets')

diff --git a/src/webenginewidgets/api/qwebenginecontextmenudata.cpp b/src/webenginewidgets/api/qwebenginecontextmenudata.cpp
index 82c17fe3b..377ffe1b5 100644
--- a/src/webenginewidgets/api/qwebenginecontextmenudata.cpp
+++ b/src/webenginewidgets/api/qwebenginecontextmenudata.cpp
@@ -53,7 +53,6 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaTypeFile,   Q
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaTypePlugin, QWebEngineContextMenuData::MediaTypePlugin)
 
 // Match MediaFlag enum
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaNone,              QWebEngineContextMenuData::MediaNone)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaInError,           QWebEngineContextMenuData::MediaInError)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaPaused,            QWebEngineContextMenuData::MediaPaused)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaMuted,             QWebEngineContextMenuData::MediaMuted)
@@ -66,7 +65,6 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaCanPrint,
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::MediaCanRotate,         QWebEngineContextMenuData::MediaCanRotate)
 
 // Match EditFlag enum
-ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanDoNone,     QWebEngineContextMenuData::CanDoNone)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanUndo,       QWebEngineContextMenuData::CanUndo)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanRedo,       QWebEngineContextMenuData::CanRedo)
 ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanCut,        QWebEngineContextMenuData::CanCut)
@@ -110,7 +108,6 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanEditRichly, QWe
 
     The available edit operations in the current context.
 
-    \value  CanDoNone Nothing can be done.
     \value  CanUndo Undo is available.
     \value  CanRedo Redo is available.
     \value  CanCut Cut is available.
@@ -130,7 +127,6 @@ ASSERT_ENUMS_MATCH(QtWebEngineCore::WebEngineContextMenuData::CanEditRichly, QWe
     The current media element's status and its available operations.
     \c MediaNone if the selected web page content is not a media element.
 
-    \value  MediaNone Not a media element.
     \value  MediaInError An error occurred.
     \value  MediaPaused Media is paused.
     \value  MediaMuted Media is muted.
@@ -296,9 +292,7 @@ QWebEngineContextMenuData &QWebEngineContextMenuData::operator=(const QWebEngine
 */
 QWebEngineContextMenuData::MediaFlags QWebEngineContextMenuData::mediaFlags() const
 {
-    if (d)
-        return static_cast<QWebEngineContextMenuData::MediaFlags>(d->mediaFlags());
-    return QWebEngineContextMenuData::MediaNone;
+    return static_cast<QWebEngineContextMenuData::MediaFlags>(d->mediaFlags());
 }
 
 /*!
@@ -306,9 +300,7 @@ QWebEngineContextMenuData::MediaFlags QWebEngineContextMenuData::mediaFlags() co
 */
 QWebEngineContextMenuData::EditFlags QWebEngineContextMenuData::editFlags() const
 {
-    if (d)
-        return static_cast<QWebEngineContextMenuData::EditFlags>(d->editFlags());
-    return QWebEngineContextMenuData::CanDoNone;
+    return static_cast<QWebEngineContextMenuData::EditFlags>(d->editFlags());
 }
 
 QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebenginecontextmenudata.h b/src/webenginewidgets/api/qwebenginecontextmenudata.h
index 8c2e9c5e5..7c33ee270 100644
--- a/src/webenginewidgets/api/qwebenginecontextmenudata.h
+++ b/src/webenginewidgets/api/qwebenginecontextmenudata.h
@@ -70,7 +70,6 @@ public:
 
     // Must match QWebEngineCore::WebEngineContextMenuData::MediaFlags:
     enum MediaFlag {
-        MediaNone = 0x0,
         MediaInError = 0x1,
         MediaPaused = 0x2,
         MediaMuted = 0x4,
@@ -86,7 +85,6 @@ public:
 
     // Must match QWebEngineCore::WebEngineContextMenuData::EditFlags:
     enum EditFlag {
-        CanDoNone = 0x0,
         CanUndo = 0x1,
         CanRedo = 0x2,
         CanCut = 0x4,
-- 
cgit v1.2.3