summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <[email protected]>2025-06-03 14:50:10 +0200
committerMarc Mutz <[email protected]>2025-06-05 14:59:29 +0200
commitb379c34f92692db18de1e61efd4457e3dd200ed2 (patch)
tree6634fcd319ac1f9791a23439478409528cebf328
parent37dfe6d35a84e876166a1f029c645cd685db4e9f (diff)
Normalize signal/slot signatures 2025HEADdev
This is the result of running util/normalize on the code base. The following manual edits were needed: - folded a long connect() line in QGraphicsVideoItem Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I70dbb694d1d4e6ab376940620f62ff242c027ff3 Reviewed-by: Artem Dyomin <[email protected]>
-rw-r--r--src/multimedia/pipewire/qpipewire_screencapturehelper.cpp2
-rw-r--r--src/multimediawidgets/qgraphicsvideoitem.cpp3
-rw-r--r--tests/auto/unit/multimedia/qmediaplaylist/tst_qmediaplaylist.cpp20
3 files changed, 13 insertions, 12 deletions
diff --git a/src/multimedia/pipewire/qpipewire_screencapturehelper.cpp b/src/multimedia/pipewire/qpipewire_screencapturehelper.cpp
index c2c4c22a1..9cbe7adca 100644
--- a/src/multimedia/pipewire/qpipewire_screencapturehelper.cpp
+++ b/src/multimedia/pipewire/qpipewire_screencapturehelper.cpp
@@ -192,7 +192,7 @@ void QPipeWireCaptureHelper::createInterface()
u"org.freedesktop.portal.ScreenCast"_s, QDBusConnection::sessionBus());
bool ok = m_screenCastInterface->connection().connect(
u"org.freedesktop.portal.Desktop"_s, u""_s, u"org.freedesktop.portal.Request"_s,
- u"Response"_s, this, SLOT(gotRequestResponse(uint, QVariantMap)));
+ u"Response"_s, this, SLOT(gotRequestResponse(uint,QVariantMap)));
if (!ok) {
updateError(
diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp
index c82c2da3c..2227949e1 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem.cpp
@@ -99,7 +99,8 @@ QGraphicsVideoItem::QGraphicsVideoItem(QGraphicsItem *parent)
d_ptr->q_ptr = this;
d_ptr->sink = new QVideoSink(this);
- connect(d_ptr->sink, SIGNAL(videoFrameChanged(const QVideoFrame &)), this, SLOT(_q_present(const QVideoFrame &)));
+ connect(d_ptr->sink, SIGNAL(videoFrameChanged(QVideoFrame)),
+ this, SLOT(_q_present(QVideoFrame)));
}
/*!
diff --git a/tests/auto/unit/multimedia/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/multimedia/qmediaplaylist/tst_qmediaplaylist.cpp
index 8ef882bbf..8d231b009 100644
--- a/tests/auto/unit/multimedia/qmediaplaylist/tst_qmediaplaylist.cpp
+++ b/tests/auto/unit/multimedia/qmediaplaylist/tst_qmediaplaylist.cpp
@@ -660,11 +660,11 @@ void tst_QMediaPlaylist::setMediaSource()
QMediaPlaylist playlist;
QSignalSpy currentIndexSpy(&playlist, SIGNAL(currentIndexChanged(int)));
QSignalSpy playbackModeSpy(&playlist, SIGNAL(playbackModeChanged(QMediaPlaylist::PlaybackMode)));
- QSignalSpy mediaAboutToBeInsertedSpy(&playlist, SIGNAL(mediaAboutToBeInserted(int, int)));
- QSignalSpy mediaInsertedSpy(&playlist, SIGNAL(mediaInserted(int, int)));
- QSignalSpy mediaAboutToBeRemovedSpy(&playlist, SIGNAL(mediaAboutToBeRemoved(int, int)));
- QSignalSpy mediaRemovedSpy(&playlist, SIGNAL(mediaRemoved(int, int)));
- QSignalSpy mediaChangedSpy(&playlist, SIGNAL(mediaChanged(int, int)));
+ QSignalSpy mediaAboutToBeInsertedSpy(&playlist, SIGNAL(mediaAboutToBeInserted(int,int)));
+ QSignalSpy mediaInsertedSpy(&playlist, SIGNAL(mediaInserted(int,int)));
+ QSignalSpy mediaAboutToBeRemovedSpy(&playlist, SIGNAL(mediaAboutToBeRemoved(int,int)));
+ QSignalSpy mediaRemovedSpy(&playlist, SIGNAL(mediaRemoved(int,int)));
+ QSignalSpy mediaChangedSpy(&playlist, SIGNAL(mediaChanged(int,int)));
QVERIFY(playlist.isEmpty());
@@ -708,11 +708,11 @@ void tst_QMediaPlaylist::setMediaSource()
QSignalSpy currentIndexSpy(&playlist, SIGNAL(currentIndexChanged(int)));
QSignalSpy playbackModeSpy(&playlist, SIGNAL(playbackModeChanged(QMediaPlaylist::PlaybackMode)));
- QSignalSpy mediaAboutToBeInsertedSpy(&playlist, SIGNAL(mediaAboutToBeInserted(int, int)));
- QSignalSpy mediaInsertedSpy(&playlist, SIGNAL(mediaInserted(int, int)));
- QSignalSpy mediaAboutToBeRemovedSpy(&playlist, SIGNAL(mediaAboutToBeRemoved(int, int)));
- QSignalSpy mediaRemovedSpy(&playlist, SIGNAL(mediaRemoved(int, int)));
- QSignalSpy mediaChangedSpy(&playlist, SIGNAL(mediaChanged(int, int)));
+ QSignalSpy mediaAboutToBeInsertedSpy(&playlist, SIGNAL(mediaAboutToBeInserted(int,int)));
+ QSignalSpy mediaInsertedSpy(&playlist, SIGNAL(mediaInserted(int,int)));
+ QSignalSpy mediaAboutToBeRemovedSpy(&playlist, SIGNAL(mediaAboutToBeRemoved(int,int)));
+ QSignalSpy mediaRemovedSpy(&playlist, SIGNAL(mediaRemoved(int,int)));
+ QSignalSpy mediaChangedSpy(&playlist, SIGNAL(mediaChanged(int,int)));
QCOMPARE(playlist.mediaCount(), 3);
QCOMPARE(playlist.currentIndex(), 2);