Remove unneeded defines.

Mostly Q_DISABLE_COPY that were covered by the un-copy-ability of the
respective base classes. Includes a few "stylistic" whitespace changes.

Change-Id: I31ca0e7bada5ed0f34776976efe22ddc444a5bf2
Reviewed-on: http://codereview.qt.nokia.com/1609
Reviewed-by: hjk <qthjk@ovi.com>

src/plugins/coreplugin/basefilewizard.cpp

@@ -379,7 +379,6 @@ void BaseFileWizardParameters::setDisplayCategory(const QString &v)
 class WizardEventLoop : public QEventLoop
 {
     Q_OBJECT
-    Q_DISABLE_COPY(WizardEventLoop)
     WizardEventLoop(QObject *parent);
 
 public:

src/plugins/coreplugin/basefilewizard.h

@@ -150,7 +150,6 @@ CORE_EXPORT QDebug operator<<(QDebug d, const BaseFileWizardParameters &);
 
 class CORE_EXPORT BaseFileWizard : public IWizard
 {
-    Q_DISABLE_COPY(BaseFileWizard)
     Q_OBJECT
 
 public:
@@ -200,7 +199,6 @@ private:
 
 class CORE_EXPORT StandardFileWizard : public BaseFileWizard
 {
-    Q_DISABLE_COPY(StandardFileWizard)
     Q_OBJECT
 
 protected:

src/plugins/coreplugin/dialogs/ioptionspage.h

@@ -47,6 +47,7 @@ namespace Core {
 class CORE_EXPORT IOptionsPage : public QObject
 {
     Q_OBJECT
+
 public:
     IOptionsPage(QObject *parent = 0) : QObject(parent) {}
     virtual ~IOptionsPage() {}

src/plugins/coreplugin/editortoolbar.h

@@ -51,7 +51,7 @@ struct EditorToolBarPrivate;
 class CORE_EXPORT EditorToolBar : public Utils::StyledBar
 {
     Q_OBJECT
-    Q_DISABLE_COPY(EditorToolBar)
+
 public:
     explicit EditorToolBar(QWidget *parent = 0);
     virtual ~EditorToolBar();

src/plugins/coreplugin/fileiconprovider.h

@@ -52,7 +52,6 @@ struct FileIconProviderPrivate;
 
 class CORE_EXPORT FileIconProvider : public QFileIconProvider
 {
-    Q_DISABLE_COPY(FileIconProvider)
     FileIconProvider();
 
 public:

src/plugins/coreplugin/helpmanager.h

@@ -51,7 +51,6 @@ struct HelpManagerPrivate;
 class CORE_EXPORT HelpManager : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(HelpManager)
 
 public:
     typedef QHash<QString, QStringList> Filters;

src/plugins/coreplugin/manhattanstyle.h

@@ -37,11 +37,6 @@
 
 #include <QtGui/QProxyStyle>
 
-QT_BEGIN_NAMESPACE
-class QLinearGradient;
-class QBrush;
-QT_END_NAMESPACE
-
 class ManhattanStylePrivate;
 
 class CORE_EXPORT ManhattanStyle : public QProxyStyle
@@ -49,7 +44,7 @@ class CORE_EXPORT ManhattanStyle : public QProxyStyle
     Q_OBJECT
 
 public:
-    ManhattanStyle(const QString &);
+    explicit ManhattanStyle(const QString &baseStyleName);
 
     ~ManhattanStyle();
 
@@ -77,12 +72,12 @@ public:
 
     void unpolish(QWidget *widget);
     void unpolish(QApplication *app);
-protected Q_SLOTS:
+
+protected slots:
     QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const;
 
 private:
     ManhattanStylePrivate *d;
-    Q_DISABLE_COPY(ManhattanStyle)
 };
 
 #endif // MANHATTANSTYLE_H

src/plugins/coreplugin/mimedatabase.cpp

@@ -124,8 +124,10 @@ namespace Internal {
     \sa Core::Internal::BaseMimeTypeParser, Core::Internal::MimeTypeParser
 */
 
-class FileMatchContext {
+class FileMatchContext
+{
     Q_DISABLE_COPY(FileMatchContext)
+
 public:
     // Max data to be read from a file
     enum { MaxData = 2048 };
@@ -183,8 +185,8 @@ QByteArray FileMatchContext::data()
     \sa Core::Internal::BaseMimeTypeParser, Core::Internal::MimeTypeParser
 */
 
-class BinaryMatcher : public IMagicMatcher {
-    Q_DISABLE_COPY(BinaryMatcher)
+class BinaryMatcher : public IMagicMatcher
+{
 public:
     BinaryMatcher() {}
     virtual bool matches(const QByteArray & /*data*/) const { return true; }
@@ -203,8 +205,8 @@ public:
     \sa Core::Internal::BaseMimeTypeParser, Core::Internal::MimeTypeParser
 */
 
-class HeuristicTextMagicMatcher : public IMagicMatcher {
-    Q_DISABLE_COPY(HeuristicTextMagicMatcher)
+class HeuristicTextMagicMatcher : public IMagicMatcher
+{
 public:
     HeuristicTextMagicMatcher() {}
     virtual bool matches(const QByteArray &data) const;
@@ -915,8 +917,10 @@ namespace Internal {
     \sa Core::Internal::MimeTypeParser
 */
 
-class BaseMimeTypeParser {
+class BaseMimeTypeParser
+{
     Q_DISABLE_COPY(BaseMimeTypeParser)
+
 public:
     BaseMimeTypeParser() {}
     virtual ~BaseMimeTypeParser() {}
@@ -1224,6 +1228,7 @@ MimeMapEntry::MimeMapEntry(const MimeType &t, int aLevel) :
 class MimeDatabasePrivate
 {
     Q_DISABLE_COPY(MimeDatabasePrivate)
+
 public:
     MimeDatabasePrivate();
 

src/plugins/coreplugin/mimedatabase.h

@@ -60,8 +60,10 @@ namespace Internal {
 class CORE_EXPORT IMagicMatcher
 {
     Q_DISABLE_COPY(IMagicMatcher)
+
 protected:
     IMagicMatcher() {}
+
 public:
     typedef QSharedPointer<IMagicMatcher> IMagicMatcherSharedPointer;
     typedef QList<IMagicMatcherSharedPointer> IMagicMatcherList;

src/plugins/coreplugin/variablemanager.h

@@ -39,10 +39,6 @@
 #include <QtCore/QScopedPointer>
 #include <QtCore/QString>
 
-QT_BEGIN_NAMESPACE
-class QFileInfo;
-QT_END_NAMESPACE
-
 namespace Utils {
 class AbstractMacroExpander;
 }
@@ -53,7 +49,7 @@ class VariableManagerPrivate;
 class CORE_EXPORT VariableManager : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(VariableManager)
+
 public:
     VariableManager();
     ~VariableManager();