summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorhjk <qtc-commiter@nokia.com>2008-12-02 14:09:21 +0100
committerhjk <qtc-commiter@nokia.com>2008-12-02 14:09:21 +0100
commitf61e8672db50445a3f84d37e657d38fbaa0d5083 (patch)
tree2dd961e9d2108690a989080ac42f9d5c40567c97 /src/plugins
parent1472bdb0cc0c96b254cdf682bbe004c766be4a26 (diff)
downloadqt-creator-f61e8672db50445a3f84d37e657d38fbaa0d5083.tar.gz
more cosmetic changes
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/bineditor/bineditor.cpp1
-rw-r--r--src/plugins/bineditor/bineditor.h1
-rw-r--r--src/plugins/bineditor/bineditorconstants.h13
-rw-r--r--src/plugins/bineditor/bineditorplugin.cpp1
-rw-r--r--src/plugins/bineditor/bineditorplugin.h7
-rw-r--r--src/plugins/bookmarks/bookmark.cpp2
-rw-r--r--src/plugins/bookmarks/bookmark.h1
-rw-r--r--src/plugins/bookmarks/bookmarkmanager.cpp1
-rw-r--r--src/plugins/bookmarks/bookmarkmanager.h4
-rw-r--r--src/plugins/bookmarks/bookmarks_global.h7
-rw-r--r--src/plugins/bookmarks/bookmarksplugin.cpp14
-rw-r--r--src/plugins/bookmarks/bookmarksplugin.h1
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeproject.cpp3
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeproject.h14
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectconstants.h5
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp2
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectmanager.h7
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp1
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectnodes.h6
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp6
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectplugin.h4
-rw-r--r--src/plugins/coreplugin/actionmanager/actioncontainer.cpp1
-rw-r--r--src/plugins/coreplugin/actionmanager/actioncontainer.h5
-rw-r--r--src/plugins/coreplugin/actionmanager/actionmanager.cpp2
-rw-r--r--src/plugins/coreplugin/actionmanager/actionmanager.h7
-rw-r--r--src/plugins/coreplugin/actionmanager/actionmanagerinterface.h1
-rw-r--r--src/plugins/coreplugin/actionmanager/command.cpp1
-rw-r--r--src/plugins/coreplugin/actionmanager/command.h3
-rw-r--r--src/plugins/coreplugin/actionmanager/commandsfile.cpp1
-rw-r--r--src/plugins/coreplugin/actionmanager/commandsfile.h4
-rw-r--r--src/plugins/coreplugin/actionmanager/iactioncontainer.h2
-rw-r--r--src/plugins/coreplugin/actionmanager/icommand.h1
-rw-r--r--src/plugins/coreplugin/basefilewizard.cpp14
-rw-r--r--src/plugins/coreplugin/basefilewizard.h10
-rw-r--r--src/plugins/coreplugin/basemode.cpp5
-rw-r--r--src/plugins/coreplugin/basemode.h2
-rw-r--r--src/plugins/coreplugin/baseview.cpp1
-rw-r--r--src/plugins/coreplugin/baseview.h1
-rw-r--r--src/plugins/coreplugin/core_global.h12
-rw-r--r--src/plugins/coreplugin/coreconstants.h1
-rw-r--r--src/plugins/coreplugin/coreimpl.cpp1
-rw-r--r--src/plugins/coreplugin/coreimpl.h1
-rw-r--r--src/plugins/coreplugin/coreplugin.cpp1
-rw-r--r--src/plugins/coreplugin/coreplugin.h1
-rw-r--r--src/plugins/coreplugin/dialogs/ioptionspage.h1
-rw-r--r--src/plugins/coreplugin/dialogs/iwizard.h2
-rw-r--r--src/plugins/coreplugin/dialogs/newdialog.cpp3
-rw-r--r--src/plugins/coreplugin/dialogs/newdialog.h3
-rw-r--r--src/plugins/coreplugin/dialogs/openwithdialog.cpp7
-rw-r--r--src/plugins/coreplugin/dialogs/openwithdialog.h3
-rw-r--r--src/plugins/coreplugin/dialogs/saveitemsdialog.cpp1
-rw-r--r--src/plugins/coreplugin/dialogs/saveitemsdialog.h1
-rw-r--r--src/plugins/coreplugin/dialogs/settingsdialog.cpp8
-rw-r--r--src/plugins/coreplugin/dialogs/settingsdialog.h1
-rw-r--r--src/plugins/coreplugin/dialogs/shortcutsettings.cpp1
-rw-r--r--src/plugins/coreplugin/dialogs/shortcutsettings.h4
-rw-r--r--src/plugins/coreplugin/editmode.cpp2
-rw-r--r--src/plugins/coreplugin/editmode.h1
-rw-r--r--src/plugins/coreplugin/editormanager/editorgroup.cpp1
-rw-r--r--src/plugins/coreplugin/editormanager/editorgroup.h12
-rw-r--r--src/plugins/coreplugin/editormanager/editormanager.cpp1
-rw-r--r--src/plugins/coreplugin/editormanager/editormanager.h1
-rw-r--r--src/plugins/coreplugin/editormanager/editorsplitter.cpp1
-rw-r--r--src/plugins/coreplugin/editormanager/editorsplitter.h1
-rw-r--r--src/plugins/coreplugin/editormanager/ieditor.h1
-rw-r--r--src/plugins/coreplugin/editormanager/ieditorfactory.h1
-rw-r--r--src/plugins/coreplugin/editormanager/openeditorsview.cpp3
-rw-r--r--src/plugins/coreplugin/editormanager/openeditorsview.h3
-rw-r--r--src/plugins/coreplugin/editormanager/openeditorswindow.cpp1
-rw-r--r--src/plugins/coreplugin/editormanager/openeditorswindow.h1
-rw-r--r--src/plugins/coreplugin/editormanager/stackededitorgroup.cpp1
-rw-r--r--src/plugins/coreplugin/editormanager/stackededitorgroup.h1
-rw-r--r--src/plugins/coreplugin/fancyactionbar.cpp1
-rw-r--r--src/plugins/coreplugin/fancyactionbar.h1
-rw-r--r--src/plugins/coreplugin/fancytabwidget.cpp1
-rw-r--r--src/plugins/coreplugin/fancytabwidget.h3
-rw-r--r--src/plugins/coreplugin/fileiconprovider.cpp5
-rw-r--r--src/plugins/coreplugin/fileiconprovider.h1
-rw-r--r--src/plugins/coreplugin/filemanager.cpp1
-rw-r--r--src/plugins/coreplugin/filemanager.h4
-rw-r--r--src/plugins/coreplugin/findplaceholder.cpp4
-rw-r--r--src/plugins/coreplugin/findplaceholder.h1
-rw-r--r--src/plugins/coreplugin/flowlayout.cpp24
-rw-r--r--src/plugins/coreplugin/flowlayout.h14
-rw-r--r--src/plugins/coreplugin/generalsettings.cpp1
-rw-r--r--src/plugins/coreplugin/generalsettings.h1
-rw-r--r--src/plugins/coreplugin/icontext.h1
-rw-r--r--src/plugins/coreplugin/icore.h3
-rw-r--r--src/plugins/coreplugin/icorelistener.h1
-rw-r--r--src/plugins/coreplugin/ifile.h5
-rw-r--r--src/plugins/coreplugin/ifilefactory.h1
-rw-r--r--src/plugins/coreplugin/ifilewizardextension.h1
-rw-r--r--src/plugins/coreplugin/imode.h1
-rw-r--r--src/plugins/coreplugin/inavigationwidgetfactory.cpp3
-rw-r--r--src/plugins/coreplugin/inavigationwidgetfactory.h4
-rw-r--r--src/plugins/coreplugin/ioutputpane.h1
-rw-r--r--src/plugins/coreplugin/iversioncontrol.h1
-rw-r--r--src/plugins/coreplugin/iview.h1
-rw-r--r--src/plugins/coreplugin/mainwindow.cpp1
-rw-r--r--src/plugins/coreplugin/mainwindow.h24
-rw-r--r--src/plugins/coreplugin/manhattanstyle.cpp13
-rw-r--r--src/plugins/coreplugin/manhattanstyle.h12
-rw-r--r--src/plugins/coreplugin/messagemanager.cpp10
-rw-r--r--src/plugins/coreplugin/messagemanager.h1
-rw-r--r--src/plugins/coreplugin/messageoutputwindow.cpp1
-rw-r--r--src/plugins/coreplugin/messageoutputwindow.h1
-rw-r--r--src/plugins/coreplugin/mimedatabase.cpp8
-rw-r--r--src/plugins/coreplugin/mimedatabase.h10
-rw-r--r--src/plugins/coreplugin/minisplitter.cpp1
-rw-r--r--src/plugins/coreplugin/minisplitter.h1
-rw-r--r--src/plugins/coreplugin/modemanager.cpp3
-rw-r--r--src/plugins/coreplugin/modemanager.h1
-rw-r--r--src/plugins/coreplugin/navigationwidget.cpp9
-rw-r--r--src/plugins/coreplugin/navigationwidget.h1
-rw-r--r--src/plugins/coreplugin/outputpane.cpp1
-rw-r--r--src/plugins/coreplugin/outputpane.h1
-rw-r--r--src/plugins/coreplugin/plugindialog.cpp6
-rw-r--r--src/plugins/coreplugin/plugindialog.h3
-rw-r--r--src/plugins/coreplugin/progressmanager/futureprogress.cpp1
-rw-r--r--src/plugins/coreplugin/progressmanager/futureprogress.h2
-rw-r--r--src/plugins/coreplugin/progressmanager/progressmanager.cpp2
-rw-r--r--src/plugins/coreplugin/progressmanager/progressmanager.h4
-rw-r--r--src/plugins/coreplugin/progressmanager/progressmanagerinterface.h3
-rw-r--r--src/plugins/coreplugin/progressmanager/progresspie.cpp3
-rw-r--r--src/plugins/coreplugin/progressmanager/progresspie.h1
-rw-r--r--src/plugins/coreplugin/progressmanager/progressview.cpp3
-rw-r--r--src/plugins/coreplugin/progressmanager/progressview.h3
127 files changed, 265 insertions, 196 deletions
diff --git a/src/plugins/bineditor/bineditor.cpp b/src/plugins/bineditor/bineditor.cpp
index 4ca6e18707..4f2f45fc44 100644
--- a/src/plugins/bineditor/bineditor.cpp
+++ b/src/plugins/bineditor/bineditor.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "bineditor.h"
#include <texteditor/fontsettings.h>
diff --git a/src/plugins/bineditor/bineditor.h b/src/plugins/bineditor/bineditor.h
index 2eae59af1a..ad6b9064ac 100644
--- a/src/plugins/bineditor/bineditor.h
+++ b/src/plugins/bineditor/bineditor.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BINEDITOR_H
#define BINEDITOR_H
diff --git a/src/plugins/bineditor/bineditorconstants.h b/src/plugins/bineditor/bineditorconstants.h
index f67d6c522d..a0f18d36fd 100644
--- a/src/plugins/bineditor/bineditorconstants.h
+++ b/src/plugins/bineditor/bineditorconstants.h
@@ -30,14 +30,17 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BINEDITORCONSTANTS_H
#define BINEDITORCONSTANTS_H
namespace BINEditor {
- namespace Constants {
- const char * const C_BINEDITOR = "Binary Editor";
- const char * const C_BINEDITOR_MIMETYPE = "application/octet-stream";
- }
-}
+namespace Constants {
+
+const char * const C_BINEDITOR = "Binary Editor";
+const char * const C_BINEDITOR_MIMETYPE = "application/octet-stream";
+
+} // namespace Constants
+} // namespace BINEditor
#endif // BINEDITORCONSTANTS_H
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index ee223f3dea..cf1d21429b 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "bineditorplugin.h"
#include "bineditor.h"
#include "bineditorconstants.h"
diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h
index 6bd0da64b3..53ea5d6232 100644
--- a/src/plugins/bineditor/bineditorplugin.h
+++ b/src/plugins/bineditor/bineditorplugin.h
@@ -30,17 +30,18 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BINEDITORPLUGIN_H
#define BINEDITORPLUGIN_H
+#include <extensionsystem/iplugin.h>
+#include <coreplugin/editormanager/ieditorfactory.h>
+
#include <QtCore/qplugin.h>
#include <QtCore/QPointer>
#include <QtCore/QStringList>
#include <QtGui/QAction>
-#include <extensionsystem/iplugin.h>
-#include <coreplugin/editormanager/ieditorfactory.h>
-
namespace Core {
class ICore;
class IWizard;
diff --git a/src/plugins/bookmarks/bookmark.cpp b/src/plugins/bookmarks/bookmark.cpp
index 41f4659cb7..c41aa5323a 100644
--- a/src/plugins/bookmarks/bookmark.cpp
+++ b/src/plugins/bookmarks/bookmark.cpp
@@ -30,8 +30,10 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "bookmark.h"
#include "bookmarkmanager.h"
+
#include <QtCore/QDebug>
#include <QtGui/QTextBlock>
diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h
index d54d6af3e5..97a83f9247 100644
--- a/src/plugins/bookmarks/bookmark.h
+++ b/src/plugins/bookmarks/bookmark.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BOOKMARK_H
#define BOOKMARK_H
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index bb26bfbd4f..402054860d 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "bookmarkmanager.h"
#include "bookmark.h"
#include "bookmarksplugin.h"
diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h
index 45e4bf3b7b..b6fba5934a 100644
--- a/src/plugins/bookmarks/bookmarkmanager.h
+++ b/src/plugins/bookmarks/bookmarkmanager.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BOOKMARKMANAGER_H
#define BOOKMARKMANAGER_H
@@ -131,7 +132,8 @@ private:
QItemSelectionModel *m_selectionModel;
};
-class BookmarkView : public QListView {
+class BookmarkView : public QListView
+{
Q_OBJECT
public:
BookmarkView(QWidget *parent = 0);
diff --git a/src/plugins/bookmarks/bookmarks_global.h b/src/plugins/bookmarks/bookmarks_global.h
index e29f4e5865..f91575032f 100644
--- a/src/plugins/bookmarks/bookmarks_global.h
+++ b/src/plugins/bookmarks/bookmarks_global.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BOOKMARKS_GLOBAL_H
#define BOOKMARKS_GLOBAL_H
@@ -49,8 +50,8 @@ const char * const BOOKMARKS_NEXTDOC_ACTION = "Bookmarks.Next.Document";
const char * const BOOKMARKS_MENU = "Bookmarks.Menu";
const char * const BOOKMARKS_CONTEXT = "Bookmarks";
-} //namespace Constants
-} //namespace Bookmarks
+} // namespace Constants
+} // namespace Bookmarks
-#endif //BOOKMARKS_GLOBAL_H
+#endif // BOOKMARKS_GLOBAL_H
diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp
index 76df8e5777..2fdf3d528a 100644
--- a/src/plugins/bookmarks/bookmarksplugin.cpp
+++ b/src/plugins/bookmarks/bookmarksplugin.cpp
@@ -30,28 +30,28 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "bookmarksplugin.h"
#include "bookmarkmanager.h"
#include "bookmarks_global.h"
-#include <QtCore/qplugin.h>
-#include <QtGui/QMenu>
-#include <QDebug>
-
#include <texteditor/texteditorconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/actionmanager/actionmanagerinterface.h>
+#include <QtCore/qplugin.h>
+#include <QtGui/QMenu>
+#include <QDebug>
+
using namespace Bookmarks::Constants;
using namespace Bookmarks::Internal;
BookmarksPlugin *BookmarksPlugin::m_instance = 0;
-BookmarksPlugin::BookmarksPlugin():
- m_bookmarkManager(0),
- m_core(0)
+BookmarksPlugin::BookmarksPlugin()
+ : m_bookmarkManager(0), m_core(0)
{
m_instance = this;
}
diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h
index 7da45ef5ee..255f209086 100644
--- a/src/plugins/bookmarks/bookmarksplugin.h
+++ b/src/plugins/bookmarks/bookmarksplugin.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BOOKMARKS_H
#define BOOKMARKS_H
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 2c98124bb9..dd4aa4290e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -30,11 +30,14 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "cmakeproject.h"
#include "cmakeprojectconstants.h"
#include "cmakeprojectnodes.h"
+
#include <extensionsystem/pluginmanager.h>
#include <cpptools/cppmodelmanagerinterface.h>
+
#include <QtCore/QDebug>
using namespace CMakeProjectManager;
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index b5a8d0b6b4..a67b7b666b 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -1,4 +1,4 @@
-/***************************************************************************
+ /***************************************************************************
**
** This file is part of Qt Creator
**
@@ -30,17 +30,19 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef CMAKEPROJECT_H
#define CMAKEPROJECT_H
+#include "cmakeprojectmanager.h"
+#include "cmakeprojectnodes.h"
+
#include <projectexplorer/project.h>
#include <projectexplorer/projectnodes.h>
#include <projectexplorer/buildstep.h>
#include <coreplugin/ifile.h>
-#include <QtCore/QXmlStreamReader>
-#include "cmakeprojectmanager.h"
-#include "cmakeprojectnodes.h"
+#include <QtCore/QXmlStreamReader>
namespace CMakeProjectManager {
namespace Internal{
@@ -152,7 +154,7 @@ public:
virtual void init(const QString &buildConfiguration);
};
-}
-}
+} // namespace Internal
+} // namespace CMakeProjectManager
#endif // CMAKEPROJECT_H
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
index 02c76f6682..2e9bad248a 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef CMAKEPROJECTCONSTANTS_H
#define CMAKEPROJECTCONSTANTS_H
@@ -39,7 +40,7 @@ namespace Constants {
const char * const PROJECTCONTEXT = "CMakeProject.ProjectContext";
const char * const CMAKEMIMETYPE = "text/x-cmake"; // TOOD check that this is correct
-}
-}
+} // namespace Constants
+} // namespace CMakeProjectManager
#endif // CMAKEPROJECTCONSTANTS_H
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 4a179967cc..0f2fb804da 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "cmakeprojectmanager.h"
#include "cmakeprojectconstants.h"
#include "cmakeproject.h"
@@ -40,7 +41,6 @@
#include <coreplugin/uniqueidmanager.h>
#include <projectexplorer/projectexplorerconstants.h>
-
using namespace CMakeProjectManager::Internal;
CMakeManager::CMakeManager()
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
index 3808b72efb..fba00db869 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef CMAKEPROJECTMANAGER_H
#define CMAKEPROJECTMANAGER_H
@@ -55,6 +56,8 @@ private:
int m_projectContext;
int m_projectLanguage;
};
-}
-}
+
+} // namespace Internal
+} // namespace CMakeProjectManager
+
#endif // CMAKEPROJECTMANAGER_H
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
index 338750158f..c78e15830c 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "cmakeprojectnodes.h"
using namespace CMakeProjectManager;
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
index a0a9453a47..b8f0284fa3 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef CMAKEPROJECTNODE_H
#define CMAKEPROJECTNODE_H
@@ -60,7 +61,8 @@ public:
using ProjectNode::addFileNodes;
using ProjectNode::addFolderNodes;
};
-}
-}
+
+} // namespace Internal
+} // namespace CMakeProjectManager
#endif // CMAKEPROJECTNODE_H
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
index 9a9190568f..1eabecb3b6 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
@@ -30,13 +30,16 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "cmakeprojectplugin.h"
+#include "cmakeprojectmanager.h"
+
#include <coreplugin/icore.h>
#include <coreplugin/mimedatabase.h>
+
#include <QtCore/qplugin.h>
#include <QtCore/QDebug>
-#include "cmakeprojectmanager.h"
using namespace CMakeProjectManager::Internal;
@@ -59,7 +62,6 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
void CMakeProjectPlugin::extensionsInitialized()
{
-
}
Q_EXPORT_PLUGIN(CMakeProjectPlugin)
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
index 0620220667..6bc2748e4f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef CMAKEPROJECTPLUGIN_H
#define CMAKEPROJECTPLUGIN_H
@@ -52,9 +53,6 @@ public:
bool initialize(const QStringList &arguments, QString *error_message);
void extensionsInitialized();
-
-
-private:
};
} // namespace Internal
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
index ab30677a62..68709dcd13 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "actioncontainer.h"
#include "command.h"
#include "coreimpl.h"
diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h
index 8f629410a4..51b0437d4f 100644
--- a/src/plugins/coreplugin/actionmanager/actioncontainer.h
+++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef ACTIONCONTAINER_H
#define ACTIONCONTAINER_H
@@ -152,6 +153,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif //ACTIONCONTAINER_H
-
-
+#endif // ACTIONCONTAINER_H
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index f218a84c73..488dcddfa4 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "actionmanager.h"
#include "mainwindow.h"
#include "actioncontainer.h"
@@ -510,6 +511,7 @@ IActionContainer *ActionManager::actionContainer(int uid) const
}
return it.value();
}
+
static const char *settingsGroup = "KeyBindings";
static const char *idKey = "ID";
static const char *sequenceKey = "Keysequence";
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h
index c0279e3b69..43c5ecdc91 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef ACTIONMANAGER_H
#define ACTIONMANAGER_H
@@ -43,7 +44,8 @@ QT_BEGIN_NAMESPACE
class QSettings;
QT_END_NAMESPACE
-struct CommandLocation {
+struct CommandLocation
+{
int m_container;
int m_position;
};
@@ -125,5 +127,4 @@ private:
} // namespace Internal
} // namespace Core
-
-#endif //ACTIONMANAGER_H
+#endif // ACTIONMANAGER_H
diff --git a/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h b/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h
index 9a3760ed76..2d7ead17a7 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h
+++ b/src/plugins/coreplugin/actionmanager/actionmanagerinterface.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef ACTIONMANAGERINTERFACE_H
#define ACTIONMANAGERINTERFACE_H
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index d5e0b17b36..4c8a15ae74 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include <QtCore/QDebug>
#include <QtGui/QAction>
#include <QtGui/QShortcut>
diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h
index 2d227d6542..32a85762a2 100644
--- a/src/plugins/coreplugin/actionmanager/command.h
+++ b/src/plugins/coreplugin/actionmanager/command.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef COMMAND_H
#define COMMAND_H
@@ -175,4 +176,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif //COMMAND_H
+#endif // COMMAND_H
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
index 6849dd9771..897af6baeb 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "coreimpl.h"
#include "commandsfile.h"
#include "shortcutsettings.h"
diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.h b/src/plugins/coreplugin/actionmanager/commandsfile.h
index 890c2384f5..491cb0b200 100644
--- a/src/plugins/coreplugin/actionmanager/commandsfile.h
+++ b/src/plugins/coreplugin/actionmanager/commandsfile.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef COMMANDSFILE_H
#define COMMANDSFILE_H
@@ -44,7 +45,8 @@ namespace Internal {
struct ShortcutItem;
-class CommandsFile : public QObject {
+class CommandsFile : public QObject
+{
Q_OBJECT
public:
diff --git a/src/plugins/coreplugin/actionmanager/iactioncontainer.h b/src/plugins/coreplugin/actionmanager/iactioncontainer.h
index a9adb471b1..0b2efdda88 100644
--- a/src/plugins/coreplugin/actionmanager/iactioncontainer.h
+++ b/src/plugins/coreplugin/actionmanager/iactioncontainer.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IACTIONCONTAINER_H
#define IACTIONCONTAINER_H
@@ -42,6 +43,7 @@
namespace Core {
class ICommand;
+
class IActionContainer : public QObject
{
public:
diff --git a/src/plugins/coreplugin/actionmanager/icommand.h b/src/plugins/coreplugin/actionmanager/icommand.h
index c1a03a2f14..fb7a7ab4d4 100644
--- a/src/plugins/coreplugin/actionmanager/icommand.h
+++ b/src/plugins/coreplugin/actionmanager/icommand.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef ICOMMAND_H
#define ICOMMAND_H
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
index b54b43af8d..eb5dfff87f 100644
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "basefilewizard.h"
#include "mimedatabase.h"
@@ -56,7 +57,8 @@ enum { debugWizard = 0 };
namespace Core {
-class GeneratedFilePrivate : public QSharedData {
+class GeneratedFilePrivate : public QSharedData
+{
public:
GeneratedFilePrivate() {}
explicit GeneratedFilePrivate(const QString &p);
@@ -150,8 +152,11 @@ bool GeneratedFile::write(QString *errorMessage) const
file.close();
return true;
}
+
+
// ------------ BaseFileWizardParameterData
-class BaseFileWizardParameterData : public QSharedData {
+class BaseFileWizardParameterData : public QSharedData
+{
public:
explicit BaseFileWizardParameterData(IWizard::Kind kind = IWizard::FileWizard);
@@ -338,7 +343,8 @@ void WizardEventLoop::rejected()
}
// ---------------- BaseFileWizardPrivate
-struct BaseFileWizardPrivate {
+struct BaseFileWizardPrivate
+{
explicit BaseFileWizardPrivate(const Core::BaseFileWizardParameters &parameters,
Core::ICore *core);
@@ -666,6 +672,6 @@ GeneratedFiles StandardFileWizard::generateFiles(const QWizard *w,
errorMessage);
}
-
} // namespace Core
+
#include "basefilewizard.moc"
diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h
index dcf965ecce..0c392430b7 100644
--- a/src/plugins/coreplugin/basefilewizard.h
+++ b/src/plugins/coreplugin/basefilewizard.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BASEFILEWIZARD_H
#define BASEFILEWIZARD_H
@@ -62,7 +63,8 @@ class GeneratedFilePrivate;
* each file whether it already exists and will report any errors that may
* occur during creation of the files.
*/
-class CORE_EXPORT GeneratedFile {
+class CORE_EXPORT GeneratedFile
+{
public:
GeneratedFile();
explicit GeneratedFile(const QString &path);
@@ -93,7 +95,8 @@ typedef QList<GeneratedFile> GeneratedFiles;
/* Parameter class for passing parameters to instances of class Wizard
* containing name, icon and such. */
-class CORE_EXPORT BaseFileWizardParameters {
+class CORE_EXPORT BaseFileWizardParameters
+{
public:
explicit BaseFileWizardParameters(IWizard::Kind kind = IWizard::FileWizard);
BaseFileWizardParameters(const BaseFileWizardParameters &);
@@ -204,7 +207,8 @@ private:
// Core::Utils::FileWizardDialog and introduces a new virtual to generate the
// files from path and name.
-class CORE_EXPORT StandardFileWizard : public BaseFileWizard {
+class CORE_EXPORT StandardFileWizard : public BaseFileWizard
+{
Q_DISABLE_COPY(StandardFileWizard)
Q_OBJECT
diff --git a/src/plugins/coreplugin/basemode.cpp b/src/plugins/coreplugin/basemode.cpp
index 5573f733f8..40e6d911f9 100644
--- a/src/plugins/coreplugin/basemode.cpp
+++ b/src/plugins/coreplugin/basemode.cpp
@@ -30,12 +30,13 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
-#include "basemode.h"
-#include <QtGui/QWidget>
+#include "basemode.h"
#include <extensionsystem/pluginmanager.h>
+#include <QtGui/QWidget>
+
using namespace Core;
/*!
diff --git a/src/plugins/coreplugin/basemode.h b/src/plugins/coreplugin/basemode.h
index 65bd5bb378..952a7c4b6d 100644
--- a/src/plugins/coreplugin/basemode.h
+++ b/src/plugins/coreplugin/basemode.h
@@ -30,11 +30,11 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BASEMODE_H
#define BASEMODE_H
#include "core_global.h"
-
#include "imode.h"
#include <QtCore/QObject>
diff --git a/src/plugins/coreplugin/baseview.cpp b/src/plugins/coreplugin/baseview.cpp
index ef0ab5754c..661bbe7bfb 100644
--- a/src/plugins/coreplugin/baseview.cpp
+++ b/src/plugins/coreplugin/baseview.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "baseview.h"
#include <extensionsystem/ExtensionSystemInterfaces>
diff --git a/src/plugins/coreplugin/baseview.h b/src/plugins/coreplugin/baseview.h
index dd3bb0503a..996a69ce62 100644
--- a/src/plugins/coreplugin/baseview.h
+++ b/src/plugins/coreplugin/baseview.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef BASEVIEW_H
#define BASEVIEW_H
diff --git a/src/plugins/coreplugin/core_global.h b/src/plugins/coreplugin/core_global.h
index 71737b31b7..7fda209da9 100644
--- a/src/plugins/coreplugin/core_global.h
+++ b/src/plugins/coreplugin/core_global.h
@@ -30,18 +30,6 @@
** 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 CORE_GLOBAL_H
#define CORE_GLOBAL_H
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 6f0292041e..f05e224919 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef CORECONSTANTS_H
#define CORECONSTANTS_H
diff --git a/src/plugins/coreplugin/coreimpl.cpp b/src/plugins/coreplugin/coreimpl.cpp
index 258aa0331b..3b1452a35d 100644
--- a/src/plugins/coreplugin/coreimpl.cpp
+++ b/src/plugins/coreplugin/coreimpl.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "coreimpl.h"
#include <QtCore/QDir>
diff --git a/src/plugins/coreplugin/coreimpl.h b/src/plugins/coreplugin/coreimpl.h
index b7eaf185a4..f6aca168b1 100644
--- a/src/plugins/coreplugin/coreimpl.h
+++ b/src/plugins/coreplugin/coreimpl.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef COREIMPL_H
#define COREIMPL_H
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 070edd9a6a..dbc96ce4cc 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "coreplugin.h"
#include "welcomemode.h"
#include "editmode.h"
diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h
index 6afd9c7f24..43ae3bbb27 100644
--- a/src/plugins/coreplugin/coreplugin.h
+++ b/src/plugins/coreplugin/coreplugin.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef QWORKBENCHPLUGIN_H
#define QWORKBENCHPLUGIN_H
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h
index 4aa3854385..e6f9298284 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/src/plugins/coreplugin/dialogs/ioptionspage.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IOPTIONSPAGE_H
#define IOPTIONSPAGE_H
diff --git a/src/plugins/coreplugin/dialogs/iwizard.h b/src/plugins/coreplugin/dialogs/iwizard.h
index 37457ba39b..68b3f2529d 100644
--- a/src/plugins/coreplugin/dialogs/iwizard.h
+++ b/src/plugins/coreplugin/dialogs/iwizard.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IWIZARD_H
#define IWIZARD_H
@@ -65,6 +66,7 @@ public:
virtual QStringList runWizard(const QString &path, QWidget *parent) = 0;
};
+
} // namespace Core
#endif // IWIZARD_H
diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp
index e344dc34a0..fcb43ddf12 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/newdialog.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "newdialog.h"
#include "ui_newdialog.h"
#include "basefilewizard.h"
@@ -37,7 +38,6 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/dialogs/iwizard.h>
-
#include <QtGui/QHeaderView>
#include <QtGui/QPushButton>
@@ -143,7 +143,6 @@ void NewDialog::okButtonClicked()
accept();
}
-
void NewDialog::updateOkButton()
{
m_okButton->setEnabled(currentWizard() != 0);
diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h
index 84059b71a1..17275069f8 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.h
+++ b/src/plugins/coreplugin/dialogs/newdialog.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef NEWDIALOG_H
#define NEWDIALOG_H
@@ -79,4 +80,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif //NEWDIALOG_H
+#endif // NEWDIALOG_H
diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
index b388218474..25954c9cec 100644
--- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp
@@ -28,8 +28,9 @@
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt GPL Exception version
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
-**
+**
***************************************************************************/
+
#include "openwithdialog.h"
#include <QtGui/QListWidget>
@@ -39,8 +40,8 @@
using namespace Core;
using namespace Core::Internal;
-OpenWithDialog::OpenWithDialog(const QString &fileName, QWidget *parent) :
- QDialog(parent)
+OpenWithDialog::OpenWithDialog(const QString &fileName, QWidget *parent)
+ : QDialog(parent)
{
setupUi(this);
label->setText(tr("Open file '%1' with:").arg(QFileInfo(fileName).fileName()));
diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.h b/src/plugins/coreplugin/dialogs/openwithdialog.h
index 569f5eac7d..63eb5880e7 100644
--- a/src/plugins/coreplugin/dialogs/openwithdialog.h
+++ b/src/plugins/coreplugin/dialogs/openwithdialog.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef OPENWITHDIALOG_H
#define OPENWITHDIALOG_H
@@ -66,4 +67,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif
+#endif // OPENWITHDIALOG_H
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
index 7c06c786fd..244f178b14 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "saveitemsdialog.h"
#include "mainwindow.h"
#include "vcsmanager.h"
diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.h b/src/plugins/coreplugin/dialogs/saveitemsdialog.h
index 52e43aab0a..3b02160c0a 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.h
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SAVEITEMSDIALOG_H
#define SAVEITEMSDIALOG_H
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index 78d839bf1a..b0bb2da648 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "settingsdialog.h"
#include "coreimpl.h"
@@ -111,7 +112,6 @@ SettingsDialog::SettingsDialog(QWidget *parent, const QString &initialCategory,
SettingsDialog::~SettingsDialog()
{
-
}
void SettingsDialog::pageSelected(QTreeWidgetItem *)
@@ -123,16 +123,14 @@ void SettingsDialog::pageSelected(QTreeWidgetItem *)
void SettingsDialog::accept()
{
- foreach(IOptionsPage *page, m_pages) {
+ foreach(IOptionsPage *page, m_pages)
page->finished(true);
- }
done(QDialog::Accepted);
}
void SettingsDialog::reject()
{
- foreach(IOptionsPage *page, m_pages) {
+ foreach(IOptionsPage *page, m_pages)
page->finished(false);
- }
done(QDialog::Rejected);
}
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.h b/src/plugins/coreplugin/dialogs/settingsdialog.h
index 2d80aa643c..c56093e138 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.h
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SETTINGSDIALOG_H
#define SETTINGSDIALOG_H
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index aeefebdf24..87e504dd02 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "shortcutsettings.h"
#include "ui_shortcutsettings.h"
#include "actionmanager.h"
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h
index 38dfb88894..e6d753664e 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.h
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef SHORTCUTSETTINGS_H
#define SHORTCUTSETTINGS_H
@@ -54,7 +55,8 @@ class ActionManager;
class Command;
class MainWindow;
-struct ShortcutItem {
+struct ShortcutItem
+{
ICommand *m_cmd;
QKeySequence m_key;
QTreeWidgetItem *m_item;
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index 088cd69f37..516f484caf 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -51,7 +51,7 @@
using namespace Core;
using namespace Core::Internal;
-EditMode::EditMode(EditorManager *editorManager):
+EditMode::EditMode(EditorManager *editorManager) :
m_editorManager(editorManager),
m_splitter(new MiniSplitter),
m_rightSplitWidgetLayout(new QVBoxLayout)
diff --git a/src/plugins/coreplugin/editmode.h b/src/plugins/coreplugin/editmode.h
index 234c4aab9e..95275dd9b1 100644
--- a/src/plugins/coreplugin/editmode.h
+++ b/src/plugins/coreplugin/editmode.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef EDITMODE_H
#define EDITMODE_H
diff --git a/src/plugins/coreplugin/editormanager/editorgroup.cpp b/src/plugins/coreplugin/editormanager/editorgroup.cpp
index 53b61c74fd..5a6fe6156b 100644
--- a/src/plugins/coreplugin/editormanager/editorgroup.cpp
+++ b/src/plugins/coreplugin/editormanager/editorgroup.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "editorgroup.h"
#include "editormanager.h"
diff --git a/src/plugins/coreplugin/editormanager/editorgroup.h b/src/plugins/coreplugin/editormanager/editorgroup.h
index eca333c4df..69be7ba6e0 100644
--- a/src/plugins/coreplugin/editormanager/editorgroup.h
+++ b/src/plugins/coreplugin/editormanager/editorgroup.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef EDITORGROUP_H
#define EDITORGROUP_H
@@ -135,19 +136,24 @@ public:
QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const;
void addEditor(IEditor *editor) { insertEditor(rowCount(), editor); }
- void insertEditor(int index, IEditor *editor) {
+
+ void insertEditor(int index, IEditor *editor)
+ {
beginInsertRows(QModelIndex(), index, index);
m_editors.insert(index, editor);
endInsertRows();
}
- void removeEditor(IEditor *editor) {
+
+ void removeEditor(IEditor *editor)
+ {
int index = m_editors.indexOf(editor);
beginRemoveRows(QModelIndex(), index, index);
m_editors.removeAt(index);
endRemoveRows();
}
- void emitDataChanged(IEditor *editor) {
+ void emitDataChanged(IEditor *editor)
+ {
int idx = m_editors.indexOf(editor);
QModelIndex mindex = index(idx, 0);
emit dataChanged(mindex, mindex);
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 7b2e0b2362..3cb8e16cf5 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "editormanager.h"
#include "editorsplitter.h"
#include "openeditorswindow.h"
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 750e35b0cb..8a9e88ac22 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef EDITORMANAGER_H
#define EDITORMANAGER_H
diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.cpp b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
index 82710e7e93..fe86bf2b0b 100644
--- a/src/plugins/coreplugin/editormanager/editorsplitter.cpp
+++ b/src/plugins/coreplugin/editormanager/editorsplitter.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "editorsplitter.h"
#include "editormanager.h"
#include "openeditorswindow.h"
diff --git a/src/plugins/coreplugin/editormanager/editorsplitter.h b/src/plugins/coreplugin/editormanager/editorsplitter.h
index 12faab68da..d3b2696e00 100644
--- a/src/plugins/coreplugin/editormanager/editorsplitter.h
+++ b/src/plugins/coreplugin/editormanager/editorsplitter.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef EDITORSPLITTER_H
#define EDITORSPLITTER_H
diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h
index 66a9fdca14..4c057fd14e 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IEDITOR_H
#define IEDITOR_H
diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.h b/src/plugins/coreplugin/editormanager/ieditorfactory.h
index 2b70ef95b9..60e633db20 100644
--- a/src/plugins/coreplugin/editormanager/ieditorfactory.h
+++ b/src/plugins/coreplugin/editormanager/ieditorfactory.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IEDITORFACTORY_H
#define IEDITORFACTORY_H
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
index b2400853ec..c6a886ed30 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "openeditorsview.h"
#include "editorgroup.h"
#include "editormanager.h"
@@ -301,10 +302,8 @@ QKeySequence OpenEditorsViewFactory::activationSequence()
OpenEditorsViewFactory::OpenEditorsViewFactory()
{
-
}
OpenEditorsViewFactory::~OpenEditorsViewFactory()
{
-
}
diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.h b/src/plugins/coreplugin/editormanager/openeditorsview.h
index d4c20a4a24..e9c8fcd56e 100644
--- a/src/plugins/coreplugin/editormanager/openeditorsview.h
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef OPENEDITORSVIEW_H
#define OPENEDITORSVIEW_H
@@ -88,4 +89,4 @@ public:
} // namespace Internal
} // namespace Core
-#endif
+#endif // OPENEDITORSVIEW_H
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index 2e97d444f7..30d6c6b8d4 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "openeditorswindow.h"
#include "editorgroup.h"
#include "editormanager.h"
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.h b/src/plugins/coreplugin/editormanager/openeditorswindow.h
index fcefe42eff..b9613c85ab 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.h
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef OPENEDITORSWINDOW_H
#define OPENEDITORSWINDOW_H
diff --git a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
index ffb0b14743..e5e4b3e89a 100644
--- a/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
+++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "stackededitorgroup.h"
#include "editormanager.h"
#include "coreimpl.h"
diff --git a/src/plugins/coreplugin/editormanager/stackededitorgroup.h b/src/plugins/coreplugin/editormanager/stackededitorgroup.h
index 5b7cfd5298..56ecbc9a3a 100644
--- a/src/plugins/coreplugin/editormanager/stackededitorgroup.h
+++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef STACKEDEDITORGROUP_H
#define STACKEDEDITORGROUP_H
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index 08ad842eed..8893c37dbc 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "fancyactionbar.h"
#include <QtGui/QHBoxLayout>
diff --git a/src/plugins/coreplugin/fancyactionbar.h b/src/plugins/coreplugin/fancyactionbar.h
index 701e834ad6..ba71cfb428 100644
--- a/src/plugins/coreplugin/fancyactionbar.h
+++ b/src/plugins/coreplugin/fancyactionbar.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FANCYACTIONBAR_H
#define FANCYACTIONBAR_H
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
index ed57c27b92..fb5ab80469 100644
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "fancytabwidget.h"
#include "stylehelper.h"
diff --git a/src/plugins/coreplugin/fancytabwidget.h b/src/plugins/coreplugin/fancytabwidget.h
index 19fd173110..395482cad6 100644
--- a/src/plugins/coreplugin/fancytabwidget.h
+++ b/src/plugins/coreplugin/fancytabwidget.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FANCYTABWIDGET_H
#define FANCYTABWIDGET_H
@@ -115,4 +116,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif
+#endif // FANCYTABWIDGET_H
diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp
index 8e01ecbb8d..022807e443 100644
--- a/src/plugins/coreplugin/fileiconprovider.cpp
+++ b/src/plugins/coreplugin/fileiconprovider.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "fileiconprovider.h"
using namespace Core;
@@ -46,8 +47,8 @@ using namespace Core;
FileIconProvider *FileIconProvider::m_instance = 0;
-FileIconProvider::FileIconProvider():
- m_unknownFileIcon(QLatin1String(":/qworkbench/images/unknownfile.png"))
+FileIconProvider::FileIconProvider()
+ : m_unknownFileIcon(QLatin1String(":/qworkbench/images/unknownfile.png"))
{
}
diff --git a/src/plugins/coreplugin/fileiconprovider.h b/src/plugins/coreplugin/fileiconprovider.h
index 4124eeb43d..6c7deea35a 100644
--- a/src/plugins/coreplugin/fileiconprovider.h
+++ b/src/plugins/coreplugin/fileiconprovider.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FILEICONPROVIDER_H
#define FILEICONPROVIDER_H
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index 299bba4ff9..3f622bf973 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "filemanager.h"
#include "ifile.h"
#include "mainwindow.h"
diff --git a/src/plugins/coreplugin/filemanager.h b/src/plugins/coreplugin/filemanager.h
index c6759d5b45..fbea2af6d1 100644
--- a/src/plugins/coreplugin/filemanager.h
+++ b/src/plugins/coreplugin/filemanager.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FILEMANAGER_H
#define FILEMANAGER_H
@@ -60,7 +61,8 @@ class CORE_EXPORT FileManager : public QObject
{
Q_OBJECT
- struct FileInfo {
+ struct FileInfo
+ {
QString fileName;
QDateTime modified;
QFile::Permissions permissions;
diff --git a/src/plugins/coreplugin/findplaceholder.cpp b/src/plugins/coreplugin/findplaceholder.cpp
index ec80b530b5..72a305e63b 100644
--- a/src/plugins/coreplugin/findplaceholder.cpp
+++ b/src/plugins/coreplugin/findplaceholder.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "findplaceholder.h"
#include "modemanager.h"
@@ -41,7 +42,7 @@ using namespace Core;
FindToolBarPlaceHolder *FindToolBarPlaceHolder::m_current = 0;
FindToolBarPlaceHolder::FindToolBarPlaceHolder(Core::IMode *mode, QWidget *parent)
- :QWidget(parent), m_mode(mode)
+ : QWidget(parent), m_mode(mode)
{
setLayout(new QVBoxLayout);
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
@@ -52,7 +53,6 @@ FindToolBarPlaceHolder::FindToolBarPlaceHolder(Core::IMode *mode, QWidget *paren
FindToolBarPlaceHolder::~FindToolBarPlaceHolder()
{
-
}
void FindToolBarPlaceHolder::currentModeChanged(Core::IMode *mode)
diff --git a/src/plugins/coreplugin/findplaceholder.h b/src/plugins/coreplugin/findplaceholder.h
index 89850d812e..41cfaa6665 100644
--- a/src/plugins/coreplugin/findplaceholder.h
+++ b/src/plugins/coreplugin/findplaceholder.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FINDPLACEHOLDER_H
#define FINDPLACEHOLDER_H
diff --git a/src/plugins/coreplugin/flowlayout.cpp b/src/plugins/coreplugin/flowlayout.cpp
index 1c43dead53..da638ea198 100644
--- a/src/plugins/coreplugin/flowlayout.cpp
+++ b/src/plugins/coreplugin/flowlayout.cpp
@@ -30,27 +30,13 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2004-$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.
-**
-****************************************************************************/
-
-#include <QtGui>
#include "flowlayout.h"
using namespace Core::Internal;
FlowLayout::FlowLayout(QWidget *parent, int margin, int spacing)
- : QLayout(parent)
+ : QLayout(parent)
{
setMargin(margin);
setSpacing(spacing);
@@ -121,11 +107,10 @@ QSize FlowLayout::sizeHint() const
QSize FlowLayout::minimumSize() const
{
QSize size;
- QLayoutItem *item;
- foreach (item, itemList)
+ foreach (QLayoutItem *item, itemList)
size = size.expandedTo(item->minimumSize());
- size += QSize(2*margin(), 2*margin());
+ size += QSize(2 * margin(), 2 * margin());
return size;
}
@@ -135,8 +120,7 @@ int FlowLayout::doLayout(const QRect &rect, bool testOnly) const
int y = rect.y();
int lineHeight = 0;
- QLayoutItem *item;
- foreach (item, itemList) {
+ foreach (QLayoutItem *item, itemList) {
int nextX = x + item->sizeHint().width() + spacing();
if (nextX - spacing() > rect.right() && lineHeight > 0) {
x = rect.x();
diff --git a/src/plugins/coreplugin/flowlayout.h b/src/plugins/coreplugin/flowlayout.h
index f0a7d4235b..b8fae2446b 100644
--- a/src/plugins/coreplugin/flowlayout.h
+++ b/src/plugins/coreplugin/flowlayout.h
@@ -30,18 +30,6 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2004-$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 FLOWLAYOUT_H
#define FLOWLAYOUT_H
@@ -80,4 +68,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif
+#endif // FLOWLAYOUT_H
diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp
index 8595eb03ee..eea09bfaf3 100644
--- a/src/plugins/coreplugin/generalsettings.cpp
+++ b/src/plugins/coreplugin/generalsettings.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "generalsettings.h"
#include "stylehelper.h"
diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h
index 0cffc9caaf..3a0c18fdd0 100644
--- a/src/plugins/coreplugin/generalsettings.h
+++ b/src/plugins/coreplugin/generalsettings.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef GENERALSETTINGS_H
#define GENERALSETTINGS_H
diff --git a/src/plugins/coreplugin/icontext.h b/src/plugins/coreplugin/icontext.h
index a873afb4c5..87cc549440 100644
--- a/src/plugins/coreplugin/icontext.h
+++ b/src/plugins/coreplugin/icontext.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef ICONTEXT_H
#define ICONTEXT_H
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index ad85e4be18..c06c7c6a4d 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -72,7 +72,6 @@ class CORE_EXPORT ICore : public QObject
Q_OBJECT
public:
-
ICore() {}
virtual ~ICore() {}
@@ -131,4 +130,4 @@ signals:
} // namespace Core
-#endif //ICORE_H
+#endif // ICORE_H
diff --git a/src/plugins/coreplugin/icorelistener.h b/src/plugins/coreplugin/icorelistener.h
index 3ff0a859a1..a957a97b00 100644
--- a/src/plugins/coreplugin/icorelistener.h
+++ b/src/plugins/coreplugin/icorelistener.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef ICORELISTENER_H
#define ICORELISTENER_H
diff --git a/src/plugins/coreplugin/ifile.h b/src/plugins/coreplugin/ifile.h
index 40a03b484e..764fe2c68a 100644
--- a/src/plugins/coreplugin/ifile.h
+++ b/src/plugins/coreplugin/ifile.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IFILE_H
#define IFILE_H
@@ -67,6 +68,6 @@ signals:
void changed();
};
-} //namespace
+} // namespace Core
-#endif //IFILE_H
+#endif // IFILE_H
diff --git a/src/plugins/coreplugin/ifilefactory.h b/src/plugins/coreplugin/ifilefactory.h
index e8dcf155e1..af05517afc 100644
--- a/src/plugins/coreplugin/ifilefactory.h
+++ b/src/plugins/coreplugin/ifilefactory.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IFILEFACTORY_H
#define IFILEFACTORY_H
diff --git a/src/plugins/coreplugin/ifilewizardextension.h b/src/plugins/coreplugin/ifilewizardextension.h
index 238d628a78..31aa8714d0 100644
--- a/src/plugins/coreplugin/ifilewizardextension.h
+++ b/src/plugins/coreplugin/ifilewizardextension.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IFILEWIZARDEXTENSION_H
#define IFILEWIZARDEXTENSION_H
diff --git a/src/plugins/coreplugin/imode.h b/src/plugins/coreplugin/imode.h
index 080b5d9be0..fa93092f88 100644
--- a/src/plugins/coreplugin/imode.h
+++ b/src/plugins/coreplugin/imode.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IMODE_H
#define IMODE_H
diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.cpp b/src/plugins/coreplugin/inavigationwidgetfactory.cpp
index 74772c4cc9..0e559c62e3 100644
--- a/src/plugins/coreplugin/inavigationwidgetfactory.cpp
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.cpp
@@ -30,18 +30,17 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "inavigationwidgetfactory.h"
using namespace Core;
INavigationWidgetFactory::INavigationWidgetFactory()
{
-
}
INavigationWidgetFactory::~INavigationWidgetFactory()
{
-
}
QKeySequence INavigationWidgetFactory::activationSequence()
diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h
index f182f3acca..064492532c 100644
--- a/src/plugins/coreplugin/inavigationwidgetfactory.h
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef INAVIGATIONWIDGET_H
#define INAVIGATIONWIDGET_H
@@ -65,6 +66,7 @@ public:
// Similar to how IView
virtual NavigationView createWidget() = 0;
};
-}
+
+} // namespace Core
#endif // INAVIGATIONWIDGET_H
diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h
index 9847c1a1b2..ecb0f39278 100644
--- a/src/plugins/coreplugin/ioutputpane.h
+++ b/src/plugins/coreplugin/ioutputpane.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IOUTPUTPANE_H
#define IOUTPUTPANE_H
diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h
index e2d3de1ec3..45b07faa8e 100644
--- a/src/plugins/coreplugin/iversioncontrol.h
+++ b/src/plugins/coreplugin/iversioncontrol.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IVERSIONCONTROL_H
#define IVERSIONCONTROL_H
diff --git a/src/plugins/coreplugin/iview.h b/src/plugins/coreplugin/iview.h
index dd0a222b59..cd242ee8f6 100644
--- a/src/plugins/coreplugin/iview.h
+++ b/src/plugins/coreplugin/iview.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef IVIEW_H
#define IVIEW_H
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index a90f1ff14e..6e11f42abe 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -53,6 +53,7 @@
#include "progressview.h"
#include "shortcutsettings.h"
#include "vcsmanager.h"
+
#include "scriptmanager.h"
#include "settingsdialog.h"
#include "stylehelper.h"
diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h
index 00721a1662..e465cc27fb 100644
--- a/src/plugins/coreplugin/mainwindow.h
+++ b/src/plugins/coreplugin/mainwindow.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
@@ -56,34 +57,34 @@ namespace Core {
class ActionManagerInterface;
class BaseMode;
+class BaseView;
class EditorManager;
class FileManager;
class IContext;
class MessageManager;
-class ModeManager;
class MimeDatabase;
+class ModeManager;
class ProgressManagerInterface;
-class VCSManager;
+class RightPaneWidget;
class ScriptManagerInterface;
class UniqueIDManager;
class VariableManager;
+class VCSManager;
class ViewManagerInterface;
-class BaseView;
-class RightPaneWidget;
namespace Internal {
-class CoreImpl;
class ActionManager;
-class ProgressManager;
-class OutputPane;
-class ViewManager;
-class GeneralSettings;
-class ShortcutSettings;
+class CoreImpl;
class FancyTabWidget;
+class GeneralSettings;
class NavigationWidget;
+class OutputPane;
+class ProgressManager;
+class ShortcutSettings;
+class ViewManager;
-class CORE_EXPORT MainWindow : public QMainWindow
+class CORE_EXPORT MainWindow : public QMainWindow
{
Q_OBJECT
@@ -129,7 +130,6 @@ public:
QMenu *createPopupMenu();
-
void setSuppressNavigationWidget(bool suppress);
signals:
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index d82059f00d..1fe95c8f42 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -30,20 +30,9 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2007-$THISYEAR$ $TROLLTECH$. All rights reserved.
-**
-** This file is part of the Manhattan Style project
-**
-** $TROLLTECH_GPL_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.
-**
-****************************************************************************/
#include "manhattanstyle.h"
+
#include <QStyleOption>
#include <QPainter>
#include <QScrollArea>
diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h
index 685a35da66..6210df6bf8 100644
--- a/src/plugins/coreplugin/manhattanstyle.h
+++ b/src/plugins/coreplugin/manhattanstyle.h
@@ -30,18 +30,6 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
-/****************************************************************************
-**
-** Copyright (C) 2007-$THISYEAR$ $TROLLTECH$. All rights reserved.
-**
-** This file is part of the ManhattanStyle project on Trolltech Labs.
-**
-** $TROLLTECH_GPL_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 MANHATTANSTYLE_H
#define MANHATTANSTYLE_H
diff --git a/src/plugins/coreplugin/messagemanager.cpp b/src/plugins/coreplugin/messagemanager.cpp
index a6268fbd25..4b72673bce 100644
--- a/src/plugins/coreplugin/messagemanager.cpp
+++ b/src/plugins/coreplugin/messagemanager.cpp
@@ -30,21 +30,21 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "messagemanager.h"
#include "messageoutputwindow.h"
+#include <extensionsystem/pluginmanager.h>
+
#include <QtGui/QStatusBar>
#include <QtGui/QApplication>
-#include <extensionsystem/pluginmanager.h>
-
using namespace Core;
MessageManager *MessageManager::m_instance = 0;
-MessageManager::MessageManager():
- m_pm(0),
- m_messageOutputWindow(0)
+MessageManager::MessageManager()
+ : m_pm(0), m_messageOutputWindow(0)
{
m_instance = this;
}
diff --git a/src/plugins/coreplugin/messagemanager.h b/src/plugins/coreplugin/messagemanager.h
index f2854108d6..a92263a056 100644
--- a/src/plugins/coreplugin/messagemanager.h
+++ b/src/plugins/coreplugin/messagemanager.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef MESSAGEMANAGER_H
#define MESSAGEMANAGER_H
diff --git a/src/plugins/coreplugin/messageoutputwindow.cpp b/src/plugins/coreplugin/messageoutputwindow.cpp
index 2ffe82e9df..b7afcca988 100644
--- a/src/plugins/coreplugin/messageoutputwindow.cpp
+++ b/src/plugins/coreplugin/messageoutputwindow.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "messageoutputwindow.h"
#include <QtGui/QTextEdit>
diff --git a/src/plugins/coreplugin/messageoutputwindow.h b/src/plugins/coreplugin/messageoutputwindow.h
index 1373ea363d..06d9d892cf 100644
--- a/src/plugins/coreplugin/messageoutputwindow.h
+++ b/src/plugins/coreplugin/messageoutputwindow.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef MESSAGEOUTPUTWINDOW_H
#define MESSAGEOUTPUTWINDOW_H
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index d49d4728e6..7ee16e0776 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "mimedatabase.h"
#include <QtCore/QStringList>
@@ -93,7 +94,6 @@ enum { BinaryMatchPriority = 1, TextMatchPriority = 2};
*/
namespace Core {
-
namespace Internal {
// FileMatchContext: Passed on to the mimetypes from the database
@@ -786,7 +786,8 @@ bool BaseMimeTypeParser::parse(QIODevice *dev, const QString &fileName, QString
enum { Dangling = 32767 };
-struct MimeMapEntry {
+struct MimeMapEntry
+{
explicit MimeMapEntry(const MimeType &t = MimeType(), int aLevel = Dangling);
MimeType type;
int level; // hierachy level
@@ -821,7 +822,8 @@ MimeMapEntry::MimeMapEntry(const MimeType &t, int aLevel) :
* to check the most specific types first). Starting a recursion from the
* leaves is not suitable since it will hit parent nodes several times. */
-class MimeDatabasePrivate {
+class MimeDatabasePrivate
+{
Q_DISABLE_COPY(MimeDatabasePrivate)
public:
MimeDatabasePrivate();
diff --git a/src/plugins/coreplugin/mimedatabase.h b/src/plugins/coreplugin/mimedatabase.h
index d4f96cf8d9..3a58bff0cb 100644
--- a/src/plugins/coreplugin/mimedatabase.h
+++ b/src/plugins/coreplugin/mimedatabase.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef MIMEDATABASE_H
#define MIMEDATABASE_H
@@ -57,7 +58,8 @@ namespace Internal {
}
/* Magic (file contents) matcher interface. */
-class CORE_EXPORT IMagicMatcher {
+class CORE_EXPORT IMagicMatcher
+{
Q_DISABLE_COPY(IMagicMatcher)
protected:
IMagicMatcher() {}
@@ -72,7 +74,8 @@ public:
/* Utility class: A standard Magic match rule based on contents. Provides
* static factory methods for creation (currently only for "string". This can
* be extended to handle "little16"/"big16", etc.). */
-class CORE_EXPORT MagicRule {
+class CORE_EXPORT MagicRule
+{
Q_DISABLE_COPY(MagicRule)
public:
explicit MagicRule(const QByteArray &pattern, int startPos, int endPos);
@@ -89,7 +92,8 @@ private:
/* Utility class: A Magic matcher that checks a number of rules based on
* operator "or". It is used for rules parsed from XML files. */
-class CORE_EXPORT MagicRuleMatcher : public IMagicMatcher {
+class CORE_EXPORT MagicRuleMatcher : public IMagicMatcher
+{
Q_DISABLE_COPY(MagicRuleMatcher)
public:
typedef QSharedPointer<MagicRule> MagicRuleSharedPointer;
diff --git a/src/plugins/coreplugin/minisplitter.cpp b/src/plugins/coreplugin/minisplitter.cpp
index dfdad9fb53..7d0e6edff6 100644
--- a/src/plugins/coreplugin/minisplitter.cpp
+++ b/src/plugins/coreplugin/minisplitter.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "minisplitter.h"
#include "stylehelper.h"
diff --git a/src/plugins/coreplugin/minisplitter.h b/src/plugins/coreplugin/minisplitter.h
index aedb2b757c..d5ca2e7196 100644
--- a/src/plugins/coreplugin/minisplitter.h
+++ b/src/plugins/coreplugin/minisplitter.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef MINISPLITTER_H
#define MINISPLITTER_H
diff --git a/src/plugins/coreplugin/modemanager.cpp b/src/plugins/coreplugin/modemanager.cpp
index 74027ab391..58a02bd4c2 100644
--- a/src/plugins/coreplugin/modemanager.cpp
+++ b/src/plugins/coreplugin/modemanager.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "modemanager.h"
#include "fancytabwidget.h"
#include "fancyactionbar.h"
@@ -55,7 +56,7 @@ using namespace Core::Internal;
ModeManager *ModeManager::m_instance = 0;
-ModeManager::ModeManager(Internal::MainWindow *mainWindow, FancyTabWidget *modeStack):
+ModeManager::ModeManager(Internal::MainWindow *mainWindow, FancyTabWidget *modeStack) :
m_mainWindow(mainWindow),
m_modeStack(modeStack),
m_signalMapper(new QSignalMapper(this))
diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h
index 775c8d4a61..96e873f46c 100644
--- a/src/plugins/coreplugin/modemanager.h
+++ b/src/plugins/coreplugin/modemanager.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef MODEMANAGER_H
#define MODEMANAGER_H
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 0a29c24d7c..eda1123c02 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "navigationwidget.h"
#include <coreplugin/icore.h>
@@ -134,10 +135,10 @@ void NavigationWidgetPlaceHolder::currentModeAboutToChange(Core::IMode *mode)
NavigationWidget *NavigationWidget::m_instance = 0;
NavigationWidget::NavigationWidget(QAction *toggleSideBarAction)
- : m_shown(true)
- , m_suppressed(false)
- , m_width(0)
- , m_toggleSideBarAction(toggleSideBarAction)
+ : m_shown(true),
+ m_suppressed(false),
+ m_width(0),
+ m_toggleSideBarAction(toggleSideBarAction)
{
connect(ExtensionSystem::PluginManager::instance(), SIGNAL(objectAdded(QObject*)),
this, SLOT(objectAdded(QObject*)));
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index d8244f8868..01d9f2893e 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef NAVIGATIONWIDGET_H
#define NAVIGATIONWIDGET_H
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 92378d72e9..b92d927022 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "outputpane.h"
#include "coreconstants.h"
#include "ioutputpane.h"
diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h
index fcc54745b0..489ff87bac 100644
--- a/src/plugins/coreplugin/outputpane.h
+++ b/src/plugins/coreplugin/outputpane.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef OUTPUTPANE_H
#define OUTPUTPANE_H
diff --git a/src/plugins/coreplugin/plugindialog.cpp b/src/plugins/coreplugin/plugindialog.cpp
index dcf8c9b826..a22df97f5f 100644
--- a/src/plugins/coreplugin/plugindialog.cpp
+++ b/src/plugins/coreplugin/plugindialog.cpp
@@ -30,7 +30,9 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "plugindialog.h"
+
#include <extensionsystem/pluginmanager.h>
#include <extensionsystem/pluginview.h>
#include <extensionsystem/plugindetailsview.h>
@@ -47,8 +49,8 @@
using namespace Core::Internal;
PluginDialog::PluginDialog(ExtensionSystem::PluginManager *manager, QWidget *parent)
- : QDialog(parent)
- , m_view(new ExtensionSystem::PluginView(manager, this))
+ : QDialog(parent),
+ m_view(new ExtensionSystem::PluginView(manager, this))
{
QVBoxLayout *vl = new QVBoxLayout(this);
vl->addWidget(m_view);
diff --git a/src/plugins/coreplugin/plugindialog.h b/src/plugins/coreplugin/plugindialog.h
index d3c0d312a6..08cfee7ae7 100644
--- a/src/plugins/coreplugin/plugindialog.h
+++ b/src/plugins/coreplugin/plugindialog.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef PLUGINDIALOG_H
#define PLUGINDIALOG_H
@@ -72,4 +73,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif
+#endif // PLUGINDIALOG_H
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
index 2aeb817bc2..9e662585d2 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "futureprogress.h"
#include "progresspie.h"
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h
index 4f46a4a1fb..bd1d7e7bdd 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.h
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef FUTUREPROGRESS_H
#define FUTUREPROGRESS_H
@@ -91,4 +92,5 @@ private:
};
} // namespace Core
+
#endif // FUTUREPROGRESS_H
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.cpp b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
index 6e4e15644e..ce84743460 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "progressmanager.h"
#include "progressview.h"
#include "coreimpl.h"
@@ -56,7 +57,6 @@ ProgressManager::~ProgressManager()
void ProgressManager::init()
{
-
}
void ProgressManager::cancelTasks(const QString &type)
diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h
index 0c40dcc0fa..8413a252eb 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanager.h
+++ b/src/plugins/coreplugin/progressmanager/progressmanager.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef PROGRESSMANAGER_H
#define PROGRESSMANAGER_H
@@ -40,7 +41,6 @@
#include <QtCore/QFutureWatcher>
namespace Core {
-
namespace Internal {
class ProgressView;
@@ -71,4 +71,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif //PROGRESSMANAGER_H
+#endif // PROGRESSMANAGER_H
diff --git a/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h b/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h
index 6a89293467..e491eaaa29 100644
--- a/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h
+++ b/src/plugins/coreplugin/progressmanager/progressmanagerinterface.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef PROGRESSMANAGERINTERFACE_H
#define PROGRESSMANAGERINTERFACE_H
@@ -57,6 +58,6 @@ public slots:
virtual void cancelTasks(const QString &type) = 0;
};
-} //namespace
+} // namespace Core
#endif //PROGRESSMANAGERINTERFACE_H
diff --git a/src/plugins/coreplugin/progressmanager/progresspie.cpp b/src/plugins/coreplugin/progressmanager/progresspie.cpp
index 7a237fe5d9..aaf090a0fd 100644
--- a/src/plugins/coreplugin/progressmanager/progresspie.cpp
+++ b/src/plugins/coreplugin/progressmanager/progresspie.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "progresspie.h"
#include "stylehelper.h"
@@ -47,7 +48,6 @@ ProgressBar::ProgressBar(QWidget *parent)
ProgressBar::~ProgressBar()
{
-
}
QString ProgressBar::title() const
@@ -60,7 +60,6 @@ bool ProgressBar::hasError() const
return m_error;
}
-
void ProgressBar::setTitle(const QString &title)
{
m_title = title;
diff --git a/src/plugins/coreplugin/progressmanager/progresspie.h b/src/plugins/coreplugin/progressmanager/progresspie.h
index dfeb33e558..23992025ed 100644
--- a/src/plugins/coreplugin/progressmanager/progresspie.h
+++ b/src/plugins/coreplugin/progressmanager/progresspie.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef PROGRESSPIE_H
#define PROGRESSPIE_H
diff --git a/src/plugins/coreplugin/progressmanager/progressview.cpp b/src/plugins/coreplugin/progressmanager/progressview.cpp
index bb0008056b..96b3158266 100644
--- a/src/plugins/coreplugin/progressmanager/progressview.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressview.cpp
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#include "progressview.h"
#include "futureprogress.h"
@@ -39,7 +40,7 @@ using namespace Core;
using namespace Core::Internal;
ProgressView::ProgressView(QWidget *parent)
-: QWidget(parent)
+ : QWidget(parent)
{
m_layout = new QVBoxLayout;
setLayout(m_layout);
diff --git a/src/plugins/coreplugin/progressmanager/progressview.h b/src/plugins/coreplugin/progressmanager/progressview.h
index 7e832f92f2..3d164a7ccb 100644
--- a/src/plugins/coreplugin/progressmanager/progressview.h
+++ b/src/plugins/coreplugin/progressmanager/progressview.h
@@ -30,6 +30,7 @@
** 1.2, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
+
#ifndef PROGRESSVIEW_H
#define PROGRESSVIEW_H
@@ -78,4 +79,4 @@ private:
} // namespace Internal
} // namespace Core
-#endif //PROGRESSVIEW_H
+#endif // PROGRESSVIEW_H