diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-06-22 12:54:47 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-06-26 23:01:53 +0200 |
| commit | f50ac3549d6a7f1199fa012e4b03f581bc8d305b (patch) | |
| tree | 50ff044f1c618119c88544709808f533ed02225e /cv | |
| parent | d61eb905ae3fa161d50821d01ee47915713e89c2 (diff) | |
core, modules: modernize syntax only
Use more C++17 features where this helps any.
Diffstat (limited to 'cv')
| -rw-r--r-- | cv/video-property-page.cpp | 6 | ||||
| -rw-r--r-- | cv/video-widget.hpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cv/video-property-page.cpp b/cv/video-property-page.cpp index 0d2b7458..7d94bbc2 100644 --- a/cv/video-property-page.cpp +++ b/cv/video-property-page.cpp @@ -51,7 +51,7 @@ prop_settings_worker::prop_settings_worker(int idx) int ret = cap.get(cv::CAP_PROP_SETTINGS); if (ret != 0) - run_in_thread_async(qApp, []() { + run_in_thread_async(qApp, [] { QMessageBox::warning(nullptr, "Camera properties", "Camera dialog already opened", @@ -98,7 +98,7 @@ ok: if (!cap.set(cv::CAP_PROP_SETTINGS, 0)) { - run_in_thread_async(qApp, []() { + run_in_thread_async(qApp, [] { QMessageBox::warning(nullptr, "Camera properties", "Can't open camera dialog", @@ -137,7 +137,7 @@ bool video_property_page::show(int idx) // XXX is this a race condition? thread->moveToThread(qApp->thread()); - QObject::connect(thread, &QThread::finished, qApp, [thread]() { thread->deleteLater(); }, Qt::DirectConnection); + QObject::connect(thread, &QThread::finished, qApp, [thread] { thread->deleteLater(); }, Qt::DirectConnection); thread->start(); diff --git a/cv/video-widget.hpp b/cv/video-widget.hpp index 15430e2f..8ad62a3c 100644 --- a/cv/video-widget.hpp +++ b/cv/video-widget.hpp @@ -16,7 +16,7 @@ #include <QObject> #include <QWidget> #include <QPainter> -#include <QPaintEvent> +#include <QtEvents> #include <QTimer> #include <QMutex> #include <QMutexLocker> |