diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-04-30 15:55:59 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-05-02 08:27:37 +0000 |
commit | 51cc3eaf773c9d9b80d182a183d21f1ffbf88855 (patch) | |
tree | 65dfc6351f7c3e1e2a4c4bf00b17575f1ca01d8d /examples | |
parent | fc31cd63916ca9b16c1b40366de2682dd9f1a4b3 (diff) |
Use canonical include style and sort #include
See also https://wiki.qt.io/Writing_Qt_Examples
Task-number: QTBUG-60649
Change-Id: I3a5671f39e870f96546e66427cc9434f41777e33
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/scxml/calculator-widgets/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/scxml/ftpclient/ftpcontrolchannel.h | 2 | ||||
-rw-r--r-- | examples/scxml/ftpclient/ftpdatachannel.h | 2 | ||||
-rw-r--r-- | examples/scxml/ftpclient/main.cpp | 5 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-common/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp | 2 | ||||
-rw-r--r-- | examples/scxml/pinball/main.cpp | 2 | ||||
-rw-r--r-- | examples/scxml/pinball/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/scxml/sudoku/main.cpp | 2 | ||||
-rw-r--r-- | examples/scxml/sudoku/mainwindow.cpp | 12 | ||||
-rw-r--r-- | examples/scxml/trafficlight-common/trafficlight.h | 3 |
11 files changed, 18 insertions, 18 deletions
diff --git a/examples/scxml/calculator-widgets/mainwindow.cpp b/examples/scxml/calculator-widgets/mainwindow.cpp index d8c77f7..687c5a9 100644 --- a/examples/scxml/calculator-widgets/mainwindow.cpp +++ b/examples/scxml/calculator-widgets/mainwindow.cpp @@ -51,8 +51,8 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include <QStringListModel> #include <QScxmlStateMachine> +#include <QStringListModel> QT_USE_NAMESPACE diff --git a/examples/scxml/ftpclient/ftpcontrolchannel.h b/examples/scxml/ftpclient/ftpcontrolchannel.h index 78a2486..092f2a9 100644 --- a/examples/scxml/ftpclient/ftpcontrolchannel.h +++ b/examples/scxml/ftpclient/ftpcontrolchannel.h @@ -51,9 +51,9 @@ #ifndef FTPCONTROLCHANNEL_H #define FTPCONTROLCHANNEL_H +#include <QHostAddress> #include <QObject> #include <QTcpSocket> -#include <QHostAddress> class FtpControlChannel : public QObject { diff --git a/examples/scxml/ftpclient/ftpdatachannel.h b/examples/scxml/ftpclient/ftpdatachannel.h index 097e7e7..fb1b6ef 100644 --- a/examples/scxml/ftpclient/ftpdatachannel.h +++ b/examples/scxml/ftpclient/ftpdatachannel.h @@ -52,9 +52,9 @@ #define FTPDATACHANNEL_H #include <QObject> +#include <QScopedPointer> #include <QTcpServer> #include <QTcpSocket> -#include <QScopedPointer> class FtpDataChannel : public QObject { diff --git a/examples/scxml/ftpclient/main.cpp b/examples/scxml/ftpclient/main.cpp index 8dd0c16..167bb6f 100644 --- a/examples/scxml/ftpclient/main.cpp +++ b/examples/scxml/ftpclient/main.cpp @@ -48,11 +48,12 @@ ** ****************************************************************************/ - -#include "simpleftp.h" #include "ftpcontrolchannel.h" #include "ftpdatachannel.h" +#include "simpleftp.h" + #include <QCoreApplication> + #include <iostream> struct Command { diff --git a/examples/scxml/mediaplayer-common/mainwindow.cpp b/examples/scxml/mediaplayer-common/mainwindow.cpp index b4d3760..80f20c9 100644 --- a/examples/scxml/mediaplayer-common/mainwindow.cpp +++ b/examples/scxml/mediaplayer-common/mainwindow.cpp @@ -51,8 +51,8 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include <QStringListModel> #include <QScxmlStateMachine> +#include <QStringListModel> QT_USE_NAMESPACE diff --git a/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp b/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp index 457e4ee..63625fe 100644 --- a/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp +++ b/examples/scxml/mediaplayer-widgets-dynamic/mediaplayer-widgets-dynamic.cpp @@ -50,8 +50,8 @@ #include "../mediaplayer-common/mainwindow.h" -#include <QScxmlStateMachine> #include <QApplication> +#include <QScxmlStateMachine> int main(int argc, char **argv) { diff --git a/examples/scxml/pinball/main.cpp b/examples/scxml/pinball/main.cpp index 832f004..4bf058f 100644 --- a/examples/scxml/pinball/main.cpp +++ b/examples/scxml/pinball/main.cpp @@ -48,8 +48,8 @@ ** ****************************************************************************/ -#include "pinball.h" #include "mainwindow.h" +#include "pinball.h" #include <QApplication> diff --git a/examples/scxml/pinball/mainwindow.cpp b/examples/scxml/pinball/mainwindow.cpp index 777de8a..e146e4d 100644 --- a/examples/scxml/pinball/mainwindow.cpp +++ b/examples/scxml/pinball/mainwindow.cpp @@ -51,8 +51,8 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include <QStringListModel> #include <QScxmlStateMachine> +#include <QStringListModel> QT_USE_NAMESPACE diff --git a/examples/scxml/sudoku/main.cpp b/examples/scxml/sudoku/main.cpp index 0af8d72..c65efa3 100644 --- a/examples/scxml/sudoku/main.cpp +++ b/examples/scxml/sudoku/main.cpp @@ -48,8 +48,8 @@ ** ****************************************************************************/ -#include "sudoku.h" #include "mainwindow.h" +#include "sudoku.h" #include <QApplication> diff --git a/examples/scxml/sudoku/mainwindow.cpp b/examples/scxml/sudoku/mainwindow.cpp index 7f7d99e..d54fc26 100644 --- a/examples/scxml/sudoku/mainwindow.cpp +++ b/examples/scxml/sudoku/mainwindow.cpp @@ -50,15 +50,15 @@ #include "mainwindow.h" -#include <QStringListModel> -#include <QScxmlStateMachine> #include <QComboBox> -#include <QToolButton> -#include <QLabel> -#include <QGridLayout> -#include <QFile> #include <QDir> +#include <QFile> +#include <QGridLayout> +#include <QLabel> +#include <QScxmlStateMachine> +#include <QStringListModel> #include <QTextStream> +#include <QToolButton> static int Size = 9; diff --git a/examples/scxml/trafficlight-common/trafficlight.h b/examples/scxml/trafficlight-common/trafficlight.h index c42e41d..78e2c8d 100644 --- a/examples/scxml/trafficlight-common/trafficlight.h +++ b/examples/scxml/trafficlight-common/trafficlight.h @@ -51,10 +51,9 @@ #ifndef TRAFFICLIGHT_H #define TRAFFICLIGHT_H +#include <QAbstractButton> #include <QScxmlStateMachine> - #include <QWidget> -#include <QAbstractButton> class TrafficLight : public QWidget { |