summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/video
diff options
context:
space:
mode:
authorJochen Seemann <seemann.jochen@gmail.com>2017-11-23 21:12:24 +0100
committerJochen Seemann <seemann.jochen@gmail.com>2017-12-19 12:04:34 +0000
commit93630cd621b472d73fc8456ca396cda012a1aee0 (patch)
treebb42ea8fc88d5961493caccbd116c5b1748a089f /examples/multimedia/video
parent5629823b05ca7d24924ac879b5a0469a3cb03e78 (diff)
examples: use Qt5-style connects where possible
Additionally, remove obsolete CHECKED_CONNECT macro from the spectrum example. Change-Id: Id6fe01718679463c2b025d688c970583d64d60e9 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'examples/multimedia/video')
-rw-r--r--examples/multimedia/video/qmlvideo/main.cpp2
-rw-r--r--examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp4
-rw-r--r--examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp12
3 files changed, 9 insertions, 9 deletions
diff --git a/examples/multimedia/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp
index a09ea534e..e288c0ae4 100644
--- a/examples/multimedia/video/qmlvideo/main.cpp
+++ b/examples/multimedia/video/qmlvideo/main.cpp
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
QQuickView viewer;
viewer.setSource(QUrl("qrc:///qml/qmlvideo/main.qml"));
- QObject::connect(viewer.engine(), SIGNAL(quit()), &viewer, SLOT(close()));
+ QObject::connect(viewer.engine(), &QQmlEngine::quit, &viewer, &QQuickView::close);
QQuickItem *rootObject = viewer.rootObject();
rootObject->setProperty("source1", url1);
diff --git a/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
index 33cead8e0..27102b0c5 100644
--- a/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/examples/multimedia/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -90,7 +90,7 @@ QmlApplicationViewer::QmlApplicationViewer(QWindow *parent)
: QQuickView(parent)
, d(new QmlApplicationViewerPrivate(this))
{
- connect(engine(), SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
+ connect(engine(), &QQmlEngine::quit, QCoreApplication::instance(), &QCoreApplication::quit);
setResizeMode(QQuickView::SizeRootObjectToView);
}
@@ -98,7 +98,7 @@ QmlApplicationViewer::QmlApplicationViewer(QQuickView *view, QWindow *parent)
: QQuickView(parent)
, d(new QmlApplicationViewerPrivate(view))
{
- connect(view->engine(), SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
+ connect(view->engine(), &QQmlEngine::quit, QCoreApplication::instance(), &QCoreApplication::quit);
view->setResizeMode(QQuickView::SizeRootObjectToView);
}
diff --git a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp
index fb31c7b1e..d611497fe 100644
--- a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp
+++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp
@@ -105,18 +105,18 @@ FrequencyMonitorPrivate::FrequencyMonitorPrivate(FrequencyMonitor *parent)
, m_stalledTimer(new QTimer(this))
{
m_instantaneousElapsed.start();
- connect(m_averageTimer, SIGNAL(timeout()),
- this, SLOT(calculateAverageFrequency()));
+ connect(m_averageTimer, &QTimer::timeout,
+ this, &FrequencyMonitorPrivate::calculateAverageFrequency);
if (DefaultSamplingInterval)
m_averageTimer->start(DefaultSamplingInterval);
m_averageElapsed.start();
- connect(m_traceTimer, SIGNAL(timeout()),
- q_ptr, SLOT(trace()));
+ connect(m_traceTimer, &QTimer::timeout,
+ q_ptr, &FrequencyMonitor::trace);
if (DefaultTraceInterval)
m_traceTimer->start(DefaultTraceInterval);
m_stalledTimer->setSingleShot(true);
- connect(m_stalledTimer, SIGNAL(timeout()),
- this, SLOT(stalled()));
+ connect(m_stalledTimer, &QTimer::timeout,
+ this, &FrequencyMonitorPrivate::stalled);
}
void FrequencyMonitorPrivate::calculateInstantaneousFrequency()