From d5ec06be6397b807b743aa46707ff45aa9dccafa Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@digia.com>
Date: Fri, 23 Nov 2012 13:36:40 +0100
Subject: QtBase: examples/widgets/richtext code style

Change-Id: Ie0c27464e0fdb8f26caf0d8f27043da4ec45f41f
Reviewed-by: hjk <qthjk@ovi.com>
---
 .../widgets/richtext/syntaxhighlighter/highlighter.cpp     |  2 --
 examples/widgets/richtext/syntaxhighlighter/highlighter.h  |  4 +---
 examples/widgets/richtext/syntaxhighlighter/main.cpp       |  4 ++--
 examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp | 14 ++++----------
 examples/widgets/richtext/syntaxhighlighter/mainwindow.h   |  6 +++---
 5 files changed, 10 insertions(+), 20 deletions(-)

(limited to 'examples/widgets/richtext/syntaxhighlighter')

diff --git a/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp b/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp
index d84589f938..5c660ddb6d 100644
--- a/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp
+++ b/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp
@@ -38,8 +38,6 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "highlighter.h"
 
 //! [0]
diff --git a/examples/widgets/richtext/syntaxhighlighter/highlighter.h b/examples/widgets/richtext/syntaxhighlighter/highlighter.h
index c7ff0b7367..32e91ffa4d 100644
--- a/examples/widgets/richtext/syntaxhighlighter/highlighter.h
+++ b/examples/widgets/richtext/syntaxhighlighter/highlighter.h
@@ -42,8 +42,6 @@
 #define HIGHLIGHTER_H
 
 #include <QSyntaxHighlighter>
-
-#include <QHash>
 #include <QTextCharFormat>
 
 QT_BEGIN_NAMESPACE
@@ -81,4 +79,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // HIGHLIGHTER_H
diff --git a/examples/widgets/richtext/syntaxhighlighter/main.cpp b/examples/widgets/richtext/syntaxhighlighter/main.cpp
index 61c54138b8..a1a8f4aedf 100644
--- a/examples/widgets/richtext/syntaxhighlighter/main.cpp
+++ b/examples/widgets/richtext/syntaxhighlighter/main.cpp
@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-
 #include "mainwindow.h"
 
+#include <QApplication>
+
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
diff --git a/examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp b/examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp
index e8e5015f7b..6c30121e43 100644
--- a/examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp
+++ b/examples/widgets/richtext/syntaxhighlighter/mainwindow.cpp
@@ -74,8 +74,7 @@ void MainWindow::openFile(const QString &path)
     QString fileName = path;
 
     if (fileName.isNull())
-        fileName = QFileDialog::getOpenFileName(this,
-            tr("Open File"), "", "C++ Files (*.cpp *.h)");
+        fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "", "C++ Files (*.cpp *.h)");
 
     if (!fileName.isEmpty()) {
         QFile file(fileName);
@@ -108,14 +107,9 @@ void MainWindow::setupFileMenu()
     QMenu *fileMenu = new QMenu(tr("&File"), this);
     menuBar()->addMenu(fileMenu);
 
-    fileMenu->addAction(tr("&New"), this, SLOT(newFile()),
-                        QKeySequence::New);
-
-    fileMenu->addAction(tr("&Open..."), this, SLOT(openFile()),
-                        QKeySequence::Open);
-                        
-    fileMenu->addAction(tr("E&xit"), qApp, SLOT(quit()),
-                        QKeySequence::Quit);
+    fileMenu->addAction(tr("&New"), this, SLOT(newFile()), QKeySequence::New);
+    fileMenu->addAction(tr("&Open..."), this, SLOT(openFile()), QKeySequence::Open);
+    fileMenu->addAction(tr("E&xit"), qApp, SLOT(quit()), QKeySequence::Quit);
 }
 
 void MainWindow::setupHelpMenu()
diff --git a/examples/widgets/richtext/syntaxhighlighter/mainwindow.h b/examples/widgets/richtext/syntaxhighlighter/mainwindow.h
index c120b35be6..f50ef22faf 100644
--- a/examples/widgets/richtext/syntaxhighlighter/mainwindow.h
+++ b/examples/widgets/richtext/syntaxhighlighter/mainwindow.h
@@ -41,10 +41,10 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
-
 #include "highlighter.h"
 
+#include <QMainWindow>
+
 QT_BEGIN_NAMESPACE
 class QTextEdit;
 QT_END_NAMESPACE
@@ -72,4 +72,4 @@ private:
 };
 //! [0]
 
-#endif
+#endif // MAINWINDOW_H
-- 
cgit v1.2.3