17 files changed, 55 insertions, 66 deletions
diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp
index 52d423014e..fe01a3acbb 100644
--- a/src/plugins/help/docsettingspage.cpp
+++ b/src/plugins/help/docsettingspage.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "docsettingspage.h"
 
 #include <QtGui/QFileDialog>
@@ -42,7 +43,6 @@ DocSettingsPage::DocSettingsPage(QHelpEngine *helpEngine)
     : m_helpEngine(helpEngine),
       m_registeredDocs(false)
 {
-
 }
 
 QString DocSettingsPage::name() const
diff --git a/src/plugins/help/docsettingspage.h b/src/plugins/help/docsettingspage.h
index 85e331691b..93b518a7f4 100644
--- a/src/plugins/help/docsettingspage.h
+++ b/src/plugins/help/docsettingspage.h
@@ -34,10 +34,11 @@
 #ifndef DOCSETTINGSPAGE_H
 #define DOCSETTINGSPAGE_H
 
-#include <QtGui/QWidget>
+#include "ui_docsettingspage.h"
+
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include "ui_docsettingspage.h"
+#include <QtGui/QWidget>
 
 QT_FORWARD_DECLARE_CLASS(QHelpEngine)
 
diff --git a/src/plugins/help/help_global.h b/src/plugins/help/help_global.h
index 8f3e782e77..e0d66c58ec 100644
--- a/src/plugins/help/help_global.h
+++ b/src/plugins/help/help_global.h
@@ -30,18 +30,6 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 1992-$THISYEAR$ Trolltech AS. All rights reserved.
-**
-** This file is part of the $MODULE$ of the Qt Toolkit.
-**
-** $LICENSE$
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
 
 #ifndef HELP_GLOBAL_H
 #define HELP_GLOBAL_H
diff --git a/src/plugins/help/helpengine.cpp b/src/plugins/help/helpengine.cpp
index 49a48115a1..db259f7aa0 100644
--- a/src/plugins/help/helpengine.cpp
+++ b/src/plugins/help/helpengine.cpp
@@ -30,14 +30,15 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+#include "helpengine.h"
+#include "config.h"
+
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QDateTime>
 #include <QtCore/QCoreApplication>
 
-#include "helpengine.h"
-#include "config.h"
-
 using namespace Help::Internal;
 
 static bool verifyDirectory(const QString &str)
@@ -52,7 +53,8 @@ static bool verifyDirectory(const QString &str)
     return true;
 }
 
-struct IndexKeyword {
+struct IndexKeyword
+{
     IndexKeyword(const QString &kw, const QString &l)
         : keyword(kw), link(l) {}
     IndexKeyword() : keyword(QString()), link(QString()) {}
@@ -193,12 +195,6 @@ QModelIndex IndexListModel::filter(const QString &s, const QString &real)
 
 
 
-
-
-
-
-
-
 HelpEngine::HelpEngine(QObject *parent, const QString &defaultQtVersionPath)
     : QObject(parent)
 {
@@ -344,13 +340,6 @@ QString HelpEngine::home() const
 
 
 
-
-
-
-
-
-
-
 TitleMapThread::TitleMapThread(HelpEngine *he)
     : QThread(he)
 {
@@ -488,9 +477,6 @@ void TitleMapThread::buildContentDict()
 }
 
 
-
-
-
 IndexThread::IndexThread(HelpEngine *he)
     : QThread(he)
 {
diff --git a/src/plugins/help/helpengine.h b/src/plugins/help/helpengine.h
index cbb9cc3f37..e3cb08a151 100644
--- a/src/plugins/help/helpengine.h
+++ b/src/plugins/help/helpengine.h
@@ -30,9 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef HELPENGINE_H
 #define HELPENGINE_H
 
+#include "docuparser.h"
+
 #include <QtCore/QThread>
 #include <QtCore/QPair>
 #include <QtCore/QMap>
@@ -40,8 +43,6 @@
 #include <QtCore/QMutex>
 #include <QtGui/QStringListModel>
 
-#include "docuparser.h"
-
 namespace Help {
 namespace Internal {
 
@@ -129,7 +130,7 @@ class HelpEngine : public QObject
     Q_OBJECT
 
 public:
-    HelpEngine(QObject *parent, const QString& defaultQtVersionPath);
+    HelpEngine(QObject *parent, const QString &defaultQtVersionPath);
     ~HelpEngine();
     void init();    
     QList<QPair<QString, ContentList> > contents() const { return contentList; }
@@ -176,7 +177,7 @@ private:
     bool contentsOnly;
 };
 
-} //namespace Internal
-} //namespace Help
+} // namespace Internal
+} // namespace Help
 
-#endif
+#endif // HELPENGINE_H
diff --git a/src/plugins/help/helpfindsupport.cpp b/src/plugins/help/helpfindsupport.cpp
index 56243c723c..83ec2d1570 100644
--- a/src/plugins/help/helpfindsupport.cpp
+++ b/src/plugins/help/helpfindsupport.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "helpfindsupport.h"
 #include "helpviewer.h"
 
@@ -48,6 +49,7 @@ bool HelpFindSupport::isEnabled() const
 {
     return true;
 }
+
 QString HelpFindSupport::currentFindString() const
 {
     Q_ASSERT(m_centralWidget);
@@ -61,8 +63,10 @@ QString HelpFindSupport::currentFindString() const
 #endif
 }
 
-
-QString HelpFindSupport::completedFindString() const { return QString(); }
+QString HelpFindSupport::completedFindString() const
+{
+    return QString();
+}
 
 bool HelpFindSupport::findIncremental(const QString &txt, QTextDocument::FindFlags findFlags)
 {
diff --git a/src/plugins/help/helpfindsupport.h b/src/plugins/help/helpfindsupport.h
index 51eef1f2dc..a2105dfe29 100644
--- a/src/plugins/help/helpfindsupport.h
+++ b/src/plugins/help/helpfindsupport.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef HELPFINDSUPPORT_H
 #define HELPFINDSUPPORT_H
 
diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp
index 0fc113c9a0..989ed18f2a 100644
--- a/src/plugins/help/helpindexfilter.cpp
+++ b/src/plugins/help/helpindexfilter.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "helpindexfilter.h"
 #include "helpplugin.h"
 
diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h
index 26f6b38566..0e4e2743de 100644
--- a/src/plugins/help/helpindexfilter.h
+++ b/src/plugins/help/helpindexfilter.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef HELPINDEXFILTER_H
 #define HELPINDEXFILTER_H
 
diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp
index 49023da60b..f206773f35 100644
--- a/src/plugins/help/helpmode.cpp
+++ b/src/plugins/help/helpmode.cpp
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "helpmode.h"
 #include "helpplugin.h"
 
@@ -43,7 +44,8 @@ using namespace Help::Internal;
 HelpMode::HelpMode(QWidget *widget, QWidget *centralWidget, QObject *parent):
     BaseMode(tr("Help"),
              Constants::ID_MODE_HELP,
-             QIcon((QLatin1String(":/fancyactionbar/images/mode_Reference.png"))), Constants::P_MODE_HELP, widget, parent),
+             QIcon((QLatin1String(":/fancyactionbar/images/mode_Reference.png"))),
+             Constants::P_MODE_HELP, widget, parent),
     m_centralWidget(centralWidget)
 {
     m_centralWidget->layout()->setSpacing(0);
diff --git a/src/plugins/help/helpmode.h b/src/plugins/help/helpmode.h
index 753c35d84a..458b7dc5c4 100644
--- a/src/plugins/help/helpmode.h
+++ b/src/plugins/help/helpmode.h
@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef HELPMODE_H
 #define HELPMODE_H
 
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 73dc3cae06..c96fcf2847 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -44,6 +44,18 @@
 #include "helpfindsupport.h"
 #include "searchwidget.h"
 
+#include <extensionsystem/pluginmanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/modemanager.h>
+#include <coreplugin/uniqueidmanager.h>
+#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <coreplugin/minisplitter.h>
+#include <coreplugin/modemanager.h>
+#include <coreplugin/rightpane.h>
+#include <coreplugin/sidebar.h>
+#include <coreplugin/welcomemode.h>
+
 #include <QtCore/QDebug>
 #include <QtCore/qplugin.h>
 #include <QtCore/QFileInfo>
@@ -58,18 +70,6 @@
 #include <QtGui/QComboBox>
 #include <QtHelp/QHelpEngine>
 
-#include <extensionsystem/pluginmanager.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/uniqueidmanager.h>
-#include <coreplugin/actionmanager/actionmanagerinterface.h>
-#include <coreplugin/minisplitter.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/rightpane.h>
-#include <coreplugin/sidebar.h>
-#include <coreplugin/welcomemode.h>
-
 using namespace Help;
 using namespace Help::Internal;
 
diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h
index 95845fb5d1..5f50b48a56 100644
--- a/src/plugins/help/helpplugin.h
+++ b/src/plugins/help/helpplugin.h
@@ -35,6 +35,7 @@
 #define HELPPLUGIN_H
 
 #include "help_global.h"
+
 #include <extensionsystem/iplugin.h>
 
 #include <QtCore/QMap>
diff --git a/src/plugins/help/indextoolwindow.cpp b/src/plugins/help/indextoolwindow.cpp
index 6a6f8c5348..07a4ee68ce 100644
--- a/src/plugins/help/indextoolwindow.cpp
+++ b/src/plugins/help/indextoolwindow.cpp
@@ -30,6 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+#include "indextoolwindow.h"
+#include "helpengine.h"
+#include "topicchooser.h"
+
 #include <QtCore/QDebug>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QFocusEvent>
@@ -39,10 +44,6 @@
 #include <QtGui/QListView>
 #include <QtGui/QApplication>
 
-#include "indextoolwindow.h"
-#include "helpengine.h"
-#include "topicchooser.h"
-
 using namespace Help::Internal;
 
 IndexToolWidget::IndexToolWidget()
diff --git a/src/plugins/help/indextoolwindow.h b/src/plugins/help/indextoolwindow.h
index 37c420184c..6792ca5b92 100644
--- a/src/plugins/help/indextoolwindow.h
+++ b/src/plugins/help/indextoolwindow.h
@@ -30,14 +30,15 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef INDEXTOOLWINDOW_H
 #define INDEXTOOLWINDOW_H
 
+#include <coreplugin/iview.h>
+
 #include <QtCore/QModelIndex>
 #include <QtGui/QWidget>
 
-#include <coreplugin/iview.h>
-
 class QListView;
 class QLineEdit;
 
diff --git a/src/plugins/help/indexwindow.h b/src/plugins/help/indexwindow.h
index d93a62b258..51ebb06653 100644
--- a/src/plugins/help/indexwindow.h
+++ b/src/plugins/help/indexwindow.h
@@ -31,8 +31,8 @@
 **
 ***************************************************************************/
 
-#ifndef INDEXWINDOW
-#define INDEXWINDOW
+#ifndef INDEXWINDOW_H
+#define INDEXWINDOW_H
 
 #include <QtCore/QUrl>
 #include <QtGui/QWidget>
@@ -79,4 +79,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif
+#endif // INDEXWINDOW_H
diff --git a/src/plugins/help/searchwidget.h b/src/plugins/help/searchwidget.h
index 6f6533f387..09b73c2679 100644
--- a/src/plugins/help/searchwidget.h
+++ b/src/plugins/help/searchwidget.h
@@ -85,4 +85,4 @@ private:
 } // namespace Internal
 } // namespace Help
 
-#endif  // SEARCHWIDGET_H
+#endif // SEARCHWIDGET_H