summaryrefslogtreecommitdiffstats
path: root/examples/serialbus/can/mainwindow.h
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2016-04-28 09:02:51 +0200
committerAndré Hartmann <aha_1980@gmx.de>2016-05-03 10:25:21 +0000
commit9e3af4a3a828a0c632ef07969005f46fd30bee63 (patch)
treed4882451dc676f6a3cb50f611fce53b1e6a5ba83 /examples/serialbus/can/mainwindow.h
parentf183c72e5bd0bd253073783992d9bf860e0087ad (diff)
CAN-Example: Change SettingsDialog to ConnectDialog
This simplifies the handling and makes it more like how other CAN monitors behave. * After startup, the connect dialog is shown * If the dialog is accepted, the selected device is connected instantly * To interrupt a connection, the disconnect action can be used * To connect again, the action connect can be used Change-Id: I47db596658e90cc0393981fba135cd6d89191f1a Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples/serialbus/can/mainwindow.h')
-rw-r--r--examples/serialbus/can/mainwindow.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/serialbus/can/mainwindow.h b/examples/serialbus/can/mainwindow.h
index 8e1b142..aff6c94 100644
--- a/examples/serialbus/can/mainwindow.h
+++ b/examples/serialbus/can/mainwindow.h
@@ -45,7 +45,7 @@
#include <QMainWindow>
-class SettingsDialog;
+class ConnectDialog;
QT_BEGIN_NAMESPACE
@@ -81,7 +81,7 @@ private:
Ui::MainWindow *m_ui;
QLabel *m_status;
- SettingsDialog *m_settings;
+ ConnectDialog *m_connectDialog;
QCanBusDevice *m_canDevice;
};