summaryrefslogtreecommitdiffstats
path: root/examples/serialbus
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2016-06-29 19:45:50 +0200
committerAndré Hartmann <aha_1980@gmx.de>2016-06-30 14:19:52 +0000
commit085a5bb3fccbe6cc1f47e10d6232e54438dae7b4 (patch)
treed4122f5abab4dfb544164c218804fcde742a1e87 /examples/serialbus
parent94c64856be9af05d8459ad9fc16e6c95baa2c737 (diff)
CAN-Example: Close connect dialog on exit
Before, the connect dialog stayed open when the main window was already closed. Change-Id: I36734ab4ed4cea9e6e4c7a7ead11bb382b828f21 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples/serialbus')
-rw-r--r--examples/serialbus/can/mainwindow.cpp7
-rw-r--r--examples/serialbus/can/mainwindow.h3
2 files changed, 10 insertions, 0 deletions
diff --git a/examples/serialbus/can/mainwindow.cpp b/examples/serialbus/can/mainwindow.cpp
index a04a0f4..0c6790b 100644
--- a/examples/serialbus/can/mainwindow.cpp
+++ b/examples/serialbus/can/mainwindow.cpp
@@ -44,6 +44,7 @@
#include <QCanBusFrame>
#include <QCanBus>
+#include <QCloseEvent>
#include <QTimer>
#include <QtCore/qbytearray.h>
@@ -170,6 +171,12 @@ void MainWindow::framesWritten(qint64 count)
qDebug() << "Number of frames written:" << count;
}
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+ m_connectDialog->close();
+ event->accept();
+}
+
static QByteArray dataToHex(const QByteArray &data)
{
QByteArray result = data.toHex().toUpper();
diff --git a/examples/serialbus/can/mainwindow.h b/examples/serialbus/can/mainwindow.h
index aff6c94..de4d442 100644
--- a/examples/serialbus/can/mainwindow.h
+++ b/examples/serialbus/can/mainwindow.h
@@ -74,6 +74,9 @@ private Q_SLOTS:
void disconnectDevice();
void framesWritten(qint64);
+protected:
+ void closeEvent(QCloseEvent *event);
+
private:
void showStatusMessage(const QString &message);
void initActionsConnections();