diff options
author | David Schulz <david.schulz@digia.com> | 2012-11-23 09:31:03 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 17:04:00 +0100 |
commit | dae8d2505d6b6c591429768c10ae3ca190679d41 (patch) | |
tree | 8feab16aa3ae17e410c0ef222a5ec6b79962eb65 /examples/widgets/graphicsview/elasticnodes | |
parent | cbf3771e86272c10519394627784d6c1088f3a3b (diff) |
QtBase: examples/widgets/graphicsview/ codestyle
Change-Id: I501066b5eb5a1557d510e0ec20b5270e8c12704a
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'examples/widgets/graphicsview/elasticnodes')
7 files changed, 17 insertions, 16 deletions
diff --git a/examples/widgets/graphicsview/elasticnodes/edge.cpp b/examples/widgets/graphicsview/elasticnodes/edge.cpp index dcefedeabf..c71b36e5ee 100644 --- a/examples/widgets/graphicsview/elasticnodes/edge.cpp +++ b/examples/widgets/graphicsview/elasticnodes/edge.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ -#include <QPainter> - #include "edge.h" #include "node.h" #include <math.h> +#include <QPainter> + static const double Pi = 3.14159265358979323846264338327950288419717; static double TwoPi = 2.0 * Pi; diff --git a/examples/widgets/graphicsview/elasticnodes/edge.h b/examples/widgets/graphicsview/elasticnodes/edge.h index b6d562887c..1e3febddb8 100644 --- a/examples/widgets/graphicsview/elasticnodes/edge.h +++ b/examples/widgets/graphicsview/elasticnodes/edge.h @@ -72,4 +72,4 @@ private: }; //! [0] -#endif +#endif // EDGE_H diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp index ed2195f021..67b6088079 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.cpp @@ -42,10 +42,10 @@ #include "edge.h" #include "node.h" -#include <QtWidgets> - #include <math.h> +#include <QKeyEvent> + //! [0] GraphWidget::GraphWidget(QWidget *parent) : QGraphicsView(parent), timerId(0) diff --git a/examples/widgets/graphicsview/elasticnodes/graphwidget.h b/examples/widgets/graphicsview/elasticnodes/graphwidget.h index d85e91aa6d..064d3bf00a 100644 --- a/examples/widgets/graphicsview/elasticnodes/graphwidget.h +++ b/examples/widgets/graphicsview/elasticnodes/graphwidget.h @@ -41,7 +41,7 @@ #ifndef GRAPHWIDGET_H #define GRAPHWIDGET_H -#include <QtWidgets/QGraphicsView> +#include <QGraphicsView> class Node; @@ -74,4 +74,4 @@ private: }; //! [0] -#endif +#endif // GRAPHWIDGET_H diff --git a/examples/widgets/graphicsview/elasticnodes/main.cpp b/examples/widgets/graphicsview/elasticnodes/main.cpp index 1cd45dd6f3..80a6c37f0b 100644 --- a/examples/widgets/graphicsview/elasticnodes/main.cpp +++ b/examples/widgets/graphicsview/elasticnodes/main.cpp @@ -38,10 +38,12 @@ ** ****************************************************************************/ -#include <QtWidgets> - #include "graphwidget.h" +#include <QApplication> +#include <QTime> +#include <QMainWindow> + int main(int argc, char **argv) { QApplication app(argc, argv); diff --git a/examples/widgets/graphicsview/elasticnodes/node.cpp b/examples/widgets/graphicsview/elasticnodes/node.cpp index 9f85ac03f3..623c452c59 100644 --- a/examples/widgets/graphicsview/elasticnodes/node.cpp +++ b/examples/widgets/graphicsview/elasticnodes/node.cpp @@ -38,15 +38,15 @@ ** ****************************************************************************/ +#include "edge.h" +#include "node.h" +#include "graphwidget.h" + #include <QGraphicsScene> #include <QGraphicsSceneMouseEvent> #include <QPainter> #include <QStyleOption> -#include "edge.h" -#include "node.h" -#include "graphwidget.h" - //! [0] Node::Node(GraphWidget *graphWidget) : graph(graphWidget) @@ -142,8 +142,7 @@ bool Node::advance() QRectF Node::boundingRect() const { qreal adjust = 2; - return QRectF( -10 - adjust, -10 - adjust, - 23 + adjust, 23 + adjust); + return QRectF( -10 - adjust, -10 - adjust, 23 + adjust, 23 + adjust); } //! [8] diff --git a/examples/widgets/graphicsview/elasticnodes/node.h b/examples/widgets/graphicsview/elasticnodes/node.h index 9b1335b36b..29dc32bb8b 100644 --- a/examples/widgets/graphicsview/elasticnodes/node.h +++ b/examples/widgets/graphicsview/elasticnodes/node.h @@ -82,4 +82,4 @@ private: }; //! [0] -#endif +#endif // NODE_H |