diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-03-13 14:21:04 +0100 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2023-03-23 20:14:46 +0100 |
| commit | f7167ae82fd74d69f2b138fb60a36ed7f863b380 (patch) | |
| tree | e7662efef4ffdb919d727253fedcc498ae1cc9df /examples/dbus/remotecontrolledcar/controller/controller.cpp | |
| parent | fa3bfa72da56fced5c8bd72a0d43f7f17de29a5a (diff) | |
remotecontrolledcar example: Modernize the code
Also remove unused crashed() signal.
Task-number: QTBUG-111366
Pick-to: 6.5
Change-Id: Ia23552a6396c324c7591643afaa634879a2c185e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'examples/dbus/remotecontrolledcar/controller/controller.cpp')
| -rw-r--r-- | examples/dbus/remotecontrolledcar/controller/controller.cpp | 42 |
1 files changed, 11 insertions, 31 deletions
diff --git a/examples/dbus/remotecontrolledcar/controller/controller.cpp b/examples/dbus/remotecontrolledcar/controller/controller.cpp index ab0ec20d226..f5f0fa88662 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.cpp +++ b/examples/dbus/remotecontrolledcar/controller/controller.cpp @@ -1,45 +1,25 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#include <QtWidgets> - #include "controller.h" -#include "car_interface.h" -Controller::Controller(QWidget *parent) - : QWidget(parent) +using org::example::Examples::CarInterface; + +Controller::Controller(QWidget *parent) : QWidget(parent) { ui.setupUi(this); - car = new org::example::Examples::CarInterface("org.example.CarExample", "/Car", - QDBusConnection::sessionBus(), this); + car = new CarInterface("org.example.CarExample", "/Car", QDBusConnection::sessionBus(), this); + + connect(ui.accelerate, &QPushButton::clicked, car, &CarInterface::accelerate); + connect(ui.decelerate, &QPushButton::clicked, car, &CarInterface::decelerate); + connect(ui.left, &QPushButton::clicked, car, &CarInterface::turnLeft); + connect(ui.right, &QPushButton::clicked, car, &CarInterface::turnRight); + startTimer(1000); } void Controller::timerEvent(QTimerEvent *event) { Q_UNUSED(event); - if (car->isValid()) - ui.label->setText("connected"); - else - ui.label->setText("disconnected"); -} - -void Controller::on_accelerate_clicked() -{ - car->accelerate(); -} - -void Controller::on_decelerate_clicked() -{ - car->decelerate(); -} - -void Controller::on_left_clicked() -{ - car->turnLeft(); -} - -void Controller::on_right_clicked() -{ - car->turnRight(); + ui.label->setText(car->isValid() ? tr("connected") : tr("disconnected")); } |