summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/camera
diff options
context:
space:
mode:
authorRolf Eike Beer <eb@emlix.com>2019-07-16 09:18:34 +0200
committerRolf Eike Beer <eb@emlix.com>2019-07-16 11:48:25 +0200
commit539b782385786d4f076c442c9da53a228a1be462 (patch)
treea5bae353bbf2227744c0322a63e1afeeddb0e52b /src/plugins/directshow/camera
parent28bd5f54f5230f5a5002db28f2d3fec7cadc1540 (diff)
DirectShow plugin: use new style connect syntax
Change-Id: I5c2dadfe1154961adcecf779126166aea4d32393 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/plugins/directshow/camera')
-rw-r--r--src/plugins/directshow/camera/dscamerasession.cpp4
-rw-r--r--src/plugins/directshow/camera/dsimagecapturecontrol.cpp20
2 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp
index f1865411a..267e7a9a4 100644
--- a/src/plugins/directshow/camera/dscamerasession.cpp
+++ b/src/plugins/directshow/camera/dscamerasession.cpp
@@ -76,8 +76,8 @@ DSCameraSession::DSCameraSession(QObject *parent)
, m_videoProbeControl(nullptr)
, m_status(QCamera::UnloadedStatus)
{
- connect(this, SIGNAL(statusChanged(QCamera::Status)),
- this, SLOT(updateReadyForCapture()));
+ connect(this, &DSCameraSession::statusChanged,
+ this, &DSCameraSession::updateReadyForCapture);
m_deviceLostEventTimer.setSingleShot(true);
connect(&m_deviceLostEventTimer, &QTimer::timeout, [&]() {
diff --git a/src/plugins/directshow/camera/dsimagecapturecontrol.cpp b/src/plugins/directshow/camera/dsimagecapturecontrol.cpp
index 2a6a794d5..e4d2eee30 100644
--- a/src/plugins/directshow/camera/dsimagecapturecontrol.cpp
+++ b/src/plugins/directshow/camera/dsimagecapturecontrol.cpp
@@ -47,16 +47,16 @@ DSImageCaptureControl::DSImageCaptureControl(DSCameraSession *session)
: QCameraImageCaptureControl(session)
, m_session(session)
{
- connect(m_session, SIGNAL(imageExposed(int)),
- this, SIGNAL(imageExposed(int)));
- connect(m_session, SIGNAL(imageCaptured(int,QImage)),
- this, SIGNAL(imageCaptured(int,QImage)));
- connect(m_session, SIGNAL(imageSaved(int,QString)),
- this, SIGNAL(imageSaved(int,QString)));
- connect(m_session, SIGNAL(readyForCaptureChanged(bool)),
- this, SIGNAL(readyForCaptureChanged(bool)));
- connect(m_session, SIGNAL(captureError(int,int,QString)),
- this, SIGNAL(error(int,int,QString)));
+ connect(m_session, &DSCameraSession::imageExposed,
+ this, &DSImageCaptureControl::imageExposed);
+ connect(m_session, &DSCameraSession::imageCaptured,
+ this, &DSImageCaptureControl::imageCaptured);
+ connect(m_session, &DSCameraSession::imageSaved,
+ this, &DSImageCaptureControl::imageSaved);
+ connect(m_session, &DSCameraSession::readyForCaptureChanged,
+ this, &DSImageCaptureControl::readyForCaptureChanged);
+ connect(m_session, &DSCameraSession::captureError,
+ this, &DSImageCaptureControl::error);
connect(m_session, &DSCameraSession::imageAvailable,
this, &DSImageCaptureControl::imageAvailable);
}