Decouple scheme and url scheme handler

Remove the scheme from the url scheme handler constructor, this way
the same handler can handle multiple schemes, the API look more natural
and we can get rid of the private class.

Change-Id: I33906b8a5ea51641e28a53f93f4feb1472c24baf
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

1 files changed, 2 insertions, 17 deletions

diff --git a/src/core/api/qwebengineurlschemehandler.cpp b/src/core/api/qwebengineurlschemehandler.cpp
index e6c20dbca..f887e4e98 100644
--- a/src/core/api/qwebengineurlschemehandler.cpp
+++ b/src/core/api/qwebengineurlschemehandler.cpp
@@ -35,7 +35,6 @@
 ****************************************************************************/
 
 #include "qwebengineurlschemehandler.h"
-#include "qwebengineurlschemehandler_p.h"
 
 #include "qwebengineurlrequestjob.h"
 
@@ -59,20 +58,14 @@ QT_BEGIN_NAMESPACE
     This signal is emitted when the custom URL scheme handler \a handler is deleted.
 */
 
-QWebEngineUrlSchemeHandlerPrivate::QWebEngineUrlSchemeHandlerPrivate(const QByteArray &scheme)
-    : m_scheme(scheme)
-{
-}
-
 /*!
     Constructs a new URL scheme handler.
 
-    The handler is created for \a scheme with the parent \a parent.
+    The handler is created with the parent \a parent.
 
   */
-QWebEngineUrlSchemeHandler::QWebEngineUrlSchemeHandler(const QByteArray &scheme, QObject *parent)
+QWebEngineUrlSchemeHandler::QWebEngineUrlSchemeHandler(QObject *parent)
     : QObject(parent)
-    , d_ptr(new QWebEngineUrlSchemeHandlerPrivate(scheme))
 {
 }
 
@@ -86,14 +79,6 @@ QWebEngineUrlSchemeHandler::~QWebEngineUrlSchemeHandler()
 }
 
 /*!
-    Returns the custom URL scheme handled.
-*/
-QByteArray QWebEngineUrlSchemeHandler::scheme() const
-{
-    return d_ptr->scheme();
-}
-
-/*!
     \fn void QWebEngineUrlSchemeHandler::requestStarted(QWebEngineUrlRequestJob *request)
 
     This method is called whenever a request \a request for the registered scheme is started.