more code cosmetics

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

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)
 

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

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)
 {

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

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)
 {

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
 

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"
 

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
 

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);

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
 

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;
 

src/plugins/help/helpplugin.h

@@ -35,6 +35,7 @@
 #define HELPPLUGIN_H
 
 #include "help_global.h"
+
 #include <extensionsystem/iplugin.h>
 
 #include <QtCore/QMap>

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()

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;
 

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

src/plugins/help/searchwidget.h

@@ -85,4 +85,4 @@ private:
 } // namespace Internal
 } // namespace Help
 
-#endif  // SEARCHWIDGET_H
+#endif // SEARCHWIDGET_H

src/plugins/perforce/annotationhighlighter.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "annotationhighlighter.h"
 
 namespace Perforce {
@@ -48,5 +49,5 @@ QString PerforceAnnotationHighlighter::changeNumber(const QString &block) const
     return pos > 1 ? block.left(pos) : QString();
 }
 
-}
-}
+} // Internal
+} // Perforce

src/plugins/perforce/annotationhighlighter.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ANNOTATIONHIGHLIGHTER_H
 #define ANNOTATIONHIGHLIGHTER_H
 
@@ -52,7 +53,7 @@ private:
     const QChar m_colon;
 };
 
-} //namespace Perforce
-} //namespace Internal
+} // namespace Perforce
+} // namespace Internal
 
-#endif
+#endif // ANNOTATIONHIGHLIGHTER_H

src/plugins/perforce/changenumberdialog.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include <QtGui/QIntValidator>
 
 #include "changenumberdialog.h"

src/plugins/perforce/changenumberdialog.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CHANGENUMBERDIALOG_H
 #define CHANGENUMBERDIALOG_H
 
@@ -53,9 +54,7 @@ private:
 
 };
 
-} //namespace Perforce
-} //namespace Internal
-
-#endif
-
+} // namespace Perforce
+} // namespace Internal
 
+#endif // CHANGENUMBERDIALOG_H

src/plugins/perforce/p4.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef P4_API_INCL
 #define P4_API_INCL
 

src/plugins/perforce/pendingchangesdialog.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include <QtCore/QRegExp>
 
 #include "pendingchangesdialog.h"

src/plugins/perforce/pendingchangesdialog.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PENDINGCHANGESDIALOG_H
 #define PENDINGCHANGESDIALOG_H
 
@@ -52,8 +53,8 @@ private:
     Ui::PendingChangesDialog m_ui;
 };
 
-} //namespace Perforce
-} //namespace Internal
+} // namespace Perforce
+} // namespace Internal
 
-#endif
+#endif // PENDINGCHANGESDIALOG_H
 

src/plugins/perforce/perforceconstants.h

@@ -30,24 +30,27 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCE_CONSTANTS_H
 #define PERFORCE_CONSTANTS_H
 
 namespace Perforce {
-    namespace Constants {
-        const char * const C_PERFORCEEDITOR  = "Perforce Editor";
+namespace Constants {
 
-        const char * const PERFORCEEDITOR_KIND  = "Perforce Editor";
-        const char * const C_PERFORCESUBMITEDITOR  = "Perforce Submit Editor";
-        const char * const PERFORCESUBMITEDITOR_KIND  = "Perforce Submit Editor";
-        const char * const ICON_SUBMIT = ":/trolltech.perforce/images/submit.png";
-        const char * const ICON_DIFF = ":/trolltech.perforce/images/diff.png";
-        const char * const SUBMIT_CURRENT = "Nokia.Perforce.SubmitCurrentLog";
-        const char * const DIFF_SELECTED = "Nokia.Perforce.DiffSelectedFilesInLog";
-        const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.p4.submit";
+const char * const C_PERFORCEEDITOR  = "Perforce Editor";
 
-        enum { debug = 0 };
-    }
-}
+const char * const PERFORCEEDITOR_KIND  = "Perforce Editor";
+const char * const C_PERFORCESUBMITEDITOR  = "Perforce Submit Editor";
+const char * const PERFORCESUBMITEDITOR_KIND  = "Perforce Submit Editor";
+const char * const ICON_SUBMIT = ":/trolltech.perforce/images/submit.png";
+const char * const ICON_DIFF = ":/trolltech.perforce/images/diff.png";
+const char * const SUBMIT_CURRENT = "Nokia.Perforce.SubmitCurrentLog";
+const char * const DIFF_SELECTED = "Nokia.Perforce.DiffSelectedFilesInLog";
+const char * const SUBMIT_MIMETYPE = "application/vnd.nokia.text.p4.submit";
+
+enum { debug = 0 };
+
+} // Internal
+} // Perforce
 
 #endif // PERFORCE_CONSTANTS_H

src/plugins/perforce/perforceeditor.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "perforceeditor.h"
 #include "annotationhighlighter.h"
 #include "perforceplugin.h"

src/plugins/perforce/perforceeditor.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCEEDITOR_H
 #define PERFORCEEDITOR_H
 

src/plugins/perforce/perforceoutputwindow.cpp

@@ -30,15 +30,16 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
+#include "perforceoutputwindow.h"
+#include "perforceplugin.h"
+
 #include <QtGui/QKeyEvent>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QMenu>
 #include <QtGui/QAction>
 #include <QtGui/QListWidget>
 
-#include "perforceoutputwindow.h"
-#include "perforceplugin.h"
-
 using namespace Perforce::Internal;
 
 PerforceOutputWindow::PerforceOutputWindow(PerforcePlugin *p4Plugin)
@@ -74,7 +75,6 @@ bool PerforceOutputWindow::canFocus()
 
 void PerforceOutputWindow::setFocus()
 {
-
 }
 
 QWidget *PerforceOutputWindow::outputWidget(QWidget *parent)
@@ -95,7 +95,6 @@ void PerforceOutputWindow::clearContents()
 
 void PerforceOutputWindow::visibilityChanged(bool /* b */)
 {
-
 }
 
 void PerforceOutputWindow::append(const QString &txt, bool doPopup)

src/plugins/perforce/perforceoutputwindow.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCEOUTPUTWINDOW_H
 #define PERFORCEOUTPUTWINDOW_H
 
@@ -84,4 +85,4 @@ private:
 } // namespace Perforce
 } // namespace Internal
 
-#endif
+#endif // PERFORCEOUTPUTWINDOW_H

src/plugins/perforce/perforceplugin.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "p4.h"
 #include "perforceplugin.h"
 #include "perforceoutputwindow.h"

src/plugins/perforce/perforceplugin.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCEPLUGIN_H
 #define PERFORCEPLUGIN_H
 
@@ -64,6 +65,7 @@ namespace Core {
 
 namespace Perforce {
 namespace Internal {
+
 class PerforceOutputWindow;
 class SettingsPage;
 class PerforceVersionControl;

src/plugins/perforce/perforcesettings.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "perforcesettings.h"
 
 #include <QtCore/QSettings>
@@ -90,6 +91,5 @@ bool PerforceSettings::equals(const PerforceSettings &s) const
         && defaultEnv == s.defaultEnv;
 }
 
-}
-}
-
+} // Internal
+} // Perforce

src/plugins/perforce/perforcesettings.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFOCESETTINGS_H
 #define PERFOCESETTINGS_H
 
@@ -59,7 +60,8 @@ inline bool operator==(const PerforceSettings &p1, const PerforceSettings &p2)
     { return p1.equals(p2); }
 inline bool operator!=(const PerforceSettings &p1, const PerforceSettings &p2)
     { return !p1.equals(p2); }
-}
-}
 
-#endif
+} // Internal
+} // Perforce
+
+#endif // PERFOCESETTINGS_H

src/plugins/perforce/perforcesubmiteditor.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "perforcesubmiteditor.h"
 #include "perforcesubmiteditorwidget.h"
 #include "perforceplugin.h"
@@ -190,5 +191,5 @@ void PerforceSubmitEditor::updateEntries()
     m_entries.insert(QLatin1String("Files"), files);
 }
 
-}
-}
+} // Internal
+} // Perforce

src/plugins/perforce/perforcesubmiteditor.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCESUBMITEDITOR_H
 #define PERFORCESUBMITEDITOR_H
 

src/plugins/perforce/perforcesubmiteditorwidget.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "perforcesubmiteditorwidget.h"
 
 namespace Perforce {
@@ -51,5 +52,6 @@ void PerforceSubmitEditorWidget::setData(const QString &change,
     m_submitPanelUi.clientName->setText(client);
     m_submitPanelUi.userName->setText(userName);
 }
-}
-}
+
+} // Internal
+} // Perforce

src/plugins/perforce/perforcesubmiteditorwidget.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCESUBMITEDITORWIDGET_H
 #define PERFORCESUBMITEDITORWIDGET_H
 

src/plugins/perforce/perforceversioncontrol.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "perforceversioncontrol.h"
 #include "perforceplugin.h"
 
@@ -65,5 +66,6 @@ QString PerforceVersionControl::findTopLevelForDirectory(const QString &director
 {
     return m_plugin->findTopLevelForDirectory(directory);
 }
-}
-}
+
+} // Internal
+} // Perforce

src/plugins/perforce/perforceversioncontrol.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PERFORCEVERSIONCONTROL_H
 #define PERFORCEVERSIONCONTROL_H
 
@@ -55,6 +56,7 @@ private:
     PerforcePlugin *m_plugin;
 };
 
-}
-}
-#endif
+} // Internal
+} // Perforce
+
+#endif // PERFORCEVERSIONCONTROL_H

src/plugins/perforce/settingspage.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "settingspage.h"
 #include "perforcesettings.h"
 #include "perforceplugin.h"

src/plugins/perforce/settingspage.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef SETTINGSPAGE_H
 #define SETTINGSPAGE_H
 

src/plugins/perforce/workbenchclientuser.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "workbenchclientuser.h"
 #include "perforceoutputwindow.h"
 #include "perforceplugin.h"

src/plugins/perforce/workbenchclientuser.h

@@ -30,15 +30,17 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef WORKBENCHCLIENTUSER_H
 #define WORKBENCHCLIENTUSER_H
 
+#include "p4.h"
+#include "ui_promptdialog.h"
+
+#include <coreplugin/icorelistener.h>
+
 #include <QtCore/QObject>
 #include <QtCore/QMap>
-#include <coreplugin/icorelistener.h>
-#include "p4.h"
-
-#include "ui_promptdialog.h"
 
 QT_BEGIN_NAMESPACE
 class QRadioButton;
@@ -108,4 +110,4 @@ private:
 } // namespace Perforce
 } // namespace Internal
 
-#endif
+#endif // WORKBENCHCLIENTUSER_H

src/plugins/projectexplorer/abstractprocess.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ABSTRACTPROCESS_H
 #define ABSTRACTPROCESS_H
 
@@ -68,5 +69,5 @@ private:
 } //namespace Internal
 } //namespace Qt4ProjectManager
 
-#endif
+#endif // ABSTRACTPROCESS_H
 

src/plugins/projectexplorer/abstractprocessstep.cpp

@@ -30,9 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "abstractprocessstep.h"
 #include "buildstep.h"
 #include "project.h"
+
 #include <QtCore/QProcess>
 #include <QtCore/QEventLoop>
 #include <QtCore/QDebug>
@@ -41,7 +43,7 @@
 using namespace ProjectExplorer;
 
 AbstractProcessStep::AbstractProcessStep(Project *pro)
-        : BuildStep(pro)
+  : BuildStep(pro)
 {
 }
 

src/plugins/projectexplorer/abstractprocessstep.h

@@ -30,11 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ABSTRACTPROCESSSTEP_H
 #define ABSTRACTPROCESSSTEP_H
 
 #include "buildstep.h"
 #include "environment.h"
+
 #include <QtCore/QString>
 #include <QtCore/QProcess>
 
@@ -136,6 +138,6 @@ private:
     ProjectExplorer::Environment m_environment;
 };
 
-}
+} // namespace ProjectExplorer
 
 #endif // ABSTRACTPROCESSSTEP_H

src/plugins/projectexplorer/allprojectsfilter.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "allprojectsfilter.h"
 #include "projectexplorer.h"
 #include "session.h"
@@ -42,8 +43,7 @@ using namespace QuickOpen;
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Internal;
 
-AllProjectsFilter::AllProjectsFilter(ProjectExplorerPlugin *pe,
-                                     ICore *core)
+AllProjectsFilter::AllProjectsFilter(ProjectExplorerPlugin *pe, ICore *core)
     : BaseFileFilter(core)
 {
     m_projectExplorer = pe;

src/plugins/projectexplorer/allprojectsfilter.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ALLPROJECTSFILTER_H
 #define ALLPROJECTSFILTER_H
 

src/plugins/projectexplorer/allprojectsfind.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "allprojectsfind.h"
 #include "projectexplorer.h"
 #include "project.h"

src/plugins/projectexplorer/allprojectsfind.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ALLPROJECTSFIND_H
 #define ALLPROJECTSFIND_H
 

src/plugins/projectexplorer/applicationlauncher.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef APPLICATIONLAUNCHER_H
 #define APPLICATIONLAUNCHER_H
 

src/plugins/projectexplorer/applicationlauncher_win.cpp

@@ -30,12 +30,13 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#include <projectexplorer/ProjectExplorerInterfaces>
 
-#include <QDebug>
 #include "applicationlauncher.h"
 #include "consoleprocess.h"
 #include "winguiprocess.h"
+#include <projectexplorer/ProjectExplorerInterfaces>
+
+#include <QDebug>
 
 using namespace ProjectExplorer::Internal;
 

src/plugins/projectexplorer/applicationlauncher_x11.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "applicationlauncher.h"
 #include "consoleprocess.h"
 

src/plugins/projectexplorer/applicationrunconfiguration.cpp

@@ -30,9 +30,11 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "applicationrunconfiguration.h"
 #include "persistentsettings.h"
 #include "environment.h"
+
 #include <projectexplorer/projectexplorerconstants.h>
 
 #include <QtGui/QLabel>

src/plugins/projectexplorer/applicationrunconfiguration.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef APPLICATIONRUNCONFIGURATION_H
 #define APPLICATIONRUNCONFIGURATION_H
 

src/plugins/projectexplorer/buildconfiguration.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildconfiguration.h"
 
 using namespace ProjectExplorer;

src/plugins/projectexplorer/buildconfiguration.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDCONFIGURATION_H
 #define BUILDCONFIGURATION_H
 
@@ -59,6 +60,6 @@ private:
     QString m_name;
 };
 
-}
+} // namespace ProjectExplorer
 
-#endif
+#endif // BUILDCONFIGURATION_H

src/plugins/projectexplorer/buildmanager.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildmanager.h"
 #include "buildstep.h"
 #include "compileoutputwindow.h"

src/plugins/projectexplorer/buildmanager.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDMANAGER_H
 #define BUILDMANAGER_H
 

src/plugins/projectexplorer/buildparserinterface.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildparserinterface.h"
 
 using namespace ProjectExplorer;

src/plugins/projectexplorer/buildparserinterface.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDPARSERINTERFACE_H
 #define BUILDPARSERINTERFACE_H
 

src/plugins/projectexplorer/buildprogress.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildprogress.h"
 
 #include <coreplugin/stylehelper.h>

src/plugins/projectexplorer/buildprogress.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDPROGRESS_H
 #define BUILDPROGRESS_H
 

src/plugins/projectexplorer/buildsettingspropertiespage.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildsettingspropertiespage.h"
 #include "buildstep.h"
 #include "buildstepspage.h"

src/plugins/projectexplorer/buildsettingspropertiespage.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDSETTINGSPROPERTIESPAGE_H
 #define BUILDSETTINGSPROPERTIESPAGE_H
 

src/plugins/projectexplorer/buildstep.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildstep.h"
 #include "buildconfiguration.h"
 

src/plugins/projectexplorer/buildstep.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDSTEP_H
 #define BUILDSTEP_H
 

src/plugins/projectexplorer/buildstepspage.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "buildstepspage.h"
 #include "ui_buildstepspage.h"
 #include "project.h"

src/plugins/projectexplorer/buildstepspage.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef BUILDSTEPSPAGE_H
 #define BUILDSTEPSPAGE_H
 

src/plugins/projectexplorer/compileoutputwindow.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "compileoutputwindow.h"
 #include "buildmanager.h"
 

src/plugins/projectexplorer/compileoutputwindow.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef COMPILEOUTPUTWINDOW_H
 #define COMPILEOUTPUTWINDOW_H
 

src/plugins/projectexplorer/consoleprocess.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CONSOLEPROCESS_H
 #define CONSOLEPROCESS_H
 

src/plugins/projectexplorer/consoleprocess_unix.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "consoleprocess.h"
 
 using namespace ProjectExplorer::Internal;

src/plugins/projectexplorer/consoleprocess_win.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include <QtCore/QDir>
 #include <QtCore/private/qwineventnotifier_p.h>
 #include <QtCore/QAbstractEventDispatcher>

src/plugins/projectexplorer/currentprojectfilter.cpp

@@ -31,8 +31,6 @@
 **
 ***************************************************************************/
 
-
-
 #include "currentprojectfilter.h"
 #include "projectexplorer.h"
 #include "project.h"
@@ -40,7 +38,6 @@
 
 #include <QtCore/QVariant>
 #include <QtCore/QTimer>
-
 #include <QtCore/QThread>
 #include <QtDebug>
 

src/plugins/projectexplorer/currentprojectfilter.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CURRENTPROJECTFILTER_H
 #define CURRENTPROJECTFILTER_H
 

src/plugins/projectexplorer/currentprojectfind.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "currentprojectfind.h"
 #include "projectexplorer.h"
 #include "project.h"

src/plugins/projectexplorer/currentprojectfind.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CURRENTPROJECTFIND_H
 #define CURRENTPROJECTFIND_H
 

src/plugins/projectexplorer/customexecutablerunconfiguration.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "customexecutablerunconfiguration.h"
 #include "environment.h"
 #include "project.h"

src/plugins/projectexplorer/customexecutablerunconfiguration.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CUSTOMEXECUTABLERUNCONFIGURATION_H
 #define CUSTOMEXECUTABLERUNCONFIGURATION_H
 

src/plugins/projectexplorer/dependenciesdialog.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "dependenciesdialog.h"
 #include "project.h"
 #include "session.h"

src/plugins/projectexplorer/dependenciesdialog.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef DEPENDENCIESDIALOG_H
 #define DEPENDENCIESDIALOG_H
 

src/plugins/projectexplorer/directoryproject.cpp

@@ -30,5 +30,6 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "directoryproject.h"
 

src/plugins/projectexplorer/editorconfiguration.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "editorconfiguration.h"
 
 #include <QtCore/QTextCodec>

src/plugins/projectexplorer/editorconfiguration.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef EDITORCONFIGURATION_H
 #define EDITORCONFIGURATION_H
 
@@ -54,6 +55,6 @@ private:
     QTextCodec *m_defaultTextCodec;
 };
 
-}
+} // ProjectExplorer
 
-#endif
+#endif // EDITORCONFIGURATION_H

src/plugins/projectexplorer/editorsettingspropertiespage.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "editorsettingspropertiespage.h"
 #include "editorconfiguration.h"
 

src/plugins/projectexplorer/editorsettingspropertiespage.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef EDITORSETTINGSPROPERTIESPAGE_H
 #define EDITORSETTINGSPROPERTIESPAGE_H
 

src/plugins/projectexplorer/environment.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "environment.h"
 
 #include <QtCore/QProcess>

src/plugins/projectexplorer/environment.h

@@ -30,8 +30,9 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
-#ifndef ENVIRONMENT
-#define ENVIRONMENT
+
+#ifndef ENVIRONMENT_H
+#define ENVIRONMENT_H
 
 #include "projectexplorer_export.h"
 
@@ -96,6 +97,6 @@ private:
     QMap<QString, QString> m_values;
 };
 
-}
+} // namespace ProjectExplorer
 
-#endif
+#endif // ENVIRONMENT_H

src/plugins/projectexplorer/environmenteditmodel.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "environmenteditmodel.h"
 
 using namespace ProjectExplorer;

src/plugins/projectexplorer/environmenteditmodel.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef ENVIRONMENTEDITMODEL_H
 #define ENVIRONMENTEDITMODEL_H
 
@@ -40,8 +41,7 @@
 #include <QtCore/QDebug>
 #include <QtGui/QFont>
 
-namespace ProjectExplorer
-{
+namespace ProjectExplorer {
 
 class PROJECTEXPLORER_EXPORT EnvironmentModel : public QAbstractItemModel
 {
@@ -88,5 +88,6 @@ private:
     bool m_mergedEnvironments;
 };
 
-}
+} // namespace ProjectExplorer
+
 #endif // ENVIRONMENTEDITMODEL_H

src/plugins/projectexplorer/foldernavigationwidget.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "foldernavigationwidget.h"
 #include "projectexplorer.h"
 #include "projectexplorerconstants.h"
@@ -52,18 +53,21 @@ bool debug = false;
 }
 
 namespace ProjectExplorer {
-    namespace Internal {
-        class FirstRowFilter : public QSortFilterProxyModel {
-            Q_OBJECT
-        public:
-            FirstRowFilter(QObject *parent = 0) : QSortFilterProxyModel(parent) {}
-        protected:
-            bool filterAcceptsRow (int source_row, const QModelIndex & ) const {
-                return source_row != 0;
-            }
-        };
+namespace Internal {
+
+class FirstRowFilter : public QSortFilterProxyModel
+{
+    Q_OBJECT
+public:
+    FirstRowFilter(QObject *parent = 0) : QSortFilterProxyModel(parent) {}
+protected:
+    bool filterAcceptsRow (int source_row, const QModelIndex & ) const {
+        return source_row != 0;
     }
-}
+};
+
+} // namespace Internal
+} // namespace ProjectExplorer
 
 /*!
   /class FolderNavigationWidget

src/plugins/projectexplorer/foldernavigationwidget.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef FOLDERNAVIGATIONWIDGET_H
 #define FOLDERNAVIGATIONWIDGET_H
 

src/plugins/projectexplorer/iprojectmanager.h

@@ -30,10 +30,12 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTMANAGERINTERFACE_H
 #define PROJECTMANAGERINTERFACE_H
 
 #include "projectexplorer_export.h"
+
 #include <QtCore/QObject>
 
 namespace ProjectExplorer {

src/plugins/projectexplorer/iprojectproperties.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef IPROJECTPROPERTIES_H
 #define IPROJECTPROPERTIES_H
 

src/plugins/projectexplorer/metatypedeclarations.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PROJECTEXPLORERMETATYPEDECLARATIONS_H
 #define PROJECTEXPLORERMETATYPEDECLARATIONS_H
 
@@ -63,5 +64,6 @@ Q_DECLARE_METATYPE(ProjectExplorer::IApplicationOutput*)
 Q_DECLARE_METATYPE(ProjectExplorer::Internal::CommandQObject*)
 Q_DECLARE_METATYPE(QList<ProjectExplorer::Internal::CommandQObject*>)
 Q_DECLARE_METATYPE(ProjectExplorer::BuildParserInterface*)
+
 Q_DECLARE_METATYPE(ProjectExplorer::GlobalConfigManagerInterface*)
 #endif // PROJECTEXPLORERMETATYPEDECLARATIONS_H

src/plugins/projectexplorer/nodesvisitor.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "nodesvisitor.h"
 #include "projectnodes.h"
 

src/plugins/projectexplorer/nodesvisitor.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef NODESVISITOR_H
 #define NODESVISITOR_H
 
@@ -82,6 +83,6 @@ private:
     QStringList m_filePaths;
 };
 
-}
+} // namespace ProjectExplorer
 
 #endif // NODESVISITOR_H

src/plugins/projectexplorer/outputwindow.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "outputwindow.h"
 #include "projectexplorerconstants.h"
 #include "runconfiguration.h"

src/plugins/projectexplorer/outputwindow.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef OUTPUTWINDOW_H
 #define OUTPUTWINDOW_H
 
@@ -192,7 +193,7 @@ protected:
     void contextMenuEvent(QContextMenuEvent * e);
 };
 #endif // 0
-} //namespace Internal
-} //namespace ProjectExplorer
+} // namespace Internal
+} // namespace ProjectExplorer
 
-#endif
+#endif // OUTPUTWINDOW_H