From 78c374865e2718f4be34964069c2671e382b87fd Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@digia.com>
Date: Wed, 21 Nov 2012 14:14:38 +0100
Subject: QtBase: examples/widgets/layouts coding style

Change-Id: I4340c1fcbb467bf3c2ace3b4bd4b042fe9521c35
Reviewed-by: hjk <qthjk@ovi.com>
---
 examples/widgets/layouts/basiclayouts/dialog.cpp       | 8 ++++----
 examples/widgets/layouts/basiclayouts/dialog.h         | 2 +-
 examples/widgets/layouts/borderlayout/borderlayout.cpp | 2 --
 examples/widgets/layouts/borderlayout/borderlayout.h   | 3 +--
 examples/widgets/layouts/borderlayout/window.cpp       | 4 ++--
 examples/widgets/layouts/borderlayout/window.h         | 2 +-
 examples/widgets/layouts/dynamiclayouts/dialog.h       | 3 +--
 examples/widgets/layouts/flowlayout/flowlayout.h       | 4 ++--
 examples/widgets/layouts/flowlayout/window.cpp         | 2 +-
 examples/widgets/layouts/flowlayout/window.h           | 2 +-
 10 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'examples')

diff --git a/examples/widgets/layouts/basiclayouts/dialog.cpp b/examples/widgets/layouts/basiclayouts/dialog.cpp
index 224dcd7f61..1e5ea98c4b 100644
--- a/examples/widgets/layouts/basiclayouts/dialog.cpp
+++ b/examples/widgets/layouts/basiclayouts/dialog.cpp
@@ -116,10 +116,10 @@ void Dialog::createGridGroupBox()
 
 //! [9]
     for (int i = 0; i < NumGridRows; ++i) {
-	labels[i] = new QLabel(tr("Line %1:").arg(i + 1));
-	lineEdits[i] = new QLineEdit;
-	layout->addWidget(labels[i], i + 1, 0);
-	layout->addWidget(lineEdits[i], i + 1, 1);
+        labels[i] = new QLabel(tr("Line %1:").arg(i + 1));
+        lineEdits[i] = new QLineEdit;
+        layout->addWidget(labels[i], i + 1, 0);
+        layout->addWidget(lineEdits[i], i + 1, 1);
     }
 
 //! [9] //! [10]
diff --git a/examples/widgets/layouts/basiclayouts/dialog.h b/examples/widgets/layouts/basiclayouts/dialog.h
index aacb82a476..7a4693a2b2 100644
--- a/examples/widgets/layouts/basiclayouts/dialog.h
+++ b/examples/widgets/layouts/basiclayouts/dialog.h
@@ -87,4 +87,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // DIALOG_H
diff --git a/examples/widgets/layouts/borderlayout/borderlayout.cpp b/examples/widgets/layouts/borderlayout/borderlayout.cpp
index 17e26e1e07..b7c641be33 100644
--- a/examples/widgets/layouts/borderlayout/borderlayout.cpp
+++ b/examples/widgets/layouts/borderlayout/borderlayout.cpp
@@ -38,8 +38,6 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "borderlayout.h"
 
 BorderLayout::BorderLayout(QWidget *parent, int margin, int spacing)
diff --git a/examples/widgets/layouts/borderlayout/borderlayout.h b/examples/widgets/layouts/borderlayout/borderlayout.h
index 6c4be89ee7..505fe66424 100644
--- a/examples/widgets/layouts/borderlayout/borderlayout.h
+++ b/examples/widgets/layouts/borderlayout/borderlayout.h
@@ -43,7 +43,6 @@
 
 #include <QLayout>
 #include <QRect>
-#include <QWidgetItem>
 
 class BorderLayout : public QLayout
 {
@@ -85,4 +84,4 @@ private:
     QList<ItemWrapper *> list;
 };
 
-#endif
+#endif // BORDERLAYOUT_H
diff --git a/examples/widgets/layouts/borderlayout/window.cpp b/examples/widgets/layouts/borderlayout/window.cpp
index 98bf33bab7..5308138e4f 100644
--- a/examples/widgets/layouts/borderlayout/window.cpp
+++ b/examples/widgets/layouts/borderlayout/window.cpp
@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "borderlayout.h"
 #include "window.h"
+#include <QTextBrowser>
+#include <QLabel>
 
 Window::Window()
 {
diff --git a/examples/widgets/layouts/borderlayout/window.h b/examples/widgets/layouts/borderlayout/window.h
index 338f91ea4a..00ebb50116 100644
--- a/examples/widgets/layouts/borderlayout/window.h
+++ b/examples/widgets/layouts/borderlayout/window.h
@@ -58,4 +58,4 @@ private:
     QLabel *createLabel(const QString &text);
 };
 
-#endif
+#endif // WINDOW_H
diff --git a/examples/widgets/layouts/dynamiclayouts/dialog.h b/examples/widgets/layouts/dynamiclayouts/dialog.h
index a2d76e0738..d5fd94cd59 100644
--- a/examples/widgets/layouts/dynamiclayouts/dialog.h
+++ b/examples/widgets/layouts/dynamiclayouts/dialog.h
@@ -41,7 +41,6 @@
 #ifndef DIALOG_H
 #define DIALOG_H
 
-#include <QMainWindow>
 #include <QDialog>
 #include <QQueue>
 
@@ -88,4 +87,4 @@ private:
     QGridLayout *optionsLayout;
 };
 
-#endif
+#endif // DIALOG_H
diff --git a/examples/widgets/layouts/flowlayout/flowlayout.h b/examples/widgets/layouts/flowlayout/flowlayout.h
index 307c22ec55..1706fe13ca 100644
--- a/examples/widgets/layouts/flowlayout/flowlayout.h
+++ b/examples/widgets/layouts/flowlayout/flowlayout.h
@@ -43,7 +43,7 @@
 
 #include <QLayout>
 #include <QRect>
-#include <QWidgetItem>
+#include <QStyle>
 //! [0]
 class FlowLayout : public QLayout
 {
@@ -75,4 +75,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // FLOWLAYOUT_H
diff --git a/examples/widgets/layouts/flowlayout/window.cpp b/examples/widgets/layouts/flowlayout/window.cpp
index 1db71077cf..78e0d8178e 100644
--- a/examples/widgets/layouts/flowlayout/window.cpp
+++ b/examples/widgets/layouts/flowlayout/window.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QPushButton>
 
 #include "flowlayout.h"
 #include "window.h"
diff --git a/examples/widgets/layouts/flowlayout/window.h b/examples/widgets/layouts/flowlayout/window.h
index 05b4a87194..3aba8738c6 100644
--- a/examples/widgets/layouts/flowlayout/window.h
+++ b/examples/widgets/layouts/flowlayout/window.h
@@ -56,4 +56,4 @@ public:
 };
 //! [0]
 
-#endif
+#endif // WINDOW_H
-- 
cgit v1.2.3