Improve modbus example apps

1.) Fix warnings about order of instanciation
2.) Get rid of the pesky QPointer's
3.) Remove unwanted temporary pointers around QModBus::instance
4.) Slightly improve error reporting
5.) Fix strange spaces while using input mask
5.) Remove serial port dependency

Change-Id: I1697ed4862ea0803aacf3e7509e0d5f72a6dc32f
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 7 insertions, 15 deletions

diff --git a/examples/serialbus/modbus/master/mainwindow.h b/examples/serialbus/modbus/master/mainwindow.h
index d90b00d..2fe53b9 100644
--- a/examples/serialbus/modbus/master/mainwindow.h
+++ b/examples/serialbus/modbus/master/mainwindow.h
@@ -42,12 +42,11 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include <QtSerialBus>
-#include <QPointer>
 
 QT_BEGIN_NAMESPACE
 
-class QSerialPort;
+class QModBusMaster;
+class QModBusReply;
 
 namespace Ui {
 class MainWindow;
@@ -63,29 +62,22 @@ public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
 
-public slots:
-    void onMasterStateChanged(int state);
-    void readReady();
-    void writeReady();
-
 private slots:
     void on_pushButton_clicked();
+    void onStateChanged(int state);
 
     void on_readButton_clicked();
+    void readReady();
 
     void on_writeButton_clicked();
+    void writeReady();
 
     void on_writeTable_currentIndexChanged(const QString &arg1);
 
 private:
-    void init();
-    void connectDevice(int pluginIndex);
-
-    QList<QByteArray> plugins;
-    QPointer<QModBusMaster> modBusDevice;
     Ui::MainWindow *ui;
-    QPointer<QSerialPort> serialPort;
-    QPointer<QModBusReply> lastRequest;
+    QModBusReply* lastRequest;
+    QModBusMaster* modBusDevice;
 };
 
 #endif // MAINWINDOW_H