Commit 6efd0d60 authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen
Browse files

Rename url scheme handler's destroyed signal


Make the signal distinct from the QObject destroyed signal and make sure
it is not documented and follows private signal naming.

Change-Id: If10a6e7fcee5e9ea4d3ed12ddb8e6ff3f1170adc
Reviewed-by: default avatarMichael Brüning <michael.bruning@theqtcompany.com>
Showing with 7 additions and 5 deletions
...@@ -74,7 +74,7 @@ QWebEngineUrlSchemeHandler::QWebEngineUrlSchemeHandler(QObject *parent) ...@@ -74,7 +74,7 @@ QWebEngineUrlSchemeHandler::QWebEngineUrlSchemeHandler(QObject *parent)
*/ */
QWebEngineUrlSchemeHandler::~QWebEngineUrlSchemeHandler() QWebEngineUrlSchemeHandler::~QWebEngineUrlSchemeHandler()
{ {
Q_EMIT destroyed(this); Q_EMIT _q_destroyedUrlSchemeHandler(this);
} }
/*! /*!
......
...@@ -57,8 +57,10 @@ public: ...@@ -57,8 +57,10 @@ public:
virtual void requestStarted(QWebEngineUrlRequestJob*) = 0; virtual void requestStarted(QWebEngineUrlRequestJob*) = 0;
#ifndef Q_QDOC
Q_SIGNALS: Q_SIGNALS:
void destroyed(QWebEngineUrlSchemeHandler*); void _q_destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*);
#endif
private: private:
Q_DISABLE_COPY(QWebEngineUrlSchemeHandler) Q_DISABLE_COPY(QWebEngineUrlSchemeHandler)
......
...@@ -568,7 +568,7 @@ void QWebEngineProfile::installUrlSchemeHandler(const QByteArray &scheme, QWebEn ...@@ -568,7 +568,7 @@ void QWebEngineProfile::installUrlSchemeHandler(const QByteArray &scheme, QWebEn
return; return;
} }
d->browserContext()->addCustomUrlSchemeHandler(scheme, handler); d->browserContext()->addCustomUrlSchemeHandler(scheme, handler);
connect(handler, SIGNAL(destroyed(QWebEngineUrlSchemeHandler*)), this, SLOT(destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*))); connect(handler, SIGNAL(_q_destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*)), this, SLOT(destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*)));
} }
/*! /*!
...@@ -584,7 +584,7 @@ void QWebEngineProfile::removeUrlSchemeHandler(QWebEngineUrlSchemeHandler *handl ...@@ -584,7 +584,7 @@ void QWebEngineProfile::removeUrlSchemeHandler(QWebEngineUrlSchemeHandler *handl
Q_ASSERT(handler); Q_ASSERT(handler);
if (!d->browserContext()->removeCustomUrlSchemeHandler(handler)) if (!d->browserContext()->removeCustomUrlSchemeHandler(handler))
return; return;
disconnect(handler, SIGNAL(destroyed(QWebEngineUrlSchemeHandler*)), this, SLOT(destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*))); disconnect(handler, SIGNAL(_q_destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*)), this, SLOT(destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*)));
} }
/*! /*!
...@@ -600,7 +600,7 @@ void QWebEngineProfile::removeUrlScheme(const QByteArray &scheme) ...@@ -600,7 +600,7 @@ void QWebEngineProfile::removeUrlScheme(const QByteArray &scheme)
QWebEngineUrlSchemeHandler *handler = d->browserContext()->takeCustomUrlSchemeHandler(scheme); QWebEngineUrlSchemeHandler *handler = d->browserContext()->takeCustomUrlSchemeHandler(scheme);
if (!handler) if (!handler)
return; return;
disconnect(handler, SIGNAL(destroyed(QWebEngineUrlSchemeHandler*)), this, SLOT(destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*))); disconnect(handler, SIGNAL(_q_destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*)), this, SLOT(destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*)));
} }
/*! /*!
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment