diff options
26 files changed, 56 insertions, 66 deletions
diff --git a/examples/serialbus/modbus/master/main.cpp b/examples/serialbus/modbus/master/main.cpp index e5f5372..a946e25 100644 --- a/examples/serialbus/modbus/master/main.cpp +++ b/examples/serialbus/modbus/master/main.cpp @@ -39,8 +39,9 @@ ****************************************************************************/ #include "mainwindow.h" + #include <QApplication> -#include <QtCore/qloggingcategory.h> +#include <QLoggingCategory> int main(int argc, char *argv[]) { diff --git a/examples/serialbus/modbus/master/mainwindow.cpp b/examples/serialbus/modbus/master/mainwindow.cpp index 3c3edda..e889a57 100644 --- a/examples/serialbus/modbus/master/mainwindow.cpp +++ b/examples/serialbus/modbus/master/mainwindow.cpp @@ -43,12 +43,11 @@ #include "settingsdialog.h" #include "writeregistermodel.h" -#include <QtSerialBus/qmodbustcpclient.h> -#include <QtSerialBus/qmodbusrtuserialmaster.h> -#include <QtCore/qbytearray.h> -#include <QtCore/qurl.h> -#include <QtGui/qstandarditemmodel.h> -#include <QtWidgets/qstatusbar.h> +#include <QModbusTcpClient> +#include <QModbusRtuSerialMaster> +#include <QStandardItemModel> +#include <QStatusBar> +#include <QUrl> enum ModbusConnection { Serial, diff --git a/examples/serialbus/modbus/master/writeregistermodel.h b/examples/serialbus/modbus/master/writeregistermodel.h index 3705df9..cf42f4c 100644 --- a/examples/serialbus/modbus/master/writeregistermodel.h +++ b/examples/serialbus/modbus/master/writeregistermodel.h @@ -41,9 +41,9 @@ #ifndef WRITEREGISTERMODEL_H #define WRITEREGISTERMODEL_H -#include <QtCore/qabstractitemmodel.h> -#include <QtCore/qbitarray.h> -#include <QtCore/qobject.h> +#include <QAbstractitemmodel> +#include <QBitarray> +#include <QObject> class WriteRegisterModel : public QAbstractTableModel { diff --git a/examples/serialbus/modbus/slave/main.cpp b/examples/serialbus/modbus/slave/main.cpp index e5f5372..a946e25 100644 --- a/examples/serialbus/modbus/slave/main.cpp +++ b/examples/serialbus/modbus/slave/main.cpp @@ -39,8 +39,9 @@ ****************************************************************************/ #include "mainwindow.h" + #include <QApplication> -#include <QtCore/qloggingcategory.h> +#include <QLoggingCategory> int main(int argc, char *argv[]) { diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/slave/mainwindow.cpp index 7553e9c..4af470b 100644 --- a/examples/serialbus/modbus/slave/mainwindow.cpp +++ b/examples/serialbus/modbus/slave/mainwindow.cpp @@ -42,12 +42,11 @@ #include "settingsdialog.h" #include "ui_mainwindow.h" -#include <QtSerialBus/qmodbusrtuserialslave.h> -#include <QtSerialBus/qmodbustcpserver.h> - -#include <QtCore/qregularexpression.h> -#include <QtCore/qurl.h> -#include <QtWidgets/qstatusbar.h> +#include <QModbusrtuserialslave> +#include <QModbustcpserver> +#include <QRegularExpression> +#include <QStatusBar> +#include <QUrl> enum ModbusConnection { Serial, diff --git a/src/serialbus/qcanbus.h b/src/serialbus/qcanbus.h index b748ff4..e494c8c 100644 --- a/src/serialbus/qcanbus.h +++ b/src/serialbus/qcanbus.h @@ -37,11 +37,10 @@ #ifndef QCANBUS_H #define QCANBUS_H +#include <QtCore/qobject.h> #include <QtSerialBus/qserialbusglobal.h> #include <QtSerialBus/qcanbusdevice.h> -#include <QtCore/qobject.h> - QT_BEGIN_NAMESPACE class QSerialBusBackendFactory; diff --git a/src/serialbus/qcanbusdevice.h b/src/serialbus/qcanbusdevice.h index 580af01..e4ed271 100644 --- a/src/serialbus/qcanbusdevice.h +++ b/src/serialbus/qcanbusdevice.h @@ -37,9 +37,8 @@ #ifndef QCANBUSDEVICE_H #define QCANBUSDEVICE_H -#include <QtSerialBus/qcanbusframe.h> - #include <QtCore/qobject.h> +#include <QtSerialBus/qcanbusframe.h> QT_BEGIN_NAMESPACE diff --git a/src/serialbus/qcanbusdevice_p.h b/src/serialbus/qcanbusdevice_p.h index 34cbbfe..033a0f7 100644 --- a/src/serialbus/qcanbusdevice_p.h +++ b/src/serialbus/qcanbusdevice_p.h @@ -37,11 +37,10 @@ #ifndef QCANBUSDEVICE_P_H #define QCANBUSDEVICE_P_H -#include "qcanbusdevice.h" - #include <QtCore/qmutex.h> +#include <QtSerialBus/qcanbusdevice.h> -#include <QtCore/private/qobject_p.h> +#include <private/qobject_p.h> // // W A R N I N G diff --git a/src/serialbus/qcanbusfactory.h b/src/serialbus/qcanbusfactory.h index 2fa2b66..450ebda 100644 --- a/src/serialbus/qcanbusfactory.h +++ b/src/serialbus/qcanbusfactory.h @@ -37,11 +37,10 @@ #ifndef QCANBUSFACTORY_H #define QCANBUSFACTORY_H +#include <QtCore/qstringlist.h> #include <QtSerialBus/qserialbusglobal.h> #include <QtSerialBus/qcanbusdevice.h> -#include <QtCore/qstringlist.h> - QT_BEGIN_NAMESPACE class Q_SERIALBUS_EXPORT QCanBusFactory diff --git a/src/serialbus/qcanbusframe.h b/src/serialbus/qcanbusframe.h index 37ed414..13f4da8 100644 --- a/src/serialbus/qcanbusframe.h +++ b/src/serialbus/qcanbusframe.h @@ -37,10 +37,9 @@ #ifndef QCANBUSFRAME_H #define QCANBUSFRAME_H -#include <QtSerialBus/qserialbusglobal.h> - #include <QtCore/qmetatype.h> #include <QtCore/qobject.h> +#include <QtSerialBus/qserialbusglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/serialbus/qmodbusclient.h b/src/serialbus/qmodbusclient.h index dc63e00..1e27afc 100644 --- a/src/serialbus/qmodbusclient.h +++ b/src/serialbus/qmodbusclient.h @@ -37,14 +37,12 @@ #ifndef QMODBUSCLIENT_H #define QMODBUSCLIENT_H -#include <QtSerialBus/qserialbusglobal.h> -#include <QtSerialBus/qmodbusdevice.h> +#include <QtCore/qobject.h> #include <QtSerialBus/qmodbusdataunit.h> +#include <QtSerialBus/qmodbusdevice.h> #include <QtSerialBus/qmodbuspdu.h> #include <QtSerialBus/qmodbusreply.h> -#include <QtCore/qobject.h> - QT_BEGIN_NAMESPACE class QModbusClientPrivate; diff --git a/src/serialbus/qmodbusclient_p.h b/src/serialbus/qmodbusclient_p.h index 44936e6..cb71bc3 100644 --- a/src/serialbus/qmodbusclient_p.h +++ b/src/serialbus/qmodbusclient_p.h @@ -37,11 +37,11 @@ #ifndef QMODBUSCLIENT_P_H #define QMODBUSCLIENT_P_H +#include <QtCore/qtimer.h> #include <QtSerialBus/qmodbusclient.h> -#include <QtSerialBus/private/qmodbusdevice_p.h> #include <QtSerialBus/qmodbuspdu.h> -#include <QtCore/qtimer.h> +#include <private/qmodbusdevice_p.h> // // W A R N I N G diff --git a/src/serialbus/qmodbusdevice.h b/src/serialbus/qmodbusdevice.h index e750721..edd3953 100644 --- a/src/serialbus/qmodbusdevice.h +++ b/src/serialbus/qmodbusdevice.h @@ -36,10 +36,9 @@ #ifndef QMODBUSDEVICE_H #define QMODBUSDEVICE_H -#include <QtSerialBus/qserialbusglobal.h> - #include <QtCore/qobject.h> #include <QtCore/qiodevice.h> +#include <QtSerialBus/qserialbusglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/serialbus/qmodbusdevice_p.h b/src/serialbus/qmodbusdevice_p.h index a150f1c..91b169e 100644 --- a/src/serialbus/qmodbusdevice_p.h +++ b/src/serialbus/qmodbusdevice_p.h @@ -37,11 +37,12 @@ #ifndef QMODBUSDEVICE_P_H #define QMODBUSDEVICE_P_H -#include <private/qobject_p.h> #include <QtCore/qvariant.h> #include <QtSerialBus/qmodbusdevice.h> #include <QtSerialPort/qserialport.h> +#include <private/qobject_p.h> + // // W A R N I N G // ------------- diff --git a/src/serialbus/qmodbuspdu.h b/src/serialbus/qmodbuspdu.h index 2ff3797..14a113d 100644 --- a/src/serialbus/qmodbuspdu.h +++ b/src/serialbus/qmodbuspdu.h @@ -36,11 +36,10 @@ #ifndef QMODBUSPDU_H #define QMODBUSPDU_H -#include <QtSerialBus/qserialbusglobal.h> - #include <QtCore/qdatastream.h> #include <QtCore/qmetatype.h> #include <QtCore/qvector.h> +#include <QtSerialBus/qserialbusglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/serialbus/qmodbusreply.cpp b/src/serialbus/qmodbusreply.cpp index 5b16543..373dd0e 100644 --- a/src/serialbus/qmodbusreply.cpp +++ b/src/serialbus/qmodbusreply.cpp @@ -37,7 +37,7 @@ #include "qmodbusreply.h" #include <QtCore/qobject.h> -#include <QtCore/private/qobject_p.h> +#include <private/qobject_p.h> QT_BEGIN_NAMESPACE diff --git a/src/serialbus/qmodbusreply.h b/src/serialbus/qmodbusreply.h index e6a8cda..4a761a7 100644 --- a/src/serialbus/qmodbusreply.h +++ b/src/serialbus/qmodbusreply.h @@ -37,7 +37,6 @@ #ifndef QMODBUSREPLY_H #define QMODBUSREPLY_H -#include <QtSerialBus/qserialbusglobal.h> #include <QtSerialBus/qmodbusdataunit.h> #include <QtSerialBus/qmodbusdevice.h> #include <QtSerialBus/qmodbuspdu.h> diff --git a/src/serialbus/qmodbusrtuserialmaster_p.h b/src/serialbus/qmodbusrtuserialmaster_p.h index 668754f..ba0595f 100644 --- a/src/serialbus/qmodbusrtuserialmaster_p.h +++ b/src/serialbus/qmodbusrtuserialmaster_p.h @@ -37,16 +37,16 @@ #ifndef QMODBUSSERIALMASTER_P_H #define QMODBUSSERIALMASTER_P_H -#include <QtSerialBus/qmodbusrtuserialmaster.h> -#include <QtSerialBus/private/qmodbusadu_p.h> -#include <QtSerialBus/private/qmodbusclient_p.h> - #include <QtCore/qloggingcategory.h> #include <QtCore/qpointer.h> #include <QtCore/qqueue.h> #include <QtCore/qtimer.h> +#include <QtSerialBus/qmodbusrtuserialmaster.h> #include <QtSerialPort/qserialport.h> +#include <private/qmodbusadu_p.h> +#include <private/qmodbusclient_p.h> + // // W A R N I N G // ------------- diff --git a/src/serialbus/qmodbusrtuserialslave_p.h b/src/serialbus/qmodbusrtuserialslave_p.h index 52b6b59..3a4ff64 100644 --- a/src/serialbus/qmodbusrtuserialslave_p.h +++ b/src/serialbus/qmodbusrtuserialslave_p.h @@ -37,14 +37,14 @@ #ifndef QMODBUSRTUSERIALSLAVE_P_H #define QMODBUSRTUSERIALSLAVE_P_H -#include <QtSerialBus/qmodbusrtuserialslave.h> -#include <QtSerialBus/private/qmodbusadu_p.h> -#include <QtSerialBus/private/qmodbusserver_p.h> - #include <QtCore/qdebug.h> #include <QtCore/qloggingcategory.h> +#include <QtSerialBus/qmodbusrtuserialslave.h> #include <QtSerialPort/qserialport.h> +#include <private/qmodbusadu_p.h> +#include <private/qmodbusserver_p.h> + // // W A R N I N G // ------------- diff --git a/src/serialbus/qmodbusserver.h b/src/serialbus/qmodbusserver.h index eccff98..c6fb95f 100644 --- a/src/serialbus/qmodbusserver.h +++ b/src/serialbus/qmodbusserver.h @@ -37,14 +37,12 @@ #ifndef QMODBUSERVER_H #define QMODBUSERVER_H -#include <QtSerialBus/qserialbusglobal.h> +#include <QtCore/qobject.h> +#include <QtCore/qvariant.h> #include <QtSerialBus/qmodbusdataunit.h> #include <QtSerialBus/qmodbusdevice.h> #include <QtSerialBus/qmodbuspdu.h> -#include <QtCore/qobject.h> -#include <QtCore/qvariant.h> - QT_BEGIN_NAMESPACE class QModbusServerPrivate; diff --git a/src/serialbus/qmodbusserver_p.h b/src/serialbus/qmodbusserver_p.h index 8eeee63..a490af3 100644 --- a/src/serialbus/qmodbusserver_p.h +++ b/src/serialbus/qmodbusserver_p.h @@ -37,12 +37,13 @@ #ifndef QMODBUSERVER_P_H #define QMODBUSERVER_P_H -#include <QtSerialBus/private/qmodbuscommevent_p.h> -#include <QtSerialBus/private/qmodbusdevice_p.h> -#include <QtSerialBus/private/qmodbus_symbols_p.h> #include <QtSerialBus/qmodbusdataunit.h> #include <QtSerialBus/qmodbusserver.h> +#include <private/qmodbuscommevent_p.h> +#include <private/qmodbusdevice_p.h> +#include <private/qmodbus_symbols_p.h> + #include <array> #include <deque> diff --git a/src/serialbus/qmodbustcpclient_p.h b/src/serialbus/qmodbustcpclient_p.h index 9831e46..7c890bd 100644 --- a/src/serialbus/qmodbustcpclient_p.h +++ b/src/serialbus/qmodbustcpclient_p.h @@ -37,12 +37,12 @@ #ifndef QMODBUSTCPCLIENT_P_H #define QMODBUSTCPCLIENT_P_H -#include "qmodbusclient_p.h" -#include "qmodbustcpclient.h" - #include <QtCore/qloggingcategory.h> #include <QtNetwork/qhostaddress.h> #include <QtNetwork/qtcpsocket.h> +#include "QtSerialBus/qmodbustcpclient.h" + +#include "private/qmodbusclient_p.h" // // W A R N I N G diff --git a/src/serialbus/qmodbustcpserver_p.h b/src/serialbus/qmodbustcpserver_p.h index ba285b5..01c2123 100644 --- a/src/serialbus/qmodbustcpserver_p.h +++ b/src/serialbus/qmodbustcpserver_p.h @@ -37,9 +37,6 @@ #ifndef QMODBUSTCPSERVER_P_H #define QMODBUSTCPSERVER_P_H -#include <QtSerialBus/private/qmodbusserver_p.h> -#include <QtSerialBus/qmodbustcpserver.h> - #include <QtCore/qdatastream.h> #include <QtCore/qdebug.h> #include <QtCore/qloggingcategory.h> @@ -47,6 +44,9 @@ #include <QtNetwork/qhostaddress.h> #include <QtNetwork/qtcpserver.h> #include <QtNetwork/qtcpsocket.h> +#include <QtSerialBus/qmodbustcpserver.h> + +#include <private/qmodbusserver_p.h> // // W A R N I N G diff --git a/tests/auto/qmodbusadu/tst_qmodbusadu.cpp b/tests/auto/qmodbusadu/tst_qmodbusadu.cpp index f5b0f7a..edde92e 100644 --- a/tests/auto/qmodbusadu/tst_qmodbusadu.cpp +++ b/tests/auto/qmodbusadu/tst_qmodbusadu.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include <QtSerialBus/private/qmodbusadu_p.h> +#include <private/qmodbusadu_p.h> #include <QtTest/QtTest> diff --git a/tests/auto/qmodbusclient/tst_qmodbusclient.cpp b/tests/auto/qmodbusclient/tst_qmodbusclient.cpp index db51785..06ca450 100644 --- a/tests/auto/qmodbusclient/tst_qmodbusclient.cpp +++ b/tests/auto/qmodbusclient/tst_qmodbusclient.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <QtSerialBus/qmodbusclient.h> -#include <QtSerialBus/private/qmodbusclient_p.h> -#include <QtSerialBus/private/qmodbus_symbols_p.h> +#include <private/qmodbusclient_p.h> +#include <private/qmodbus_symbols_p.h> #include <QtTest/QtTest> diff --git a/tests/auto/qmodbuscommevent/tst_qmodbuscommevent.cpp b/tests/auto/qmodbuscommevent/tst_qmodbuscommevent.cpp index 4595be0..e129078 100644 --- a/tests/auto/qmodbuscommevent/tst_qmodbuscommevent.cpp +++ b/tests/auto/qmodbuscommevent/tst_qmodbuscommevent.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include <QtSerialBus/private/qmodbuscommevent_p.h> +#include <private/qmodbuscommevent_p.h> #include <QtTest/QtTest> |