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/padnavigator | |
| parent | cbf3771e86272c10519394627784d6c1088f3a3b (diff) | |
QtBase: examples/widgets/graphicsview/ codestyle
Change-Id: I501066b5eb5a1557d510e0ec20b5270e8c12704a
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'examples/widgets/graphicsview/padnavigator')
5 files changed, 11 insertions, 12 deletions
diff --git a/examples/widgets/graphicsview/padnavigator/flippablepad.cpp b/examples/widgets/graphicsview/padnavigator/flippablepad.cpp index 3941048050..1318b45a28 100644 --- a/examples/widgets/graphicsview/padnavigator/flippablepad.cpp +++ b/examples/widgets/graphicsview/padnavigator/flippablepad.cpp @@ -40,7 +40,7 @@ #include "flippablepad.h" -#include <QtWidgets/QtWidgets> +#include <QDirIterator> //! [0] static QRectF boundsFromSize(const QSize &size) diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.cpp b/examples/widgets/graphicsview/padnavigator/padnavigator.cpp index cb87ec36a7..1a8418b3d3 100644 --- a/examples/widgets/graphicsview/padnavigator/padnavigator.cpp +++ b/examples/widgets/graphicsview/padnavigator/padnavigator.cpp @@ -42,9 +42,8 @@ #include "padnavigator.h" #include "splashitem.h" -#include <QtWidgets/QtWidgets> #ifndef QT_NO_OPENGL -#include <QtOpenGL/QtOpenGL> +#include <QtOpenGL> #endif //! [0] @@ -90,8 +89,7 @@ PadNavigator::PadNavigator(const QSize &size, QWidget *parent) //! [4] // Selection item - RoundRectItem *selectionItem = new RoundRectItem(QRectF(-60, -60, 120, 120), - Qt::gray, pad); + RoundRectItem *selectionItem = new RoundRectItem(QRectF(-60, -60, 120, 120), Qt::gray, pad); selectionItem->setZValue(0.5); //! [4] @@ -288,7 +286,9 @@ PadNavigator::PadNavigator(const QSize &size, QWidget *parent) setMinimumSize(50, 50); setViewportUpdateMode(FullViewportUpdate); setCacheMode(CacheBackground); - setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing); + setRenderHints(QPainter::Antialiasing + | QPainter::SmoothPixmapTransform + | QPainter::TextAntialiasing); #ifndef QT_NO_OPENGL setViewport(new QGLWidget(QGLFormat(QGL::SampleBuffers))); #endif diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.h b/examples/widgets/graphicsview/padnavigator/padnavigator.h index a20dadd5a6..21b24ef7ab 100644 --- a/examples/widgets/graphicsview/padnavigator/padnavigator.h +++ b/examples/widgets/graphicsview/padnavigator/padnavigator.h @@ -45,11 +45,8 @@ #include "ui_form.h" QT_BEGIN_NAMESPACE - class QState; class QStateMachine; -class Ui_Form; - QT_END_NAMESPACE //! [0] @@ -63,7 +60,7 @@ protected: void resizeEvent(QResizeEvent *event); private: - Ui_Form form; + Ui::Form form; }; //! [0] diff --git a/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp b/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp index 2433162f80..7f0681a91c 100644 --- a/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp +++ b/examples/widgets/graphicsview/padnavigator/roundrectitem.cpp @@ -40,7 +40,9 @@ #include "roundrectitem.h" -#include <QtWidgets/QtWidgets> +#include <QApplication> +#include <QPainter> +#include <QPalette> //! [0] RoundRectItem::RoundRectItem(const QRectF &bounds, const QColor &color, diff --git a/examples/widgets/graphicsview/padnavigator/splashitem.cpp b/examples/widgets/graphicsview/padnavigator/splashitem.cpp index cf6794ff32..82ed89fbff 100644 --- a/examples/widgets/graphicsview/padnavigator/splashitem.cpp +++ b/examples/widgets/graphicsview/padnavigator/splashitem.cpp @@ -40,7 +40,7 @@ #include "splashitem.h" -#include <QtWidgets/QtWidgets> +#include <QPainter> //! [0] SplashItem::SplashItem(QGraphicsItem *parent) |