diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2025-06-03 22:35:04 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2025-06-26 20:32:07 +0200 |
| commit | 53ae888ab81cde78ab074d54eff3047d199c9f2e (patch) | |
| tree | e7f30e5223d3da866652cbac0290b1b2182f0603 | |
| parent | 144c8e00e3537fab813a9ac61cad8cf5271a5677 (diff) | |
Normalize signal/slot signatures 2025
This is the result of running util/normalize on the code base. The
following manual edits were needed:
(none)
Pick-to: 6.10 6.9 6.8 6.5
Change-Id: I42c969bfbc39e39ea6617ae7f6b585f35265bdd4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | tests/auto/qml/qquickwebview/tst_qquickwebview.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/webview/qwebview/tst_qwebview.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp b/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp index 482da0d..78d50b6 100644 --- a/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp +++ b/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp @@ -359,8 +359,8 @@ void tst_QQuickWebView::changeUserAgent() void tst_QQuickWebView::setAndDeleteCookies() { - QSignalSpy cookieAddedSpy(webView(), SIGNAL(cookieAdded(const QString &, const QString &))); - QSignalSpy cookieRemovedSpy(webView(), SIGNAL(cookieRemoved(const QString &, const QString &))); + QSignalSpy cookieAddedSpy(webView(), SIGNAL(cookieAdded(QString,QString))); + QSignalSpy cookieRemovedSpy(webView(), SIGNAL(cookieRemoved(QString,QString))); if (QWebViewFactory::loadedPluginHasKey("webengine")) { webView()->setUrl(QUrl("qrc:///cookies.html")); diff --git a/tests/auto/webview/qwebview/tst_qwebview.cpp b/tests/auto/webview/qwebview/tst_qwebview.cpp index d0c89bc..7a8f0a9 100644 --- a/tests/auto/webview/qwebview/tst_qwebview.cpp +++ b/tests/auto/webview/qwebview/tst_qwebview.cpp @@ -135,7 +135,7 @@ void tst_QWebView::loadHtml() WebViewFactory factory; QWebView &view = factory.webViewRef(); QCOMPARE(view.loadProgress(), 0); - QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(const QWebViewLoadRequestPrivate &))); + QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequestPrivate))); const QByteArray content( QByteArrayLiteral("<html><title>WebViewTitle</title>" "<body><span style=\"color:#ff0000\">Hello</span></body></html>")); @@ -178,7 +178,7 @@ void tst_QWebView::loadRequest() view.getSettings()->setLocalContentCanAccessFileUrls(true); QCOMPARE(view.loadProgress(), 0); const QUrl url = QUrl::fromLocalFile(fileName); - QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(const QWebViewLoadRequestPrivate &))); + QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequestPrivate))); view.setUrl(url); QTRY_VERIFY(!view.isLoading()); QTRY_COMPARE(view.loadProgress(), 100); @@ -204,7 +204,7 @@ void tst_QWebView::loadRequest() view.getSettings()->setAllowFileAccess(true); view.getSettings()->setLocalContentCanAccessFileUrls(true); QCOMPARE(view.loadProgress(), 0); - QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(const QWebViewLoadRequestPrivate &))); + QSignalSpy loadChangedSingalSpy(&view, SIGNAL(loadingChanged(QWebViewLoadRequestPrivate))); view.setUrl(QUrl(QStringLiteral("file:///file_that_does_not_exist.html"))); QTRY_VERIFY(!view.isLoading()); QTRY_COMPARE(loadChangedSingalSpy.size(), 2); @@ -231,8 +231,8 @@ void tst_QWebView::setAndDeleteCookie() view.getSettings()->setAllowFileAccess(true); view.getSettings()->setLocalContentCanAccessFileUrls(true); - QSignalSpy cookieAddedSpy(&view, SIGNAL(cookieAdded(const QString &, const QString &))); - QSignalSpy cookieRemovedSpy(&view, SIGNAL(cookieRemoved(const QString &, const QString &))); + QSignalSpy cookieAddedSpy(&view, SIGNAL(cookieAdded(QString,QString))); + QSignalSpy cookieRemovedSpy(&view, SIGNAL(cookieRemoved(QString,QString))); view.setCookie(".example.com", "TestCookie", "testValue"); view.setCookie(".example2.com", "TestCookie2", "testValue2"); |