diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-27 10:49:32 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-12-01 20:31:44 +0000 |
| commit | 6efd0d603f422796dd511c4d84ac7062c09889ea (patch) | |
| tree | b8cbd0c33504e859f84fae78905827ff0f1ef2da /src | |
| parent | a5f81e005bfc664a80f99314e62a8620ea152a4d (diff) | |
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: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/api/qwebengineurlschemehandler.cpp | 2 | ||||
| -rw-r--r-- | src/core/api/qwebengineurlschemehandler.h | 4 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebengineprofile.cpp | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/core/api/qwebengineurlschemehandler.cpp b/src/core/api/qwebengineurlschemehandler.cpp index 7f9ebaf48..e20aa2ba3 100644 --- a/src/core/api/qwebengineurlschemehandler.cpp +++ b/src/core/api/qwebengineurlschemehandler.cpp @@ -74,7 +74,7 @@ QWebEngineUrlSchemeHandler::QWebEngineUrlSchemeHandler(QObject *parent) */ QWebEngineUrlSchemeHandler::~QWebEngineUrlSchemeHandler() { - Q_EMIT destroyed(this); + Q_EMIT _q_destroyedUrlSchemeHandler(this); } /*! diff --git a/src/core/api/qwebengineurlschemehandler.h b/src/core/api/qwebengineurlschemehandler.h index 66aebe00d..fa24987c5 100644 --- a/src/core/api/qwebengineurlschemehandler.h +++ b/src/core/api/qwebengineurlschemehandler.h @@ -57,8 +57,10 @@ public: virtual void requestStarted(QWebEngineUrlRequestJob*) = 0; +#ifndef Q_QDOC Q_SIGNALS: - void destroyed(QWebEngineUrlSchemeHandler*); + void _q_destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*); +#endif private: Q_DISABLE_COPY(QWebEngineUrlSchemeHandler) diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp index 5fbc4d63c..628929b8a 100644 --- a/src/webenginewidgets/api/qwebengineprofile.cpp +++ b/src/webenginewidgets/api/qwebengineprofile.cpp @@ -568,7 +568,7 @@ void QWebEngineProfile::installUrlSchemeHandler(const QByteArray &scheme, QWebEn return; } 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 Q_ASSERT(handler); if (!d->browserContext()->removeCustomUrlSchemeHandler(handler)) 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) QWebEngineUrlSchemeHandler *handler = d->browserContext()->takeCustomUrlSchemeHandler(scheme); if (!handler) return; - disconnect(handler, SIGNAL(destroyed(QWebEngineUrlSchemeHandler*)), this, SLOT(destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*))); + disconnect(handler, SIGNAL(_q_destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*)), this, SLOT(destroyedUrlSchemeHandler(QWebEngineUrlSchemeHandler*))); } /*! |