diff options
author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-01-08 11:07:49 +0100 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-01-08 12:20:40 +0000 |
commit | de84310ed069de4d1606a917059652484d1d0e47 (patch) | |
tree | 7bf27f5cdc52a8db951a4156662bcd5d629795a2 /examples | |
parent | b4c251180fb805b79afc6978d560c252e2bdff98 (diff) |
Adjust header includes according to our coding conventions.
Change-Id: Id2c01e09e5d24bf2ecce57211cb13299478544e3
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/serialbus/modbus/master/main.cpp | 3 | ||||
-rw-r--r-- | examples/serialbus/modbus/master/mainwindow.cpp | 11 | ||||
-rw-r--r-- | examples/serialbus/modbus/master/writeregistermodel.h | 6 | ||||
-rw-r--r-- | examples/serialbus/modbus/slave/main.cpp | 3 | ||||
-rw-r--r-- | examples/serialbus/modbus/slave/mainwindow.cpp | 11 |
5 files changed, 17 insertions, 17 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, |