From 82bbac7f906948278b666a78a402099d65bfd1dd Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 13 Jul 2011 18:02:35 +0200
Subject: [PATCH] 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>
---
.../qmlpuppet/instances/dummycontextobject.h | 2 --
src/libs/extensionsystem/pluginmanager.h | 4 ++--
.../qmleditorwidgets/easingpane/easinggraph.h | 2 --
.../qdeclarativedebugclient_p.h | 3 +--
src/libs/utils/basevalidatinglineedit.h | 1 -
src/libs/utils/classnamevalidatinglineedit.h | 3 +--
src/libs/utils/fancylineedit.h | 1 -
src/libs/utils/filenamevalidatinglineedit.h | 2 +-
src/libs/utils/filesystemwatcher.h | 2 +-
src/libs/utils/fileutils.h | 4 +---
src/libs/utils/filewizarddialog.h | 4 ++--
src/libs/utils/filewizardpage.h | 2 +-
src/libs/utils/ipaddresslineedit.h | 1 -
src/libs/utils/linecolumnlabel.cpp | 4 ----
src/libs/utils/linecolumnlabel.h | 2 --
src/libs/utils/newclasswidget.h | 2 +-
src/libs/utils/pathchooser.h | 1 -
src/libs/utils/pathlisteditor.h | 1 -
src/libs/utils/projectintropage.h | 1 -
src/libs/utils/projectnamevalidatinglineedit.h | 1 -
src/libs/utils/qtcolorbutton.h | 1 -
src/libs/utils/savefile.h | 4 +---
src/libs/utils/ssh/sshconnection.h | 2 +-
src/libs/utils/ssh/sshremoteprocess.h | 1 -
src/libs/utils/ssh/sshremoteprocessrunner.h | 2 +-
src/libs/utils/submiteditorwidget.h | 1 -
src/libs/utils/wizard.h | 6 ------
src/plugins/classview/classviewmanager.h | 1 -
.../classview/classviewnavigationwidget.h | 1 -
.../classviewnavigationwidgetfactory.h | 1 -
src/plugins/classview/classviewplugin.h | 1 -
src/plugins/coreplugin/basefilewizard.cpp | 1 -
src/plugins/coreplugin/basefilewizard.h | 2 --
src/plugins/coreplugin/dialogs/ioptionspage.h | 1 +
src/plugins/coreplugin/editortoolbar.h | 2 +-
src/plugins/coreplugin/fileiconprovider.h | 1 -
src/plugins/coreplugin/helpmanager.h | 1 -
src/plugins/coreplugin/manhattanstyle.h | 11 +++--------
src/plugins/coreplugin/mimedatabase.cpp | 17 +++++++++++------
src/plugins/coreplugin/mimedatabase.h | 2 ++
src/plugins/coreplugin/variablemanager.h | 6 +-----
src/plugins/cpaster/fileshareprotocol.h | 4 +++-
src/plugins/cpaster/protocol.h | 14 ++++++++++----
src/plugins/cpaster/settingspage.h | 6 ++++--
src/plugins/cppeditor/cppclasswizard.h | 3 ++-
src/plugins/cppeditor/cpplocalsymbols.h | 5 ++---
src/plugins/cppeditor/cppquickfix.h | 2 --
src/plugins/cpptools/cppfilesettingspage.h | 2 --
src/plugins/cpptools/cpptoolsplugin.h | 2 +-
src/plugins/debugger/cdb/bytearrayinputstream.h | 1 +
src/plugins/debugger/cdb/cdboptionspage.h | 4 +++-
src/plugins/debugger/gdb/abstractgdbprocess.h | 9 ++++-----
src/plugins/debugger/lldb/lldboptionspage.h | 3 ++-
src/plugins/designer/cpp/formclasswizard.h | 3 ---
.../designer/cpp/formclasswizarddialog.h | 2 --
src/plugins/designer/cpp/formclasswizardpage.h | 4 ++--
src/plugins/designer/designercontext.h | 5 -----
src/plugins/designer/editorwidget.h | 2 +-
src/plugins/designer/formeditorstack.h | 2 +-
src/plugins/designer/formtemplatewizardpage.h | 2 +-
src/plugins/designer/formwizard.h | 1 -
src/plugins/designer/formwizarddialog.h | 2 --
src/plugins/git/gitcommand.h | 12 ++++--------
src/plugins/git/gitorious/gitorious.h | 1 -
src/plugins/help/helpviewer.h | 5 ++---
src/plugins/imageviewer/imageviewer.h | 2 +-
src/plugins/locator/commandlocator.h | 2 +-
src/plugins/perforce/perforcesettings.h | 4 +++-
.../projectexplorer/projectconfiguration.h | 2 --
src/plugins/projectexplorer/projectwizardpage.h | 5 +++--
.../publishing/ipublishingwizardfactory.h | 2 +-
src/plugins/projectexplorer/removefiledialog.h | 4 ++--
.../components/integration/integrationcore.h | 3 ++-
.../components/itemlibrary/itemlibrarywidget.h | 1 -
.../customstyleplugin/customstyleplugin.h | 6 +-----
.../designercore/include/itemlibraryinfo.h | 2 +-
.../qmldesigner/designercore/include/model.h | 2 +-
src/plugins/qmldesigner/designmodewidget.h | 6 +++---
.../qmldesigner/desktopplugin/desktopplugin.h | 4 +---
.../qmldesigner/extrasplugin/extrasplugin.h | 8 +-------
.../qmldesigner/meegoplugin/meegoplugin.h | 8 +-------
.../qmldesigner/symbianplugin/symbianplugin.h | 8 +-------
src/plugins/qmljseditor/qmljsquickfix.h | 2 --
src/plugins/qmljsinspector/qmljsclientproxy.h | 1 -
src/plugins/qmljstools/qmljstoolsplugin.h | 2 +-
src/plugins/qmlprofiler/codaqmlprofilerrunner.h | 1 -
.../qmlprofiler/localqmlprofilerrunner.h | 1 -
.../qmlprofiler/remotelinuxqmlprofilerrunner.h | 1 -
.../fileformat/qmlprojectitem.h | 4 ++--
.../customwidgetwizard/customwidgetwizard.h | 2 +-
.../qt-s60/certificatepathchooser.h | 2 +-
.../qt-s60/s60devicedebugruncontrol.h | 2 +-
src/plugins/qt4projectmanager/qt4nodes.h | 6 +++---
src/plugins/qt4projectmanager/qt4project.cpp | 2 +-
.../qt4projectmanager/wizards/guiappwizard.h | 1 -
.../wizards/html5appwizardpages.h | 1 -
.../wizards/librarywizarddialog.cpp | 1 -
.../wizards/mobileappwizardpages.h | 3 ---
.../wizards/mobilelibrarywizardoptionpage.h | 1 -
.../wizards/qtquickappwizardpages.h | 1 -
.../qt4projectmanager/wizards/qtwizard.h | 1 -
.../qt4projectmanager/wizards/testwizard.h | 6 +-----
.../qtsupport/debugginghelperbuildtask.h | 7 ++++---
src/plugins/qtsupport/qmldumptool.cpp | 5 +++--
src/plugins/qtsupport/qtoptionspage.h | 2 +-
.../remotelinux/abstractremotelinuxdeploystep.h | 2 +-
.../remotelinux/genericdirectuploadstep.h | 2 +-
.../genericlinuxdeviceconfigurationfactory.h | 2 +-
.../genericlinuxdeviceconfigurationwizard.h | 2 +-
...genericlinuxdeviceconfigurationwizardpages.h | 1 -
.../remotelinux/linuxdeviceconfiguration.h | 4 ++--
.../remotelinux/linuxdeviceconfigurations.h | 1 -
.../maddeuploadandinstallpackagesteps.cpp | 6 +++---
.../remotelinux/maemodeploybymountsteps.cpp | 4 ++--
.../remotelinux/maemodeploybymountsteps.h | 4 ++--
src/plugins/remotelinux/maemorunconfiguration.h | 2 +-
.../uploadandinstalltarpackagestep.h | 4 ++--
.../texteditor/generichighlighter/manager.h | 1 -
.../texteditor/snippets/snippetscollection.h | 1 -
src/plugins/texteditor/syntaxhighlighter.h | 1 -
.../valgrind/callgrind/callgrindparser.h | 2 --
.../vcsbase/checkoutprogresswizardpage.h | 4 ++--
src/shared/symbianutils/codamessage.h | 4 +++-
src/shared/symbianutils/symbiandevicemanager.h | 1 -
src/shared/symbianutils/virtualserialdevice.h | 1 -
125 files changed, 139 insertions(+), 238 deletions(-)
diff --git a/share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.h b/share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.h
index 63843fd1abd..902748107ba 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/dummycontextobject.h
@@ -54,9 +54,7 @@ signals:
void parentDummyChanged();
private:
- Q_DISABLE_COPY(DummyContextObject)
QWeakPointer<QObject> m_dummyParent;
-
};
} // namespace QmlDesigner
diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h
index bc1c9d919ed..883c2a14cc1 100644
--- a/src/libs/extensionsystem/pluginmanager.h
+++ b/src/libs/extensionsystem/pluginmanager.h
@@ -47,8 +47,9 @@ QT_END_NAMESPACE
namespace ExtensionSystem {
class PluginCollection;
+
namespace Internal {
- class PluginManagerPrivate;
+class PluginManagerPrivate;
}
class IPlugin;
@@ -56,7 +57,6 @@ class PluginSpec;
class EXTENSIONSYSTEM_EXPORT PluginManager : public QObject
{
- Q_DISABLE_COPY(PluginManager)
Q_OBJECT
public:
diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.h b/src/libs/qmleditorwidgets/easingpane/easinggraph.h
index 815f8b5bb17..afc5e5cdb95 100644
--- a/src/libs/qmleditorwidgets/easingpane/easinggraph.h
+++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.h
@@ -101,8 +101,6 @@ signals:
void zeroColorChanged();
private:
- Q_DISABLE_COPY(EasingGraph)
-
QColor m_color;
QColor m_zeroColor; // the color for the "zero" and "one" lines
qreal m_duration;
diff --git a/src/libs/qmljsdebugclient/qdeclarativedebugclient_p.h b/src/libs/qmljsdebugclient/qdeclarativedebugclient_p.h
index 6994923f1ed..bbbe19b2a54 100644
--- a/src/libs/qmljsdebugclient/qdeclarativedebugclient_p.h
+++ b/src/libs/qmljsdebugclient/qdeclarativedebugclient_p.h
@@ -42,7 +42,7 @@ class QDeclarativeDebugConnectionPrivate;
class QDeclarativeDebugConnection : public QIODevice
{
Q_OBJECT
- Q_DISABLE_COPY(QDeclarativeDebugConnection)
+
public:
QDeclarativeDebugConnection(QObject * = 0);
~QDeclarativeDebugConnection();
@@ -77,7 +77,6 @@ class QDeclarativeDebugClient : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QDeclarativeDebugClient)
- Q_DISABLE_COPY(QDeclarativeDebugClient)
public:
enum Status { NotConnected, Unavailable, Enabled };
diff --git a/src/libs/utils/basevalidatinglineedit.h b/src/libs/utils/basevalidatinglineedit.h
index 9d2d3ffe002..2656d717213 100644
--- a/src/libs/utils/basevalidatinglineedit.h
+++ b/src/libs/utils/basevalidatinglineedit.h
@@ -44,7 +44,6 @@ struct BaseValidatingLineEditPrivate;
class QTCREATOR_UTILS_EXPORT BaseValidatingLineEdit : public QLineEdit
{
Q_OBJECT
- Q_DISABLE_COPY(BaseValidatingLineEdit)
Q_PROPERTY(QString initialText READ initialText WRITE setInitialText DESIGNABLE true)
Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor DESIGNABLE true)
diff --git a/src/libs/utils/classnamevalidatinglineedit.h b/src/libs/utils/classnamevalidatinglineedit.h
index 3e22f5d2a18..032331b7e9b 100644
--- a/src/libs/utils/classnamevalidatinglineedit.h
+++ b/src/libs/utils/classnamevalidatinglineedit.h
@@ -43,10 +43,9 @@ struct ClassNameValidatingLineEditPrivate;
class QTCREATOR_UTILS_EXPORT ClassNameValidatingLineEdit
: public Utils::BaseValidatingLineEdit
{
- Q_DISABLE_COPY(ClassNameValidatingLineEdit)
+ Q_OBJECT
Q_PROPERTY(bool namespacesEnabled READ namespacesEnabled WRITE setNamespacesEnabled DESIGNABLE true)
Q_PROPERTY(bool lowerCaseFileName READ lowerCaseFileName WRITE setLowerCaseFileName)
- Q_OBJECT
public:
explicit ClassNameValidatingLineEdit(QWidget *parent = 0);
diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h
index 4a8ba683a7c..dfefe696946 100644
--- a/src/libs/utils/fancylineedit.h
+++ b/src/libs/utils/fancylineedit.h
@@ -67,7 +67,6 @@ private:
class QTCREATOR_UTILS_EXPORT FancyLineEdit : public QLineEdit
{
- Q_DISABLE_COPY(FancyLineEdit)
Q_OBJECT
Q_ENUMS(Side)
diff --git a/src/libs/utils/filenamevalidatinglineedit.h b/src/libs/utils/filenamevalidatinglineedit.h
index 9a26ebf0918..75f04ff7080 100644
--- a/src/libs/utils/filenamevalidatinglineedit.h
+++ b/src/libs/utils/filenamevalidatinglineedit.h
@@ -40,8 +40,8 @@ namespace Utils {
class QTCREATOR_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit
{
Q_OBJECT
- Q_DISABLE_COPY(FileNameValidatingLineEdit)
Q_PROPERTY(bool allowDirectories READ allowDirectories WRITE setAllowDirectories)
+
public:
explicit FileNameValidatingLineEdit(QWidget *parent = 0);
diff --git a/src/libs/utils/filesystemwatcher.h b/src/libs/utils/filesystemwatcher.h
index 3c3b1ec465b..59ff528955b 100644
--- a/src/libs/utils/filesystemwatcher.h
+++ b/src/libs/utils/filesystemwatcher.h
@@ -44,8 +44,8 @@ class FileSystemWatcherPrivate;
// Documentation inside.
class QTCREATOR_UTILS_EXPORT FileSystemWatcher : public QObject
{
- Q_DISABLE_COPY(FileSystemWatcher)
Q_OBJECT
+
public:
enum WatchMode
{
diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h
index d6b4e57ef26..27efdaec953 100644
--- a/src/libs/utils/fileutils.h
+++ b/src/libs/utils/fileutils.h
@@ -120,7 +120,6 @@ public:
QFile *file() { return m_file; }
private:
- Q_DISABLE_COPY(FileSaver)
bool m_isSafe;
};
@@ -136,10 +135,9 @@ public:
void setAutoRemove(bool on) { m_autoRemove = on; }
private:
- Q_DISABLE_COPY(TempFileSaver)
bool m_autoRemove;
};
-}
+} // namespace Utils
#endif // FILEUTILS_H
diff --git a/src/libs/utils/filewizarddialog.h b/src/libs/utils/filewizarddialog.h
index 526ef88378b..236714aecb9 100644
--- a/src/libs/utils/filewizarddialog.h
+++ b/src/libs/utils/filewizarddialog.h
@@ -40,9 +40,9 @@ namespace Utils {
class FileWizardPage;
-class QTCREATOR_UTILS_EXPORT FileWizardDialog : public Wizard {
+class QTCREATOR_UTILS_EXPORT FileWizardDialog : public Wizard
+{
Q_OBJECT
- Q_DISABLE_COPY(FileWizardDialog)
public:
explicit FileWizardDialog(QWidget *parent = 0);
diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h
index 62624901fb7..4fb04bced3e 100644
--- a/src/libs/utils/filewizardpage.h
+++ b/src/libs/utils/filewizardpage.h
@@ -44,9 +44,9 @@ struct FileWizardPagePrivate;
class QTCREATOR_UTILS_EXPORT FileWizardPage : public QWizardPage
{
Q_OBJECT
- Q_DISABLE_COPY(FileWizardPage)
Q_PROPERTY(QString path READ path WRITE setPath DESIGNABLE true)
Q_PROPERTY(QString fileName READ fileName WRITE setFileName DESIGNABLE true)
+
public:
explicit FileWizardPage(QWidget *parent = 0);
virtual ~FileWizardPage();
diff --git a/src/libs/utils/ipaddresslineedit.h b/src/libs/utils/ipaddresslineedit.h
index f3c400536dc..a34e5d99469 100644
--- a/src/libs/utils/ipaddresslineedit.h
+++ b/src/libs/utils/ipaddresslineedit.h
@@ -42,7 +42,6 @@ class IpAddressLineEditPrivate;
class QTCREATOR_UTILS_EXPORT IpAddressLineEdit : public Utils::BaseValidatingLineEdit
{
- Q_DISABLE_COPY(IpAddressLineEdit)
Q_OBJECT
public:
diff --git a/src/libs/utils/linecolumnlabel.cpp b/src/libs/utils/linecolumnlabel.cpp
index 64e19e19ff7..7dc59f71a93 100644
--- a/src/libs/utils/linecolumnlabel.cpp
+++ b/src/libs/utils/linecolumnlabel.cpp
@@ -46,10 +46,6 @@ LineColumnLabel::LineColumnLabel(QWidget *parent)
{
}
-LineColumnLabel::~LineColumnLabel()
-{
-}
-
void LineColumnLabel::setText(const QString &text, const QString &maxText)
{
QLabel::setText(text);
diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/linecolumnlabel.h
index 826275064a0..6dde8f01a8b 100644
--- a/src/libs/utils/linecolumnlabel.h
+++ b/src/libs/utils/linecolumnlabel.h
@@ -40,13 +40,11 @@ namespace Utils {
class QTCREATOR_UTILS_EXPORT LineColumnLabel : public QLabel
{
- Q_DISABLE_COPY(LineColumnLabel)
Q_OBJECT
Q_PROPERTY(QString maxText READ maxText WRITE setMaxText DESIGNABLE true)
public:
explicit LineColumnLabel(QWidget *parent = 0);
- virtual ~LineColumnLabel();
void setText(const QString &text, const QString &maxText);
QSize sizeHint() const;
diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h
index 2915beef16d..cf2dd486ead 100644
--- a/src/libs/utils/newclasswidget.h
+++ b/src/libs/utils/newclasswidget.h
@@ -47,7 +47,6 @@ struct NewClassWidgetPrivate;
class QTCREATOR_UTILS_EXPORT NewClassWidget : public QWidget
{
- Q_DISABLE_COPY(NewClassWidget)
Q_OBJECT
Q_PROPERTY(bool namespacesEnabled READ namespacesEnabled WRITE setNamespacesEnabled DESIGNABLE true)
Q_PROPERTY(bool baseClassInputVisible READ isBaseClassInputVisible WRITE setBaseClassInputVisible DESIGNABLE true)
@@ -73,6 +72,7 @@ class QTCREATOR_UTILS_EXPORT NewClassWidget : public QWidget
// Utility "USER" property for wizards containing file names.
Q_PROPERTY(QStringList files READ files DESIGNABLE false USER true)
Q_ENUMS(ClassType)
+
public:
enum ClassType { NoClassType, ClassInheritsQObject, ClassInheritsQWidget,
ClassInheritsQDeclarativeItem,
diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index 8e41c10da44..a9c47410e13 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -50,7 +50,6 @@ class PathChooserPrivate;
class QTCREATOR_UTILS_EXPORT PathChooser : public QWidget
{
- Q_DISABLE_COPY(PathChooser)
Q_OBJECT
Q_ENUMS(Kind)
Q_PROPERTY(QString path READ path WRITE setPath DESIGNABLE true)
diff --git a/src/libs/utils/pathlisteditor.h b/src/libs/utils/pathlisteditor.h
index 0b076132207..0e1e6def761 100644
--- a/src/libs/utils/pathlisteditor.h
+++ b/src/libs/utils/pathlisteditor.h
@@ -48,7 +48,6 @@ struct PathListEditorPrivate;
class QTCREATOR_UTILS_EXPORT PathListEditor : public QWidget
{
- Q_DISABLE_COPY(PathListEditor)
Q_OBJECT
Q_PROPERTY(QStringList pathList READ pathList WRITE setPathList DESIGNABLE true)
Q_PROPERTY(QString fileDialogTitle READ fileDialogTitle WRITE setFileDialogTitle DESIGNABLE true)
diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h
index 31aa518f02a..34f8a025e03 100644
--- a/src/libs/utils/projectintropage.h
+++ b/src/libs/utils/projectintropage.h
@@ -44,7 +44,6 @@ struct ProjectIntroPagePrivate;
class QTCREATOR_UTILS_EXPORT ProjectIntroPage : public QWizardPage
{
Q_OBJECT
- Q_DISABLE_COPY(ProjectIntroPage)
Q_PROPERTY(QString description READ description WRITE setPath DESIGNABLE true)
Q_PROPERTY(QString path READ path WRITE setPath DESIGNABLE true)
Q_PROPERTY(QString projectName READ projectName WRITE setProjectName DESIGNABLE true)
diff --git a/src/libs/utils/projectnamevalidatinglineedit.h b/src/libs/utils/projectnamevalidatinglineedit.h
index 05118b15138..ffa875f3dfc 100644
--- a/src/libs/utils/projectnamevalidatinglineedit.h
+++ b/src/libs/utils/projectnamevalidatinglineedit.h
@@ -40,7 +40,6 @@ namespace Utils {
class QTCREATOR_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit
{
Q_OBJECT
- Q_DISABLE_COPY(ProjectNameValidatingLineEdit)
public:
explicit ProjectNameValidatingLineEdit(QWidget *parent = 0);
diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h
index da8a343f141..8fa9b41c3ee 100644
--- a/src/libs/utils/qtcolorbutton.h
+++ b/src/libs/utils/qtcolorbutton.h
@@ -74,7 +74,6 @@ protected:
private:
class QtColorButtonPrivate *d_ptr;
friend class QtColorButtonPrivate;
- Q_DISABLE_COPY(QtColorButton)
};
} // namespace Utils
diff --git a/src/libs/utils/savefile.h b/src/libs/utils/savefile.h
index f77bc2b1db2..8d1325b2bb1 100644
--- a/src/libs/utils/savefile.h
+++ b/src/libs/utils/savefile.h
@@ -53,13 +53,11 @@ public:
void setBackup(bool backup) { m_backup = backup; }
private:
- Q_DISABLE_COPY(SaveFile)
-
QString m_finalFileName;
bool m_finalized;
bool m_backup;
};
-}
+} // namespace Utils
#endif // SAVEFILE_H
diff --git a/src/libs/utils/ssh/sshconnection.h b/src/libs/utils/ssh/sshconnection.h
index 2883f75072b..2791ab1b789 100644
--- a/src/libs/utils/ssh/sshconnection.h
+++ b/src/libs/utils/ssh/sshconnection.h
@@ -73,7 +73,7 @@ QTCREATOR_UTILS_EXPORT bool operator!=(const SshConnectionParameters &p1, const
class QTCREATOR_UTILS_EXPORT SshConnection : public QObject
{
Q_OBJECT
- Q_DISABLE_COPY(SshConnection)
+
public:
enum State { Unconnected, Connecting, Connected };
typedef QSharedPointer<SshConnection> Ptr;
diff --git a/src/libs/utils/ssh/sshremoteprocess.h b/src/libs/utils/ssh/sshremoteprocess.h
index 6a1835a3f43..12c3ea1921a 100644
--- a/src/libs/utils/ssh/sshremoteprocess.h
+++ b/src/libs/utils/ssh/sshremoteprocess.h
@@ -53,7 +53,6 @@ class SshSendFacility;
class QTCREATOR_UTILS_EXPORT SshRemoteProcess : public QObject
{
Q_OBJECT
- Q_DISABLE_COPY(SshRemoteProcess)
friend class Internal::SshChannelManager;
friend class Internal::SshRemoteProcessPrivate;
diff --git a/src/libs/utils/ssh/sshremoteprocessrunner.h b/src/libs/utils/ssh/sshremoteprocessrunner.h
index dd202434dd0..58ad254c6fb 100644
--- a/src/libs/utils/ssh/sshremoteprocessrunner.h
+++ b/src/libs/utils/ssh/sshremoteprocessrunner.h
@@ -44,7 +44,7 @@ class SshRemoteProcessRunnerPrivate;
class QTCREATOR_UTILS_EXPORT SshRemoteProcessRunner : public QObject
{
Q_OBJECT
- Q_DISABLE_COPY(SshRemoteProcessRunner)
+
public:
typedef QSharedPointer<SshRemoteProcessRunner> Ptr;
diff --git a/src/libs/utils/submiteditorwidget.h b/src/libs/utils/submiteditorwidget.h
index f6c1b71cc40..61e05a7f80d 100644
--- a/src/libs/utils/submiteditorwidget.h
+++ b/src/libs/utils/submiteditorwidget.h
@@ -55,7 +55,6 @@ struct SubmitEditorWidgetPrivate;
class QTCREATOR_UTILS_EXPORT SubmitEditorWidget : public QWidget
{
Q_OBJECT
- Q_DISABLE_COPY(SubmitEditorWidget)
Q_PROPERTY(QString descriptionText READ descriptionText WRITE setDescriptionText DESIGNABLE true)
Q_PROPERTY(int fileNameColumn READ fileNameColumn WRITE setFileNameColumn DESIGNABLE false)
Q_PROPERTY(QAbstractItemView::SelectionMode fileListSelectionMode READ fileListSelectionMode WRITE setFileListSelectionMode DESIGNABLE true)
diff --git a/src/libs/utils/wizard.h b/src/libs/utils/wizard.h
index 326e6463de9..634a7429074 100644
--- a/src/libs/utils/wizard.h
+++ b/src/libs/utils/wizard.h
@@ -70,8 +70,6 @@ private slots:
void _q_pageRemoved(int pageId);
private:
-
- Q_DISABLE_COPY(Wizard)
Q_DECLARE_PRIVATE(Wizard)
class WizardPrivate *d_ptr;
@@ -124,7 +122,6 @@ private:
friend class Wizard;
friend class WizardProgressItem;
- Q_DISABLE_COPY(WizardProgress)
Q_DECLARE_PRIVATE(WizardProgress)
class WizardProgressPrivate *d_ptr;
@@ -150,15 +147,12 @@ public:
bool titleWordWrap() const;
protected:
-
WizardProgressItem(WizardProgress *progress, const QString &title);
virtual ~WizardProgressItem();
-
private:
friend class WizardProgress;
- Q_DISABLE_COPY(WizardProgressItem)
Q_DECLARE_PRIVATE(WizardProgressItem)
class WizardProgressItemPrivate *d_ptr;
diff --git a/src/plugins/classview/classviewmanager.h b/src/plugins/classview/classviewmanager.h
index 447092e9549..26fe7cc4ea0 100644
--- a/src/plugins/classview/classviewmanager.h
+++ b/src/plugins/classview/classviewmanager.h
@@ -58,7 +58,6 @@ class NavigationWidgetFactory;
class Manager : public QObject
{
Q_OBJECT
- Q_DISABLE_COPY(Manager)
public:
/*!
diff --git a/src/plugins/classview/classviewnavigationwidget.h b/src/plugins/classview/classviewnavigationwidget.h
index b23e99cadec..d2450162ca2 100644
--- a/src/plugins/classview/classviewnavigationwidget.h
+++ b/src/plugins/classview/classviewnavigationwidget.h
@@ -53,7 +53,6 @@ namespace Internal {
class NavigationWidget : public QWidget
{
Q_OBJECT
- Q_DISABLE_COPY(NavigationWidget)
public:
explicit NavigationWidget(QWidget *parent = 0);
diff --git a/src/plugins/classview/classviewnavigationwidgetfactory.h b/src/plugins/classview/classviewnavigationwidgetfactory.h
index 125f8f62fc0..21603730169 100644
--- a/src/plugins/classview/classviewnavigationwidgetfactory.h
+++ b/src/plugins/classview/classviewnavigationwidgetfactory.h
@@ -52,7 +52,6 @@ namespace Internal {
class NavigationWidgetFactory : public Core::INavigationWidgetFactory
{
Q_OBJECT
- Q_DISABLE_COPY(NavigationWidgetFactory)
public:
//! destructor
diff --git a/src/plugins/classview/classviewplugin.h b/src/plugins/classview/classviewplugin.h
index affa98f6366..e386da66ae2 100644
--- a/src/plugins/classview/classviewplugin.h
+++ b/src/plugins/classview/classviewplugin.h
@@ -48,7 +48,6 @@ namespace Internal {
class Plugin : public ExtensionSystem::IPlugin
{
Q_OBJECT
- Q_DISABLE_COPY(Plugin)
public:
//! Constructor
diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
index 8e4049c1b39..6259cea969c 100644
--- a/src/plugins/coreplugin/basefilewizard.cpp
+++ b/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:
diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h
index bf3d21f0be1..d9e574f466d 100644
--- a/src/plugins/coreplugin/basefilewizard.h
+++ b/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:
diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h
index 98b113204f8..01a24297f2b 100644
--- a/src/plugins/coreplugin/dialogs/ioptionspage.h
+++ b/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() {}
diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h
index 23a738f8a3a..280829aabc1 100644
--- a/src/plugins/coreplugin/editortoolbar.h
+++ b/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();
diff --git a/src/plugins/coreplugin/fileiconprovider.h b/src/plugins/coreplugin/fileiconprovider.h
index 3583dcc07d5..52a9e44f84f 100644
--- a/src/plugins/coreplugin/fileiconprovider.h
+++ b/src/plugins/coreplugin/fileiconprovider.h
@@ -52,7 +52,6 @@ struct FileIconProviderPrivate;
class CORE_EXPORT FileIconProvider : public QFileIconProvider
{
- Q_DISABLE_COPY(FileIconProvider)
FileIconProvider();
public:
diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h
index db24d24435e..d6d40843de8 100644
--- a/src/plugins/coreplugin/helpmanager.h
+++ b/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;
diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h
index e04baa781c5..fda28c028b7 100644
--- a/src/plugins/coreplugin/manhattanstyle.h
+++ b/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
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index 8a9679573e1..ab973f5cfe6 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/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();
diff --git a/src/plugins/coreplugin/mimedatabase.h b/src/plugins/coreplugin/mimedatabase.h
index 02099e6ef92..2ae17923251 100644
--- a/src/plugins/coreplugin/mimedatabase.h
+++ b/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;
diff --git a/src/plugins/coreplugin/variablemanager.h b/src/plugins/coreplugin/variablemanager.h
index b252fe8a825..1289fc26bd9 100644
--- a/src/plugins/coreplugin/variablemanager.h
+++ b/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();
diff --git a/src/plugins/cpaster/fileshareprotocol.h b/src/plugins/cpaster/fileshareprotocol.h
index ebdadc4e82d..fd22a4e1b2f 100644
--- a/src/plugins/cpaster/fileshareprotocol.h
+++ b/src/plugins/cpaster/fileshareprotocol.h
@@ -48,7 +48,7 @@ struct FileShareProtocolSettings;
class FileShareProtocol : public Protocol
{
Q_OBJECT
- Q_DISABLE_COPY(FileShareProtocol)
+
public:
FileShareProtocol();
virtual ~FileShareProtocol();
@@ -66,10 +66,12 @@ public:
const QString &username = QString(),
const QString &comment = QString(),
const QString &description = QString());
+
private:
const QSharedPointer<FileShareProtocolSettings> m_settings;
FileShareProtocolSettingsPage *m_settingsPage;
};
+
} // namespace CodePaster
#endif // FILESHAREPROTOCOL_H
diff --git a/src/plugins/cpaster/protocol.h b/src/plugins/cpaster/protocol.h
index 0ce5cdaf69c..931fae37012 100644
--- a/src/plugins/cpaster/protocol.h
+++ b/src/plugins/cpaster/protocol.h
@@ -44,15 +44,17 @@ class QWidget;
QT_END_NAMESPACE
namespace Core {
- class IOptionsPage;
+class IOptionsPage;
}
namespace CodePaster {
+
class Protocol : public QObject
{
Q_OBJECT
+
public:
- enum ContentType{
+ enum ContentType {
Text, C, JavaScript, Diff, Xml
};
@@ -109,8 +111,10 @@ protected:
* delayed initialization and conveniences
* for HTTP-requests. */
-class NetworkAccessManagerProxy {
+class NetworkAccessManagerProxy
+{
Q_DISABLE_COPY(NetworkAccessManagerProxy)
+
public:
NetworkAccessManagerProxy();
~NetworkAccessManagerProxy();
@@ -127,8 +131,10 @@ private:
* initialization to a QNetworkAccessManager and conveniences
* for HTTP-requests. */
-class NetworkProtocol : public Protocol {
+class NetworkProtocol : public Protocol
+{
Q_OBJECT
+
public:
virtual ~NetworkProtocol();
diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h
index 102c1ddd6c7..ad4eb088a5b 100644
--- a/src/plugins/cpaster/settingspage.h
+++ b/src/plugins/cpaster/settingspage.h
@@ -45,8 +45,10 @@ namespace CodePaster {
struct Settings;
-class SettingsWidget : public QWidget {
+class SettingsWidget : public QWidget
+{
Q_OBJECT
+
public:
explicit SettingsWidget(const QStringList &protocols, QWidget *parent = 0);
@@ -62,7 +64,7 @@ private:
class SettingsPage : public Core::IOptionsPage
{
Q_OBJECT
- Q_DISABLE_COPY(SettingsPage)
+
public:
explicit SettingsPage(const QSharedPointer<Settings> &settings);
virtual ~SettingsPage();
diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h
index e313fdbfd06..8ff4f1de9f9 100644
--- a/src/plugins/cppeditor/cppclasswizard.h
+++ b/src/plugins/cppeditor/cppclasswizard.h
@@ -82,7 +82,7 @@ struct CppClassWizardParameters
class CppClassWizardDialog : public Utils::Wizard
{
Q_OBJECT
- Q_DISABLE_COPY(CppClassWizardDialog)
+
public:
explicit CppClassWizardDialog(QWidget *parent = 0);
@@ -97,6 +97,7 @@ private:
class CppClassWizard : public Core::BaseFileWizard
{
Q_OBJECT
+
public:
explicit CppClassWizard(const Core::BaseFileWizardParameters ¶meters,
QObject *parent = 0);
diff --git a/src/plugins/cppeditor/cpplocalsymbols.h b/src/plugins/cppeditor/cpplocalsymbols.h
index 6ee87a80216..b55edc320be 100644
--- a/src/plugins/cppeditor/cpplocalsymbols.h
+++ b/src/plugins/cppeditor/cpplocalsymbols.h
@@ -52,8 +52,7 @@ public:
SemanticInfo::LocalUseMap uses;
};
-}
-
-}
+} // namespace Internal
+} // namespace CppEditor
#endif // CPPLOCALSYMBOLS_H
diff --git a/src/plugins/cppeditor/cppquickfix.h b/src/plugins/cppeditor/cppquickfix.h
index 71da104263f..d2e91311c74 100644
--- a/src/plugins/cppeditor/cppquickfix.h
+++ b/src/plugins/cppeditor/cppquickfix.h
@@ -58,8 +58,6 @@ class CppQuickFixAssistInterface;
class CPPEDITOR_EXPORT CppQuickFixOperation: public TextEditor::QuickFixOperation
{
- Q_DISABLE_COPY(CppQuickFixOperation)
-
public:
explicit CppQuickFixOperation(
const QSharedPointer<const Internal::CppQuickFixAssistInterface> &interface,
diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h
index dd5fb0bd4df..2082862256e 100644
--- a/src/plugins/cpptools/cppfilesettingspage.h
+++ b/src/plugins/cpptools/cppfilesettingspage.h
@@ -96,8 +96,6 @@ private:
class CppFileSettingsPage : public Core::IOptionsPage
{
- Q_DISABLE_COPY(CppFileSettingsPage)
-
public:
explicit CppFileSettingsPage(QSharedPointer<CppFileSettings> &settings,
QObject *parent = 0);
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 14eca4461fb..3b75daa3fc9 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -61,8 +61,8 @@ struct CppFileSettings;
class CppToolsPlugin : public ExtensionSystem::IPlugin
{
- Q_DISABLE_COPY(CppToolsPlugin)
Q_OBJECT
+
public:
CppToolsPlugin();
~CppToolsPlugin();
diff --git a/src/plugins/debugger/cdb/bytearrayinputstream.h b/src/plugins/debugger/cdb/bytearrayinputstream.h
index 0af7c887410..7296f6afb05 100644
--- a/src/plugins/debugger/cdb/bytearrayinputstream.h
+++ b/src/plugins/debugger/cdb/bytearrayinputstream.h
@@ -42,6 +42,7 @@ namespace Internal {
class ByteArrayInputStream
{
Q_DISABLE_COPY(ByteArrayInputStream)
+
public:
typedef void (ModifierFunc)(ByteArrayInputStream &s);
diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h
index 7dcbe7eb4db..99829034b15 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.h
+++ b/src/plugins/debugger/cdb/cdboptionspage.h
@@ -55,6 +55,7 @@ namespace Internal {
class CdbBreakEventWidget : public QWidget
{
Q_OBJECT
+
public:
explicit CdbBreakEventWidget(QWidget *parent = 0);
@@ -72,6 +73,7 @@ private:
class CdbOptionsPageWidget : public QWidget
{
Q_OBJECT
+
public:
explicit CdbOptionsPageWidget(QWidget *parent);
@@ -91,8 +93,8 @@ private:
class CdbOptionsPage : public Core::IOptionsPage
{
- Q_DISABLE_COPY(CdbOptionsPage)
Q_OBJECT
+
public:
explicit CdbOptionsPage();
virtual ~CdbOptionsPage();
diff --git a/src/plugins/debugger/gdb/abstractgdbprocess.h b/src/plugins/debugger/gdb/abstractgdbprocess.h
index 2526b0fdd62..dc0b110957d 100644
--- a/src/plugins/debugger/gdb/abstractgdbprocess.h
+++ b/src/plugins/debugger/gdb/abstractgdbprocess.h
@@ -42,7 +42,10 @@ namespace Internal {
class AbstractGdbProcess : public QObject
{
Q_OBJECT
- Q_DISABLE_COPY(AbstractGdbProcess)
+
+protected:
+ explicit AbstractGdbProcess(QObject *parent = 0) : QObject(parent) {}
+
public:
virtual QByteArray readAllStandardOutput() = 0;
virtual QByteArray readAllStandardError() = 0;
@@ -67,10 +70,6 @@ signals:
void finished(int exitCode, QProcess::ExitStatus exitStatus);
void readyReadStandardError();
void readyReadStandardOutput();
-
-protected:
- explicit AbstractGdbProcess(QObject *parent = 0) : QObject(parent) {}
-
};
} // namespace Internal
diff --git a/src/plugins/debugger/lldb/lldboptionspage.h b/src/plugins/debugger/lldb/lldboptionspage.h
index 9933881b56b..499779983d2 100644
--- a/src/plugins/debugger/lldb/lldboptionspage.h
+++ b/src/plugins/debugger/lldb/lldboptionspage.h
@@ -47,6 +47,7 @@ namespace Internal {
class LldbOptionsPageWidget : public QWidget
{
Q_OBJECT
+
public:
explicit LldbOptionsPageWidget(QWidget *parent, QSettings *s);
@@ -61,8 +62,8 @@ private:
class LldbOptionsPage : public Core::IOptionsPage
{
- Q_DISABLE_COPY(LldbOptionsPage)
Q_OBJECT
+
public:
explicit LldbOptionsPage();
virtual ~LldbOptionsPage();
diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h
index 1a2b9231693..41fed787b40 100644
--- a/src/plugins/designer/cpp/formclasswizard.h
+++ b/src/plugins/designer/cpp/formclasswizard.h
@@ -44,7 +44,6 @@ class FormClassWizardParameters;
class FormClassWizard : public Core::BaseFileWizard
{
- Q_DISABLE_COPY(FormClassWizard)
Q_OBJECT
public:
@@ -63,8 +62,6 @@ protected:
virtual Core::GeneratedFiles generateFiles(const QWizard *w,
QString *errorMessage) const;
-
-private:
};
} // namespace Internal
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h
index 8337a805dbe..0e9c3fc82c5 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.h
+++ b/src/plugins/designer/cpp/formclasswizarddialog.h
@@ -41,13 +41,11 @@ class FormClassWizardParameters;
namespace Internal {
-
class FormClassWizardPage;
class FormTemplateWizardPage;
class FormClassWizardDialog : public Utils::Wizard
{
- Q_DISABLE_COPY(FormClassWizardDialog)
Q_OBJECT
public:
diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h
index eb3a8668dd5..8ff9ebaccc8 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.h
+++ b/src/plugins/designer/cpp/formclasswizardpage.h
@@ -43,14 +43,14 @@ class FormClassWizardGenerationParameters;
namespace Internal {
namespace Ui {
- class FormClassWizardPage;
+class FormClassWizardPage;
}
class FormClassWizardPage : public QWizardPage
{
- Q_DISABLE_COPY(FormClassWizardPage)
Q_OBJECT
+
public:
explicit FormClassWizardPage(QWidget * parent = 0);
~FormClassWizardPage();
diff --git a/src/plugins/designer/designercontext.h b/src/plugins/designer/designercontext.h
index 90a3138be17..665a2de715f 100644
--- a/src/plugins/designer/designercontext.h
+++ b/src/plugins/designer/designercontext.h
@@ -37,16 +37,11 @@
#include <QtCore/QList>
-QT_BEGIN_NAMESPACE
-class QWidget;
-QT_END_NAMESPACE
-
namespace Designer {
namespace Internal {
class DesignerContext : public Core::IContext
{
- Q_DISABLE_COPY(DesignerContext)
public:
explicit DesignerContext(const Core::Context &contexts,
QWidget *widget,
diff --git a/src/plugins/designer/editorwidget.h b/src/plugins/designer/editorwidget.h
index d398938567f..b6275025d3b 100644
--- a/src/plugins/designer/editorwidget.h
+++ b/src/plugins/designer/editorwidget.h
@@ -59,7 +59,7 @@ class FormEditorW;
class EditorWidget : public Utils::FancyMainWindow
{
Q_OBJECT
- Q_DISABLE_COPY(EditorWidget)
+
public:
explicit EditorWidget(FormEditorW *fe, QWidget *parent = 0);
diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h
index b1caecfc0fb..c128c5e3f60 100644
--- a/src/plugins/designer/formeditorstack.h
+++ b/src/plugins/designer/formeditorstack.h
@@ -60,7 +60,7 @@ namespace Internal {
class FormEditorStack : public QStackedWidget
{
Q_OBJECT
- Q_DISABLE_COPY(FormEditorStack)
+
public:
explicit FormEditorStack(QWidget *parent = 0);
diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h
index 90cdf840797..dcfa4fd4ca2 100644
--- a/src/plugins/designer/formtemplatewizardpage.h
+++ b/src/plugins/designer/formtemplatewizardpage.h
@@ -47,8 +47,8 @@ namespace Internal {
class FormTemplateWizardPage : public QWizardPage
{
- Q_DISABLE_COPY(FormTemplateWizardPage)
Q_OBJECT
+
public:
explicit FormTemplateWizardPage(QWidget * parent = 0);
diff --git a/src/plugins/designer/formwizard.h b/src/plugins/designer/formwizard.h
index ef3183d410a..44c81684028 100644
--- a/src/plugins/designer/formwizard.h
+++ b/src/plugins/designer/formwizard.h
@@ -40,7 +40,6 @@ namespace Internal {
class FormWizard : public Core::BaseFileWizard
{
- Q_DISABLE_COPY(FormWizard)
Q_OBJECT
public:
diff --git a/src/plugins/designer/formwizarddialog.h b/src/plugins/designer/formwizarddialog.h
index 04b89ad405f..ade4638aeab 100644
--- a/src/plugins/designer/formwizarddialog.h
+++ b/src/plugins/designer/formwizarddialog.h
@@ -49,7 +49,6 @@ class FormTemplateWizardPage;
class FormWizardDialog : public Utils::Wizard
{
- Q_DISABLE_COPY(FormWizardDialog)
Q_OBJECT
public:
@@ -72,7 +71,6 @@ private:
class FormFileWizardDialog : public FormWizardDialog
{
- Q_DISABLE_COPY(FormFileWizardDialog)
Q_OBJECT
public:
diff --git a/src/plugins/git/gitcommand.h b/src/plugins/git/gitcommand.h
index b6f901c4084..73c830ce55d 100644
--- a/src/plugins/git/gitcommand.h
+++ b/src/plugins/git/gitcommand.h
@@ -38,10 +38,6 @@
#include <QtCore/QVariant>
#include <QtCore/QProcessEnvironment>
-QT_BEGIN_NAMESPACE
-class QProcess;
-QT_END_NAMESPACE
-
namespace Git {
namespace Internal {
@@ -49,8 +45,8 @@ namespace Internal {
// signal with a magic cookie
class GitCommand : public QObject
{
- Q_DISABLE_COPY(GitCommand)
Q_OBJECT
+
public:
// Where to report command termination with exit code if desired
enum TerminationReportMode { NoReport,
@@ -85,9 +81,9 @@ public:
private:
void run();
-Q_SIGNALS:
- void outputData(const QByteArray&);
- void errorText(const QString&);
+signals:
+ void outputData(const QByteArray &);
+ void errorText(const QString &);
void finished(bool ok, int exitCode, const QVariant &cookie);
void success();
diff --git a/src/plugins/git/gitorious/gitorious.h b/src/plugins/git/gitorious/gitorious.h
index 5f846567bf3..5a82abcfac4 100644
--- a/src/plugins/git/gitorious/gitorious.h
+++ b/src/plugins/git/gitorious/gitorious.h
@@ -116,7 +116,6 @@ QDebug operator<<(QDebug d, const GitoriousHost &p);
class Gitorious : public QObject
{
- Q_DISABLE_COPY(Gitorious)
Q_OBJECT
public:
diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h
index 9be0543efb3..c2e1319959d 100644
--- a/src/plugins/help/helpviewer.h
+++ b/src/plugins/help/helpviewer.h
@@ -50,7 +50,7 @@
#endif
namespace Help {
- namespace Internal {
+namespace Internal {
#if !defined(QT_NO_WEBKIT)
class HelpViewer : public QWebView
@@ -60,7 +60,6 @@ class HelpViewer : public QTextBrowser
{
Q_OBJECT
class HelpViewerPrivate;
- Q_DISABLE_COPY(HelpViewer)
public:
explicit HelpViewer(qreal zoom, QWidget *parent = 0);
@@ -142,7 +141,7 @@ private:
HelpViewerPrivate *d;
};
- } // namespace Help
} // namespace Internal
+} // namespace Help
#endif // HELPVIEWER_H
diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h
index 81b8c428c9e..90433cfb84d 100644
--- a/src/plugins/imageviewer/imageviewer.h
+++ b/src/plugins/imageviewer/imageviewer.h
@@ -50,7 +50,7 @@ class ImageViewerFile;
class ImageViewer : public Core::IEditor
{
Q_OBJECT
- Q_DISABLE_COPY(ImageViewer)
+
public:
explicit ImageViewer(QWidget *parent = 0);
~ImageViewer();
diff --git a/src/plugins/locator/commandlocator.h b/src/plugins/locator/commandlocator.h
index 56cd7ca872e..ffb10a7e69e 100644
--- a/src/plugins/locator/commandlocator.h
+++ b/src/plugins/locator/commandlocator.h
@@ -53,8 +53,8 @@ struct CommandLocatorPrivate;
class LOCATOR_EXPORT CommandLocator : public Locator::ILocatorFilter
{
- Q_DISABLE_COPY(CommandLocator)
Q_OBJECT
+
public:
explicit CommandLocator(const QString &prefix,
const QString &displayName,
diff --git a/src/plugins/perforce/perforcesettings.h b/src/plugins/perforce/perforcesettings.h
index 1c91120633c..be58d617cc2 100644
--- a/src/plugins/perforce/perforcesettings.h
+++ b/src/plugins/perforce/perforcesettings.h
@@ -84,8 +84,10 @@ inline bool operator!=(const Settings &s1, const Settings &s2) { return !s1.equa
* p4. This is why the client root portion of working directory must be mapped for the
* "-d" option, so that running p4 in "/depot/dev/foo" results in "-d $HOME/dev/foo". */
-class PerforceSettings {
+class PerforceSettings
+{
Q_DISABLE_COPY(PerforceSettings)
+
public:
PerforceSettings();
~PerforceSettings();
diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h
index ec330467489..7c612f64011 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 829d266048d..f1f127aade8 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 308882f1de0..b2f3a36e81d 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 b3f862831fa..01197a52fff 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();
diff --git a/src/plugins/qmldesigner/components/integration/integrationcore.h b/src/plugins/qmldesigner/components/integration/integrationcore.h
index 54566323255..24c8e9b16c7 100644
--- a/src/plugins/qmldesigner/components/integration/integrationcore.h
+++ b/src/plugins/qmldesigner/components/integration/integrationcore.h
@@ -61,6 +61,7 @@ public:
private:
CorePrivate *m_d;
};
-}
+
+} // namspace QmlDesigner
#endif // QMLDESIGNERCORE_H
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
index cc850f50d68..5aedccb7b5e 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
@@ -47,7 +47,6 @@ class Model;
class ItemLibraryWidget : public QFrame
{
Q_OBJECT
- Q_DISABLE_COPY(ItemLibraryWidget)
enum FilterChangeFlag {
QtBasic = 0x0,
diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h
index 3209a8b1b69..c016d564626 100644
--- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h
+++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h
@@ -36,16 +36,13 @@
#include <iwidgetplugin.h>
#include <QtDeclarative/qdeclarative.h>
-QT_BEGIN_NAMESPACE
-QT_END_NAMESPACE
-
namespace QmlDesigner {
class CustomStylePlugin : public QObject, QmlDesigner::IWidgetPlugin
{
Q_OBJECT
- Q_DISABLE_COPY(CustomStylePlugin)
Q_INTERFACES(QmlDesigner::IWidgetPlugin)
+
public:
CustomStylePlugin();
~CustomStylePlugin() {}
@@ -57,5 +54,4 @@ public:
} // namespace QmlDesigner
-
#endif // CUSTOMSTYLEPLUGIN_H
diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
index d2308f8015c..521c2e6b87a 100644
--- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
+++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
@@ -99,7 +99,7 @@ private:
class CORESHARED_EXPORT ItemLibraryInfo : public QObject
{
Q_OBJECT
- Q_DISABLE_COPY(ItemLibraryInfo)
+
friend class Internal::MetaInfoPrivate;
public:
~ItemLibraryInfo();
diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h
index b2d51001a43..fa447215317 100644
--- a/src/plugins/qmldesigner/designercore/include/model.h
+++ b/src/plugins/qmldesigner/designercore/include/model.h
@@ -76,8 +76,8 @@ class CORESHARED_EXPORT Model : public QObject
friend class QmlDesigner::AbstractView;
friend class Internal::ModelPrivate;
- Q_DISABLE_COPY(Model)
Q_OBJECT
+
public:
enum ViewNotification { NotifyView, DoNotNotifyView };
diff --git a/src/plugins/qmldesigner/designmodewidget.h b/src/plugins/qmldesigner/designmodewidget.h
index ec99f589abc..491124eb58d 100644
--- a/src/plugins/qmldesigner/designmodewidget.h
+++ b/src/plugins/qmldesigner/designmodewidget.h
@@ -83,10 +83,10 @@ class DesignMode;
class DocumentWidget;
class DesignModeWidget;
-class DocumentWarningWidget : public Utils::FakeToolTip
+class DocumentWarningWidget : public Utils::FakeToolTip
{
Q_OBJECT
- Q_DISABLE_COPY(DocumentWarningWidget)
+
public:
explicit DocumentWarningWidget(DesignModeWidget *parent = 0);
@@ -105,7 +105,7 @@ private:
class DesignModeWidget : public QWidget
{
Q_OBJECT
- Q_DISABLE_COPY(DesignModeWidget)
+
public:
explicit DesignModeWidget(QWidget *parent = 0);
~DesignModeWidget();
diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h
index f4a93c8a7d9..4c63d8b6c23 100644
--- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h
@@ -44,15 +44,13 @@ namespace QmlDesigner {
class DesktopPlugin : public QObject, QmlDesigner::IWidgetPlugin
{
Q_OBJECT
- Q_DISABLE_COPY(DesktopPlugin)
Q_INTERFACES(QmlDesigner::IWidgetPlugin)
+
public:
DesktopPlugin();
- ~DesktopPlugin() {}
QString metaInfo() const;
QString pluginName() const;
-
};
} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h
index 9ce8d8fa04e..a535dfcb958 100644
--- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h
+++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h
@@ -36,26 +36,20 @@
#include <iwidgetplugin.h>
#include <QtDeclarative/qdeclarative.h>
-QT_BEGIN_NAMESPACE
-QT_END_NAMESPACE
-
namespace QmlDesigner {
class ExtrasPlugin : public QObject, QmlDesigner::IWidgetPlugin
{
Q_OBJECT
- Q_DISABLE_COPY(ExtrasPlugin)
Q_INTERFACES(QmlDesigner::IWidgetPlugin)
+
public:
ExtrasPlugin();
- ~ExtrasPlugin() {}
QString metaInfo() const;
QString pluginName() const;
-
};
} // namespace QmlDesigner
-
#endif // EXTRASPLUGIN_H
diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.h b/src/plugins/qmldesigner/meegoplugin/meegoplugin.h
index 11ea724625a..1348e9fa140 100644
--- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.h
+++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.h
@@ -36,26 +36,20 @@
#include <iwidgetplugin.h>
#include <QtDeclarative/qdeclarative.h>
-QT_BEGIN_NAMESPACE
-QT_END_NAMESPACE
-
namespace QmlDesigner {
class MeegoPlugin : public QObject, QmlDesigner::IWidgetPlugin
{
Q_OBJECT
- Q_DISABLE_COPY(MeegoPlugin)
Q_INTERFACES(QmlDesigner::IWidgetPlugin)
+
public:
MeegoPlugin();
- ~MeegoPlugin() {}
QString metaInfo() const;
QString pluginName() const;
-
};
} // namespace QmlDesigner
-
#endif // MEEGOPLUGIN_H
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.h b/src/plugins/qmldesigner/symbianplugin/symbianplugin.h
index 001234bbc55..d2964193f67 100644
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.h
+++ b/src/plugins/qmldesigner/symbianplugin/symbianplugin.h
@@ -36,26 +36,20 @@
#include <iwidgetplugin.h>
#include <QtDeclarative/qdeclarative.h>
-QT_BEGIN_NAMESPACE
-QT_END_NAMESPACE
-
namespace QmlDesigner {
class SymbianPlugin : public QObject, QmlDesigner::IWidgetPlugin
{
Q_OBJECT
- Q_DISABLE_COPY(SymbianPlugin)
Q_INTERFACES(QmlDesigner::IWidgetPlugin)
+
public:
SymbianPlugin();
- ~SymbianPlugin() {}
QString metaInfo() const;
QString pluginName() const;
-
};
} // namespace QmlDesigner
-
#endif // SymbianPLUGIN_H
diff --git a/src/plugins/qmljseditor/qmljsquickfix.h b/src/plugins/qmljseditor/qmljsquickfix.h
index 7529814829d..99b8b607376 100644
--- a/src/plugins/qmljseditor/qmljsquickfix.h
+++ b/src/plugins/qmljseditor/qmljsquickfix.h
@@ -62,8 +62,6 @@ class QmlJSQuickFixAssistInterface;
*/
class QmlJSQuickFixOperation: public TextEditor::QuickFixOperation
{
- Q_DISABLE_COPY(QmlJSQuickFixOperation)
-
public:
/*!
Creates a new QmlJSQuickFixOperation.
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h
index 4513cbc52b6..ed28b751c6a 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.h
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.h
@@ -162,7 +162,6 @@ private:
private:
- Q_DISABLE_COPY(ClientProxy)
void buildDebugIdHashRecursive(const QDeclarativeDebugObjectReference &ref);
Debugger::QmlAdapter *m_adapter;
diff --git a/src/plugins/qmljstools/qmljstoolsplugin.h b/src/plugins/qmljstools/qmljstoolsplugin.h
index 824ec83f5c7..b383fb38e88 100644
--- a/src/plugins/qmljstools/qmljstoolsplugin.h
+++ b/src/plugins/qmljstools/qmljstoolsplugin.h
@@ -55,8 +55,8 @@ class ModelManager;
class QmlJSToolsPlugin : public ExtensionSystem::IPlugin
{
- Q_DISABLE_COPY(QmlJSToolsPlugin)
Q_OBJECT
+
public:
static QmlJSToolsPlugin *instance() { return m_instance; }
diff --git a/src/plugins/qmlprofiler/codaqmlprofilerrunner.h b/src/plugins/qmlprofiler/codaqmlprofilerrunner.h
index e9e931713fb..712f5ace06b 100644
--- a/src/plugins/qmlprofiler/codaqmlprofilerrunner.h
+++ b/src/plugins/qmlprofiler/codaqmlprofilerrunner.h
@@ -45,7 +45,6 @@ namespace Internal {
class CodaQmlProfilerRunner : public AbstractQmlProfilerRunner
{
Q_OBJECT
- Q_DISABLE_COPY(CodaQmlProfilerRunner)
using AbstractQmlProfilerRunner::appendMessage; // don't hide signal
public:
diff --git a/src/plugins/qmlprofiler/localqmlprofilerrunner.h b/src/plugins/qmlprofiler/localqmlprofilerrunner.h
index 2a8b7031b24..176416bf346 100644
--- a/src/plugins/qmlprofiler/localqmlprofilerrunner.h
+++ b/src/plugins/qmlprofiler/localqmlprofilerrunner.h
@@ -44,7 +44,6 @@ namespace Internal {
class LocalQmlProfilerRunner : public AbstractQmlProfilerRunner
{
Q_OBJECT
- Q_DISABLE_COPY(LocalQmlProfilerRunner)
public:
struct Configuration {
diff --git a/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.h b/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.h
index cf7a444a6fe..f3dbbd7e2ac 100644
--- a/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.h
+++ b/src/plugins/qmlprofiler/remotelinuxqmlprofilerrunner.h
@@ -43,7 +43,6 @@ namespace Internal {
class RemoteLinuxQmlProfilerRunner : public AbstractQmlProfilerRunner
{
Q_OBJECT
- Q_DISABLE_COPY(RemoteLinuxQmlProfilerRunner)
using AbstractQmlProfilerRunner::appendMessage; // don't hide signal
public:
diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
index f70e46229a8..3915e566273 100644
--- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
+++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h
@@ -49,10 +49,10 @@ public:
class QmlProjectItemPrivate;
-class QmlProjectItem : public QObject {
+class QmlProjectItem : public QObject
+{
Q_OBJECT
Q_DECLARE_PRIVATE(QmlProjectItem)
- Q_DISABLE_COPY(QmlProjectItem)
Q_PROPERTY(QDeclarativeListProperty<QmlProjectManager::QmlProjectContentItem> content READ content DESIGNABLE false)
Q_PROPERTY(QString sourceDirectory READ sourceDirectory NOTIFY sourceDirectoryChanged)
diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.h b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.h
index d715acb551f..111a5ebe4f8 100644
--- a/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.h
+++ b/src/plugins/qt4projectmanager/customwidgetwizard/customwidgetwizard.h
@@ -40,8 +40,8 @@ namespace Internal {
class CustomWidgetWizard : public QtWizard
{
- Q_DISABLE_COPY(CustomWidgetWizard)
Q_OBJECT
+
public:
CustomWidgetWizard();
diff --git a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.h b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.h
index 55489d0bfec..1503b5afc11 100644
--- a/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.h
+++ b/src/plugins/qt4projectmanager/qt-s60/certificatepathchooser.h
@@ -40,8 +40,8 @@ namespace Internal {
class CertificatePathChooser : public Utils::PathChooser
{
- Q_DISABLE_COPY(CertificatePathChooser)
Q_OBJECT
+
public:
explicit CertificatePathChooser(QWidget *parent = 0);
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h
index d608635f35d..1ce41b8657d 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.h
@@ -44,8 +44,8 @@ namespace Internal {
class S60DeviceDebugRunControl : public Debugger::DebuggerRunControl
{
- Q_DISABLE_COPY(S60DeviceDebugRunControl)
Q_OBJECT
+
public:
explicit S60DeviceDebugRunControl(S60DeviceRunConfiguration *runConfiguration,
const Debugger::DebuggerStartParameters &sp,
diff --git a/src/plugins/qt4projectmanager/qt4nodes.h b/src/plugins/qt4projectmanager/qt4nodes.h
index 3f2d1e7b8a0..da4e15d4b1f 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.h
+++ b/src/plugins/qt4projectmanager/qt4nodes.h
@@ -118,7 +118,7 @@ class Qt4PriFile;
class Qt4PriFileNode : public ProjectExplorer::ProjectNode
{
Q_OBJECT
- Q_DISABLE_COPY(Qt4PriFileNode)
+
public:
Qt4PriFileNode(Qt4Project *project, Qt4ProFileNode* qt4ProFileNode, const QString &filePath);
@@ -230,7 +230,7 @@ private:
class Qt4NodesWatcher : public ProjectExplorer::NodesWatcher
{
Q_OBJECT
- Q_DISABLE_COPY(Qt4NodesWatcher)
+
public:
Qt4NodesWatcher(QObject *parent = 0);
@@ -310,7 +310,7 @@ struct QT4PROJECTMANAGER_EXPORT ProjectVersion {
class QT4PROJECTMANAGER_EXPORT Qt4ProFileNode : public Internal::Qt4PriFileNode
{
Q_OBJECT
- Q_DISABLE_COPY(Qt4ProFileNode)
+
public:
Qt4ProFileNode(Qt4Project *project,
const QString &filePath,
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 124227e7523..c8db517d615 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -122,8 +122,8 @@ QDebug operator<<(QDebug d, const Qt4ProjectFiles &f)
// A visitor to collect all files of a project in a Qt4ProjectFiles struct
class ProjectFilesVisitor : public ProjectExplorer::NodesVisitor
{
- Q_DISABLE_COPY(ProjectFilesVisitor)
ProjectFilesVisitor(Qt4ProjectFiles *files);
+
public:
static void findProjectFiles(Qt4ProFileNode *rootNode, Qt4ProjectFiles *files);
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.h b/src/plugins/qt4projectmanager/wizards/guiappwizard.h
index b8355f2cb7a..c53e15b370d 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.h
@@ -42,7 +42,6 @@ struct GuiAppParameters;
class GuiAppWizard : public QtWizard
{
- Q_DISABLE_COPY(GuiAppWizard)
Q_OBJECT
public:
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h
index ed12fbabdbb..1c073316b5b 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizardpages.h
@@ -42,7 +42,6 @@ namespace Internal {
class Html5AppWizardOptionsPage : public QWizardPage
{
Q_OBJECT
- Q_DISABLE_COPY(Html5AppWizardOptionsPage)
public:
explicit Html5AppWizardOptionsPage(QWidget *parent = 0);
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
index 2ec728fd939..e6a2acfbf1b 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
@@ -105,7 +105,6 @@ static QString pluginDependencies(const PluginBaseClasses *plb)
// A Project intro page with an additional type chooser.
class LibraryIntroPage : public Utils::ProjectIntroPage
{
- Q_DISABLE_COPY(LibraryIntroPage)
public:
explicit LibraryIntroPage(QWidget *parent = 0);
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
index 58ab9da9d96..87dc8e1fd22 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.h
@@ -43,7 +43,6 @@ namespace Internal {
class MobileAppWizardGenericOptionsPage : public QWizardPage
{
Q_OBJECT
- Q_DISABLE_COPY(MobileAppWizardGenericOptionsPage)
public:
explicit MobileAppWizardGenericOptionsPage(QWidget *parent = 0);
@@ -59,7 +58,6 @@ private:
class MobileAppWizardSymbianOptionsPage : public QWizardPage
{
Q_OBJECT
- Q_DISABLE_COPY(MobileAppWizardSymbianOptionsPage)
public:
explicit MobileAppWizardSymbianOptionsPage(QWidget *parent = 0);
@@ -82,7 +80,6 @@ private:
class MobileAppWizardMaemoOptionsPage : public QWizardPage
{
Q_OBJECT
- Q_DISABLE_COPY(MobileAppWizardMaemoOptionsPage)
public:
explicit MobileAppWizardMaemoOptionsPage(int appIconSize,
diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h
index a66cdaf049f..678d7b1cd6b 100644
--- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h
+++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.h
@@ -41,7 +41,6 @@ namespace Internal {
class MobileLibraryWizardOptionPage : public QWizardPage
{
Q_OBJECT
- Q_DISABLE_COPY(MobileLibraryWizardOptionPage)
public:
explicit MobileLibraryWizardOptionPage(QWidget *parent = 0);
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h
index 7ce96823d15..2555ecb6da7 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizardpages.h
@@ -42,7 +42,6 @@ namespace Internal {
class QtQuickComponentSetOptionsPage : public QWizardPage
{
Q_OBJECT
- Q_DISABLE_COPY(QtQuickComponentSetOptionsPage)
public:
explicit QtQuickComponentSetOptionsPage(QWidget *parent = 0);
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h
index 0005a8a5f5b..6e6d71d2b1b 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h
@@ -61,7 +61,6 @@ class ModulesPage;
class QtWizard : public Core::BaseFileWizard
{
Q_OBJECT
- Q_DISABLE_COPY(QtWizard)
protected:
QtWizard(const QString &id,
diff --git a/src/plugins/qt4projectmanager/wizards/testwizard.h b/src/plugins/qt4projectmanager/wizards/testwizard.h
index d7fa9dfb4e2..b950884db86 100644
--- a/src/plugins/qt4projectmanager/wizards/testwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/testwizard.h
@@ -41,7 +41,7 @@ namespace Internal {
class TestWizard : public QtWizard
{
Q_OBJECT
- Q_DISABLE_COPY(TestWizard)
+
public:
TestWizard();
@@ -52,10 +52,6 @@ protected:
virtual Core::GeneratedFiles generateFiles(const QWizard *w,
QString *errorMessage) const;
-signals:
-
-public slots:
-
};
} // namespace Internal
diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.h b/src/plugins/qtsupport/debugginghelperbuildtask.h
index 9a0a7fceeb0..8cc5a5dfec1 100644
--- a/src/plugins/qtsupport/debugginghelperbuildtask.h
+++ b/src/plugins/qtsupport/debugginghelperbuildtask.h
@@ -43,9 +43,10 @@
namespace QtSupport {
class BaseQtVersion;
-class QTSUPPORT_EXPORT DebuggingHelperBuildTask : public QObject {
- Q_DISABLE_COPY(DebuggingHelperBuildTask)
+class QTSUPPORT_EXPORT DebuggingHelperBuildTask : public QObject
+{
Q_OBJECT
+
public:
enum DebuggingHelper {
GdbDebugging = 0x01,
@@ -87,7 +88,7 @@ private:
bool m_showErrors;
};
-} //namespace Qt4ProjectManager
+} // namespace Qt4ProjectManager
Q_DECLARE_METATYPE(QtSupport::DebuggingHelperBuildTask::Tools)
diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp
index 3747ea242c0..81a6fad47a3 100644
--- a/src/plugins/qtsupport/qmldumptool.cpp
+++ b/src/plugins/qtsupport/qmldumptool.cpp
@@ -62,9 +62,10 @@ typedef QHash<int, QmlDumpBuildTask *> QmlDumpByVersion;
Q_GLOBAL_STATIC(QmlDumpByVersion, qmlDumpBuilds)
// A task suitable to be run by QtConcurrent to build qmldump.
-class QmlDumpBuildTask : public QObject {
- Q_DISABLE_COPY(QmlDumpBuildTask)
+class QmlDumpBuildTask : public QObject
+{
Q_OBJECT
+
public:
explicit QmlDumpBuildTask(BaseQtVersion *version)
: m_buildTask(new DebuggingHelperBuildTask(version, DebuggingHelperBuildTask::QmlDump))
diff --git a/src/plugins/qtsupport/qtoptionspage.h b/src/plugins/qtsupport/qtoptionspage.h
index 64bc3ba08c4..ca4168062b2 100644
--- a/src/plugins/qtsupport/qtoptionspage.h
+++ b/src/plugins/qtsupport/qtoptionspage.h
@@ -58,7 +58,7 @@ class DebuggingHelper;
class QtOptionsPageWidget : public QWidget
{
Q_OBJECT
- Q_DISABLE_COPY(QtOptionsPageWidget)
+
public:
QtOptionsPageWidget(QWidget *parent, QList<BaseQtVersion *> versions);
~QtOptionsPageWidget();
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
index f131ba6f26f..2ba0f84e8df 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
@@ -48,7 +48,7 @@ class Qt4MaemoDeployConfiguration;
class REMOTELINUX_EXPORT AbstractRemoteLinuxDeployStep : public ProjectExplorer::BuildStep
{
Q_OBJECT
- Q_DISABLE_COPY(AbstractRemoteLinuxDeployStep)
+
public:
bool fromMap(const QVariantMap &map);
QVariantMap toMap() const;
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h
index 922153133ee..22601fbe20a 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.h
+++ b/src/plugins/remotelinux/genericdirectuploadstep.h
@@ -41,7 +41,7 @@ class GenericDirectUploadService;
class REMOTELINUX_EXPORT GenericDirectUploadStep : public AbstractRemoteLinuxDeployStep
{
Q_OBJECT
- Q_DISABLE_COPY(GenericDirectUploadStep)
+
public:
GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, const QString &id);
GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, GenericDirectUploadStep *other);
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h
index 16339771330..05e4557cc59 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h
@@ -40,7 +40,7 @@ namespace Internal {
class GenericLinuxDeviceConfigurationFactory : public ILinuxDeviceConfigurationFactory
{
Q_OBJECT
- Q_DISABLE_COPY(GenericLinuxDeviceConfigurationFactory)
+
public:
GenericLinuxDeviceConfigurationFactory(QObject *parent = 0);
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
index d639dd2552a..8ec5d9d88b1 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
@@ -42,7 +42,7 @@ class REMOTELINUX_EXPORT GenericLinuxDeviceConfigurationWizard
: public ILinuxDeviceConfigurationWizard
{
Q_OBJECT
- Q_DISABLE_COPY(GenericLinuxDeviceConfigurationWizard)
+
public:
GenericLinuxDeviceConfigurationWizard(QWidget *parent = 0);
~GenericLinuxDeviceConfigurationWizard();
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h
index 10b6e0df0f0..5bbc38c26f2 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h
@@ -49,7 +49,6 @@ class GenericLinuxDeviceConfigurationWizardSetupPagePrivate;
class REMOTELINUX_EXPORT GenericLinuxDeviceConfigurationWizardSetupPage : public QWizardPage
{
Q_OBJECT
- Q_DISABLE_COPY(GenericLinuxDeviceConfigurationWizardSetupPage)
public:
explicit GenericLinuxDeviceConfigurationWizardSetupPage(QWidget *parent = 0);
diff --git a/src/plugins/remotelinux/linuxdeviceconfiguration.h b/src/plugins/remotelinux/linuxdeviceconfiguration.h
index a03b0f15b66..2c8c8fa4443 100644
--- a/src/plugins/remotelinux/linuxdeviceconfiguration.h
+++ b/src/plugins/remotelinux/linuxdeviceconfiguration.h
@@ -124,7 +124,7 @@ private:
class REMOTELINUX_EXPORT ILinuxDeviceConfigurationWizard : public QWizard
{
Q_OBJECT
- Q_DISABLE_COPY(ILinuxDeviceConfigurationWizard)
+
public:
virtual LinuxDeviceConfiguration::Ptr deviceConfiguration()=0;
@@ -147,7 +147,7 @@ protected:
class REMOTELINUX_EXPORT ILinuxDeviceConfigurationFactory : public QObject
{
Q_OBJECT
- Q_DISABLE_COPY(ILinuxDeviceConfigurationFactory)
+
public:
/*!
A short, one-line description of what kind of device this factory supports.
diff --git a/src/plugins/remotelinux/linuxdeviceconfigurations.h b/src/plugins/remotelinux/linuxdeviceconfigurations.h
index 2e84c1976d0..03a72a397fa 100644
--- a/src/plugins/remotelinux/linuxdeviceconfigurations.h
+++ b/src/plugins/remotelinux/linuxdeviceconfigurations.h
@@ -47,7 +47,6 @@ namespace Internal {
class LinuxDeviceConfigurations : public QAbstractListModel
{
Q_OBJECT
- Q_DISABLE_COPY(LinuxDeviceConfigurations)
friend class MaemoDeviceConfigurationsSettingsWidget;
public:
static LinuxDeviceConfigurations *instance(QObject *parent = 0);
diff --git a/src/plugins/remotelinux/maddeuploadandinstallpackagesteps.cpp b/src/plugins/remotelinux/maddeuploadandinstallpackagesteps.cpp
index 7d5f5cbc113..3f3693aae0c 100644
--- a/src/plugins/remotelinux/maddeuploadandinstallpackagesteps.cpp
+++ b/src/plugins/remotelinux/maddeuploadandinstallpackagesteps.cpp
@@ -48,7 +48,7 @@ namespace {
class AbstractMaddeUploadAndInstallPackageAction : public AbstractUploadAndInstallPackageService
{
Q_OBJECT
- Q_DISABLE_COPY(AbstractMaddeUploadAndInstallPackageAction)
+
protected:
explicit AbstractMaddeUploadAndInstallPackageAction(AbstractRemoteLinuxDeployStep *step)
: AbstractUploadAndInstallPackageService(step)
@@ -86,7 +86,7 @@ protected:
class MaemoUploadAndInstallPackageAction : public AbstractMaddeUploadAndInstallPackageAction
{
Q_OBJECT
- Q_DISABLE_COPY(MaemoUploadAndInstallPackageAction)
+
public:
MaemoUploadAndInstallPackageAction(AbstractRemoteLinuxDeployStep *step)
: AbstractMaddeUploadAndInstallPackageAction(step),
@@ -103,7 +103,7 @@ private:
class MeegoUploadAndInstallPackageAction : public AbstractMaddeUploadAndInstallPackageAction
{
Q_OBJECT
- Q_DISABLE_COPY(MeegoUploadAndInstallPackageAction)
+
public:
MeegoUploadAndInstallPackageAction(AbstractRemoteLinuxDeployStep *step)
: AbstractMaddeUploadAndInstallPackageAction(step),
diff --git a/src/plugins/remotelinux/maemodeploybymountsteps.cpp b/src/plugins/remotelinux/maemodeploybymountsteps.cpp
index 677877e71d4..70dd46a38ba 100644
--- a/src/plugins/remotelinux/maemodeploybymountsteps.cpp
+++ b/src/plugins/remotelinux/maemodeploybymountsteps.cpp
@@ -93,7 +93,7 @@ private:
class MaemoMountAndInstallPackageService : public AbstractMaemoDeployByMountService
{
Q_OBJECT
- Q_DISABLE_COPY(MaemoMountAndInstallPackageService)
+
public:
MaemoMountAndInstallPackageService(QObject *parent);
@@ -114,7 +114,7 @@ private:
class MaemoMountAndCopyFilesService : public AbstractMaemoDeployByMountService
{
Q_OBJECT
- Q_DISABLE_COPY(MaemoMountAndCopyFilesService)
+
public:
MaemoMountAndCopyFilesService(QObject *parent);
diff --git a/src/plugins/remotelinux/maemodeploybymountsteps.h b/src/plugins/remotelinux/maemodeploybymountsteps.h
index d8516662f1c..584bfb54599 100644
--- a/src/plugins/remotelinux/maemodeploybymountsteps.h
+++ b/src/plugins/remotelinux/maemodeploybymountsteps.h
@@ -41,7 +41,7 @@ class MaemoMountAndCopyFilesService;
class MaemoInstallPackageViaMountStep : public RemoteLinux::AbstractRemoteLinuxDeployStep
{
Q_OBJECT
- Q_DISABLE_COPY(MaemoInstallPackageViaMountStep)
+
public:
MaemoInstallPackageViaMountStep(ProjectExplorer::BuildStepList *bsl);
MaemoInstallPackageViaMountStep(ProjectExplorer::BuildStepList *bsl,
@@ -64,7 +64,7 @@ private:
class MaemoCopyFilesViaMountStep : public RemoteLinux::AbstractRemoteLinuxDeployStep
{
Q_OBJECT
- Q_DISABLE_COPY(MaemoCopyFilesViaMountStep)
+
public:
MaemoCopyFilesViaMountStep(ProjectExplorer::BuildStepList *bsl);
MaemoCopyFilesViaMountStep(ProjectExplorer::BuildStepList *bsl,
diff --git a/src/plugins/remotelinux/maemorunconfiguration.h b/src/plugins/remotelinux/maemorunconfiguration.h
index f80adcc44b6..012292c6e5e 100644
--- a/src/plugins/remotelinux/maemorunconfiguration.h
+++ b/src/plugins/remotelinux/maemorunconfiguration.h
@@ -41,7 +41,7 @@ class MaemoRemoteMountsModel;
class MaemoRunConfiguration : public RemoteLinuxRunConfiguration
{
Q_OBJECT
- Q_DISABLE_COPY(MaemoRunConfiguration)
+
public:
MaemoRunConfiguration(AbstractQt4MaemoTarget *parent, const QString &proFilePath);
MaemoRunConfiguration(AbstractQt4MaemoTarget *parent, MaemoRunConfiguration *source);
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
index 63b56807315..82c6bfd210e 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h
@@ -45,7 +45,7 @@ class UploadAndInstallTarPackageActionPrivate;
class REMOTELINUX_EXPORT UploadAndInstallTarPackageService : public AbstractUploadAndInstallPackageService
{
Q_OBJECT
- Q_DISABLE_COPY(UploadAndInstallTarPackageService)
+
public:
explicit UploadAndInstallTarPackageService(QObject *parent);
~UploadAndInstallTarPackageService();
@@ -60,7 +60,7 @@ private:
class REMOTELINUX_EXPORT UploadAndInstallTarPackageStep : public AbstractRemoteLinuxDeployStep
{
Q_OBJECT
- Q_DISABLE_COPY(UploadAndInstallTarPackageStep)
+
public:
explicit UploadAndInstallTarPackageStep(ProjectExplorer::BuildStepList *bsl);
UploadAndInstallTarPackageStep(ProjectExplorer::BuildStepList *bsl,
diff --git a/src/plugins/texteditor/generichighlighter/manager.h b/src/plugins/texteditor/generichighlighter/manager.h
index d157aa623ae..759540ea35c 100644
--- a/src/plugins/texteditor/generichighlighter/manager.h
+++ b/src/plugins/texteditor/generichighlighter/manager.h
@@ -98,7 +98,6 @@ signals:
private:
Manager();
- Q_DISABLE_COPY(Manager)
void gatherDefinitionsMimeTypes(QFutureInterface<Core::MimeType> &future);
QList<HighlightDefinitionMetaData> parseAvailableDefinitionsList(QIODevice *device) const;
diff --git a/src/plugins/texteditor/snippets/snippetscollection.h b/src/plugins/texteditor/snippets/snippetscollection.h
index 97458a4a007..3cc6d6215dc 100644
--- a/src/plugins/texteditor/snippets/snippetscollection.h
+++ b/src/plugins/texteditor/snippets/snippetscollection.h
@@ -104,7 +104,6 @@ private slots:
private:
SnippetsCollection();
- Q_DISABLE_COPY(SnippetsCollection)
int groupIndex(const QString &groupId) const;
bool isGroupKnown(const QString &groupId) const;
diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h
index fe61561fc21..7aa6b5fb94c 100644
--- a/src/plugins/texteditor/syntaxhighlighter.h
+++ b/src/plugins/texteditor/syntaxhighlighter.h
@@ -90,7 +90,6 @@ protected:
QTextBlock currentBlock() const;
private:
- Q_DISABLE_COPY(SyntaxHighlighter)
Q_PRIVATE_SLOT(d_ptr, void _q_reformatBlocks(int from, int charsRemoved, int charsAdded))
Q_PRIVATE_SLOT(d_ptr, void _q_delayedRehighlight())
diff --git a/src/plugins/valgrind/callgrind/callgrindparser.h b/src/plugins/valgrind/callgrind/callgrindparser.h
index 40ee2235245..db43c801009 100644
--- a/src/plugins/valgrind/callgrind/callgrindparser.h
+++ b/src/plugins/valgrind/callgrind/callgrindparser.h
@@ -72,8 +72,6 @@ public Q_SLOTS:
void parse(QIODevice *stream);
private:
- Q_DISABLE_COPY(Parser)
-
class Private;
Private *const d;
};
diff --git a/src/plugins/vcsbase/checkoutprogresswizardpage.h b/src/plugins/vcsbase/checkoutprogresswizardpage.h
index 9938bc2f633..5837de9c0be 100644
--- a/src/plugins/vcsbase/checkoutprogresswizardpage.h
+++ b/src/plugins/vcsbase/checkoutprogresswizardpage.h
@@ -45,9 +45,9 @@ namespace Ui {
class CheckoutProgressWizardPage;
}
-class CheckoutProgressWizardPage : public QWizardPage {
+class CheckoutProgressWizardPage : public QWizardPage
+{
Q_OBJECT
- Q_DISABLE_COPY(CheckoutProgressWizardPage)
public:
enum State { Idle, Running, Failed, Succeeded };
diff --git a/src/shared/symbianutils/codamessage.h b/src/shared/symbianutils/codamessage.h
index 04e22a24ce7..f61fdeba4fb 100644
--- a/src/shared/symbianutils/codamessage.h
+++ b/src/shared/symbianutils/codamessage.h
@@ -157,8 +157,10 @@ struct SYMBIANUTILS_EXPORT Breakpoint {
SYMBIANUTILS_EXPORT JsonInputStream &operator<<(JsonInputStream &str, const Breakpoint &b);
// Event hierarchy
-class SYMBIANUTILS_EXPORT CodaEvent {
+class SYMBIANUTILS_EXPORT CodaEvent
+{
Q_DISABLE_COPY(CodaEvent)
+
public:
enum Type { None,
LocatorHello,
diff --git a/src/shared/symbianutils/symbiandevicemanager.h b/src/shared/symbianutils/symbiandevicemanager.h
index 334ea920a5a..0a8dd48b5bb 100644
--- a/src/shared/symbianutils/symbiandevicemanager.h
+++ b/src/shared/symbianutils/symbiandevicemanager.h
@@ -197,7 +197,6 @@ private slots:
private:
OstChannel(const CodaDevicePtr &codaPtr, uchar channelId);
- Q_DISABLE_COPY(OstChannel)
qint64 readData(char *data, qint64 maxSize);
qint64 writeData(const char *data, qint64 maxSize);
diff --git a/src/shared/symbianutils/virtualserialdevice.h b/src/shared/symbianutils/virtualserialdevice.h
index 42000d3b4c1..3b3695ad5f3 100644
--- a/src/shared/symbianutils/virtualserialdevice.h
+++ b/src/shared/symbianutils/virtualserialdevice.h
@@ -69,7 +69,6 @@ protected:
qint64 writeData(const char *data, qint64 maxSize);
private:
- Q_DISABLE_COPY(VirtualSerialDevice)
void platInit();
void platClose();
void emitBytesWrittenIfNeeded(QMutexLocker &locker, qint64 len);
--
GitLab