From cbf3771e86272c10519394627784d6c1088f3a3b Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@digia.com>
Date: Fri, 23 Nov 2012 11:52:51 +0100
Subject: QtBase: examples/widgets/painting code style

Change-Id: I3d3c6f3bae20ac8383279437f8f89c92195a704f
Reviewed-by: hjk <qthjk@ovi.com>
---
 .../widgets/painting/concentriccircles/circlewidget.cpp   | 15 ++++++---------
 .../widgets/painting/concentriccircles/circlewidget.h     |  2 +-
 examples/widgets/painting/concentriccircles/main.cpp      |  4 ++--
 examples/widgets/painting/concentriccircles/window.cpp    |  4 ++--
 examples/widgets/painting/concentriccircles/window.h      |  2 +-
 5 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'examples/widgets/painting/concentriccircles')

diff --git a/examples/widgets/painting/concentriccircles/circlewidget.cpp b/examples/widgets/painting/concentriccircles/circlewidget.cpp
index 8fd134999b..34391f1b51 100644
--- a/examples/widgets/painting/concentriccircles/circlewidget.cpp
+++ b/examples/widgets/painting/concentriccircles/circlewidget.cpp
@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "circlewidget.h"
 
+#include <QPainter>
+
 #include <stdlib.h>
 
 //! [0]
@@ -111,13 +111,10 @@ void CircleWidget::paintEvent(QPaintEvent *)
         if (alpha > 0) {
             painter.setPen(QPen(QColor(0, diameter / 2, 127, alpha), 3));
 
-            if (floatBased) {
-                painter.drawEllipse(QRectF(-diameter / 2.0, -diameter / 2.0,
-                                           diameter, diameter));
-            } else {
-                painter.drawEllipse(QRect(-diameter / 2, -diameter / 2,
-                                          diameter, diameter));
-            }
+            if (floatBased)
+                painter.drawEllipse(QRectF(-diameter / 2.0, -diameter / 2.0, diameter, diameter));
+            else
+                painter.drawEllipse(QRect(-diameter / 2, -diameter / 2, diameter, diameter));
         }
     }
 }
diff --git a/examples/widgets/painting/concentriccircles/circlewidget.h b/examples/widgets/painting/concentriccircles/circlewidget.h
index f9d30a3cea..f2331ec49f 100644
--- a/examples/widgets/painting/concentriccircles/circlewidget.h
+++ b/examples/widgets/painting/concentriccircles/circlewidget.h
@@ -70,4 +70,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // CIRCLEWIDGET_H
diff --git a/examples/widgets/painting/concentriccircles/main.cpp b/examples/widgets/painting/concentriccircles/main.cpp
index a244f67d66..903795685f 100644
--- a/examples/widgets/painting/concentriccircles/main.cpp
+++ b/examples/widgets/painting/concentriccircles/main.cpp
@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-
 #include "window.h"
 
+#include <QApplication>
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
diff --git a/examples/widgets/painting/concentriccircles/window.cpp b/examples/widgets/painting/concentriccircles/window.cpp
index 9fd43f2b10..5f63a0984d 100644
--- a/examples/widgets/painting/concentriccircles/window.cpp
+++ b/examples/widgets/painting/concentriccircles/window.cpp
@@ -38,11 +38,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "circlewidget.h"
 #include "window.h"
 
+#include <QtWidgets>
+
 //! [0]
 Window::Window()
 {
diff --git a/examples/widgets/painting/concentriccircles/window.h b/examples/widgets/painting/concentriccircles/window.h
index b5741c60fa..3e00d489e5 100644
--- a/examples/widgets/painting/concentriccircles/window.h
+++ b/examples/widgets/painting/concentriccircles/window.h
@@ -67,4 +67,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // WINDOW_H
-- 
cgit v1.2.3