summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@idiap.ch>2022-10-25 22:53:32 +0200
committerSamuel Gaist <samuel.gaist@idiap.ch>2022-12-21 21:52:17 +0100
commitc47e2aebb6a3d188fb2b16da4ae42804fc0df39f (patch)
treed08d39d10e827610b5c934854b770ddbbcc541f9
parentabe3bc1c432e670fc1244a643b720c1b6a2d56f6 (diff)
examples: port embedded examples to new connection style
Task-number: QTBUG-106893 Change-Id: I6d00c53b7747b36c5f0094e566713f13fe74f3de Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--examples/embedded/digiflip/digiflip.cpp9
-rw-r--r--examples/embedded/flightinfo/flightinfo.cpp14
-rw-r--r--examples/embedded/lightmaps/lightmaps.cpp4
3 files changed, 14 insertions, 13 deletions
diff --git a/examples/embedded/digiflip/digiflip.cpp b/examples/embedded/digiflip/digiflip.cpp
index 7497f04e6c..ab5075a4ec 100644
--- a/examples/embedded/digiflip/digiflip.cpp
+++ b/examples/embedded/digiflip/digiflip.cpp
@@ -23,7 +23,8 @@ public:
{
setAttribute(Qt::WA_OpaquePaintEvent, true);
setAttribute(Qt::WA_NoSystemBackground, true);
- connect(&m_animator, SIGNAL(frameChanged(int)), SLOT(update()));
+ connect(&m_animator, &QTimeLine::frameChanged,
+ this, qOverload<>(&Digits::update));
m_animator.setFrameRange(0, 100);
m_animator.setDuration(600);
m_animator.setEasingCurve(QEasingCurve::InOutSine);
@@ -272,9 +273,9 @@ public:
QAction *slideAction = new QAction("&Slide", this);
QAction *flipAction = new QAction("&Flip", this);
QAction *rotateAction = new QAction("&Rotate", this);
- connect(slideAction, SIGNAL(triggered()), SLOT(chooseSlide()));
- connect(flipAction, SIGNAL(triggered()), SLOT(chooseFlip()));
- connect(rotateAction, SIGNAL(triggered()), SLOT(chooseRotate()));
+ connect(slideAction, &QAction::triggered, this, &DigiFlip::chooseSlide);
+ connect(flipAction, &QAction::triggered, this, &DigiFlip::chooseFlip);
+ connect(rotateAction, &QAction::triggered, this, &DigiFlip::chooseRotate);
addAction(slideAction);
addAction(flipAction);
addAction(rotateAction);
diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp
index c4d81177e7..6a5eb55d99 100644
--- a/examples/embedded/flightinfo/flightinfo.cpp
+++ b/examples/embedded/flightinfo/flightinfo.cpp
@@ -71,8 +71,8 @@ public:
ui.searchBar->hide();
ui.infoBox->hide();
- connect(ui.searchButton, SIGNAL(clicked()), SLOT(startSearch()));
- connect(ui.flightEdit, SIGNAL(returnPressed()), SLOT(startSearch()));
+ connect(ui.searchButton, &QPushButton::clicked, this, &FlightInfo::startSearch);
+ connect(ui.flightEdit, &QLineEdit::returnPressed, this, &FlightInfo::startSearch);
setWindowTitle("Flight Info");
@@ -83,11 +83,11 @@ public:
QAction *searchTodayAction = new QAction("Today's Flight", this);
QAction *searchYesterdayAction = new QAction("Yesterday's Flight", this);
QAction *randomAction = new QAction("Random Flight", this);
- connect(searchTodayAction, SIGNAL(triggered()), SLOT(today()));
- connect(searchYesterdayAction, SIGNAL(triggered()), SLOT(yesterday()));
- connect(randomAction, SIGNAL(triggered()), SLOT(randomFlight()));
- connect(&m_manager, SIGNAL(finished(QNetworkReply*)),
- this, SLOT(handleNetworkData(QNetworkReply*)));
+ connect(searchTodayAction, &QAction::triggered, this, &FlightInfo::today);
+ connect(searchYesterdayAction, &QAction::triggered, this, &FlightInfo::yesterday);
+ connect(randomAction, &QAction::triggered, this, &FlightInfo::randomFlight);
+ connect(&m_manager, &QNetworkAccessManager::finished,
+ this, &FlightInfo::handleNetworkData);
addAction(searchTodayAction);
addAction(searchYesterdayAction);
addAction(randomAction);
diff --git a/examples/embedded/lightmaps/lightmaps.cpp b/examples/embedded/lightmaps/lightmaps.cpp
index 5f62f926b4..566ba243ee 100644
--- a/examples/embedded/lightmaps/lightmaps.cpp
+++ b/examples/embedded/lightmaps/lightmaps.cpp
@@ -24,8 +24,8 @@ LightMaps::LightMaps(QWidget *parent)
{
m_normalMap = new SlippyMap(this);
m_largeMap = new SlippyMap(this);
- connect(m_normalMap, SIGNAL(updated(QRect)), SLOT(updateMap(QRect)));
- connect(m_largeMap, SIGNAL(updated(QRect)), SLOT(update()));
+ connect(m_normalMap, &SlippyMap::updated, this, &LightMaps::updateMap);
+ connect(m_largeMap, &SlippyMap::updated, this, &LightMaps::updateMap);
}
void LightMaps::setCenter(qreal lat, qreal lng)