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>

4 files changed, 6 insertions, 7 deletions

diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h
index ec33046748..7c612f6401 100644
--- a/src/plugins/projectexplorer/projectconfiguration.h
+++ b/src/plugins/projectexplorer/projectconfiguration.h
@@ -72,8 +72,6 @@ protected:
     ProjectConfiguration(QObject *parent, const ProjectConfiguration *source);
 
 private:
-    Q_DISABLE_COPY(ProjectConfiguration)
-
     QString m_id;
     QString m_displayName;
     QString m_defaultDisplayName;
diff --git a/src/plugins/projectexplorer/projectwizardpage.h b/src/plugins/projectexplorer/projectwizardpage.h
index 829d266048..f1f127aade 100644
--- a/src/plugins/projectexplorer/projectwizardpage.h
+++ b/src/plugins/projectexplorer/projectwizardpage.h
@@ -43,9 +43,10 @@ class WizardPage;
 }
 
 // Documentation inside.
-class ProjectWizardPage : public QWizardPage {
+class ProjectWizardPage : public QWizardPage
+{
     Q_OBJECT
-    Q_DISABLE_COPY(ProjectWizardPage)
+
 public:
     explicit ProjectWizardPage(QWidget *parent = 0);
     virtual ~ProjectWizardPage();
diff --git a/src/plugins/projectexplorer/publishing/ipublishingwizardfactory.h b/src/plugins/projectexplorer/publishing/ipublishingwizardfactory.h
index 308882f1de..b2f3a36e81 100644
--- a/src/plugins/projectexplorer/publishing/ipublishingwizardfactory.h
+++ b/src/plugins/projectexplorer/publishing/ipublishingwizardfactory.h
@@ -61,7 +61,7 @@ class Project;
 class PROJECTEXPLORER_EXPORT IPublishingWizardFactory : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(IPublishingWizardFactory)
+
 public:
     /*!
       A short, one-line description of the type of wizard that this
diff --git a/src/plugins/projectexplorer/removefiledialog.h b/src/plugins/projectexplorer/removefiledialog.h
index b3f862831f..01197a52ff 100644
--- a/src/plugins/projectexplorer/removefiledialog.h
+++ b/src/plugins/projectexplorer/removefiledialog.h
@@ -39,13 +39,13 @@ namespace ProjectExplorer {
 namespace Internal {
 
 namespace Ui {
-    class RemoveFileDialog;
+class RemoveFileDialog;
 }
 
 class RemoveFileDialog : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(RemoveFileDialog)
+
 public:
     explicit RemoveFileDialog(const QString &filePath, QWidget *parent = 0);
     virtual ~RemoveFileDialog();