Commit 82bbac7f authored by hjk's avatar hjk Committed by hjk

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/1609Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 9ec07bf2
...@@ -54,9 +54,7 @@ signals: ...@@ -54,9 +54,7 @@ signals:
void parentDummyChanged(); void parentDummyChanged();
private: private:
Q_DISABLE_COPY(DummyContextObject)
QWeakPointer<QObject> m_dummyParent; QWeakPointer<QObject> m_dummyParent;
}; };
} // namespace QmlDesigner } // namespace QmlDesigner
......
...@@ -47,8 +47,9 @@ QT_END_NAMESPACE ...@@ -47,8 +47,9 @@ QT_END_NAMESPACE
namespace ExtensionSystem { namespace ExtensionSystem {
class PluginCollection; class PluginCollection;
namespace Internal { namespace Internal {
class PluginManagerPrivate; class PluginManagerPrivate;
} }
class IPlugin; class IPlugin;
...@@ -56,7 +57,6 @@ class PluginSpec; ...@@ -56,7 +57,6 @@ class PluginSpec;
class EXTENSIONSYSTEM_EXPORT PluginManager : public QObject class EXTENSIONSYSTEM_EXPORT PluginManager : public QObject
{ {
Q_DISABLE_COPY(PluginManager)
Q_OBJECT Q_OBJECT
public: public:
......
...@@ -101,8 +101,6 @@ signals: ...@@ -101,8 +101,6 @@ signals:
void zeroColorChanged(); void zeroColorChanged();
private: private:
Q_DISABLE_COPY(EasingGraph)
QColor m_color; QColor m_color;
QColor m_zeroColor; // the color for the "zero" and "one" lines QColor m_zeroColor; // the color for the "zero" and "one" lines
qreal m_duration; qreal m_duration;
......
...@@ -42,7 +42,7 @@ class QDeclarativeDebugConnectionPrivate; ...@@ -42,7 +42,7 @@ class QDeclarativeDebugConnectionPrivate;
class QDeclarativeDebugConnection : public QIODevice class QDeclarativeDebugConnection : public QIODevice
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(QDeclarativeDebugConnection)
public: public:
QDeclarativeDebugConnection(QObject * = 0); QDeclarativeDebugConnection(QObject * = 0);
~QDeclarativeDebugConnection(); ~QDeclarativeDebugConnection();
...@@ -77,7 +77,6 @@ class QDeclarativeDebugClient : public QObject ...@@ -77,7 +77,6 @@ class QDeclarativeDebugClient : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DECLARE_PRIVATE(QDeclarativeDebugClient) Q_DECLARE_PRIVATE(QDeclarativeDebugClient)
Q_DISABLE_COPY(QDeclarativeDebugClient)
public: public:
enum Status { NotConnected, Unavailable, Enabled }; enum Status { NotConnected, Unavailable, Enabled };
......
...@@ -44,7 +44,6 @@ struct BaseValidatingLineEditPrivate; ...@@ -44,7 +44,6 @@ struct BaseValidatingLineEditPrivate;
class QTCREATOR_UTILS_EXPORT BaseValidatingLineEdit : public QLineEdit class QTCREATOR_UTILS_EXPORT BaseValidatingLineEdit : public QLineEdit
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(BaseValidatingLineEdit)
Q_PROPERTY(QString initialText READ initialText WRITE setInitialText DESIGNABLE true) Q_PROPERTY(QString initialText READ initialText WRITE setInitialText DESIGNABLE true)
Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor DESIGNABLE true) Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor DESIGNABLE true)
......
...@@ -43,10 +43,9 @@ struct ClassNameValidatingLineEditPrivate; ...@@ -43,10 +43,9 @@ struct ClassNameValidatingLineEditPrivate;
class QTCREATOR_UTILS_EXPORT ClassNameValidatingLineEdit class QTCREATOR_UTILS_EXPORT ClassNameValidatingLineEdit
: public Utils::BaseValidatingLineEdit : public Utils::BaseValidatingLineEdit
{ {
Q_DISABLE_COPY(ClassNameValidatingLineEdit) Q_OBJECT
Q_PROPERTY(bool namespacesEnabled READ namespacesEnabled WRITE setNamespacesEnabled DESIGNABLE true) Q_PROPERTY(bool namespacesEnabled READ namespacesEnabled WRITE setNamespacesEnabled DESIGNABLE true)
Q_PROPERTY(bool lowerCaseFileName READ lowerCaseFileName WRITE setLowerCaseFileName) Q_PROPERTY(bool lowerCaseFileName READ lowerCaseFileName WRITE setLowerCaseFileName)
Q_OBJECT
public: public:
explicit ClassNameValidatingLineEdit(QWidget *parent = 0); explicit ClassNameValidatingLineEdit(QWidget *parent = 0);
......
...@@ -67,7 +67,6 @@ private: ...@@ -67,7 +67,6 @@ private:
class QTCREATOR_UTILS_EXPORT FancyLineEdit : public QLineEdit class QTCREATOR_UTILS_EXPORT FancyLineEdit : public QLineEdit
{ {
Q_DISABLE_COPY(FancyLineEdit)
Q_OBJECT Q_OBJECT
Q_ENUMS(Side) Q_ENUMS(Side)
......
...@@ -40,8 +40,8 @@ namespace Utils { ...@@ -40,8 +40,8 @@ namespace Utils {
class QTCREATOR_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit class QTCREATOR_UTILS_EXPORT FileNameValidatingLineEdit : public BaseValidatingLineEdit
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(FileNameValidatingLineEdit)
Q_PROPERTY(bool allowDirectories READ allowDirectories WRITE setAllowDirectories) Q_PROPERTY(bool allowDirectories READ allowDirectories WRITE setAllowDirectories)
public: public:
explicit FileNameValidatingLineEdit(QWidget *parent = 0); explicit FileNameValidatingLineEdit(QWidget *parent = 0);
......
...@@ -44,8 +44,8 @@ class FileSystemWatcherPrivate; ...@@ -44,8 +44,8 @@ class FileSystemWatcherPrivate;
// Documentation inside. // Documentation inside.
class QTCREATOR_UTILS_EXPORT FileSystemWatcher : public QObject class QTCREATOR_UTILS_EXPORT FileSystemWatcher : public QObject
{ {
Q_DISABLE_COPY(FileSystemWatcher)
Q_OBJECT Q_OBJECT
public: public:
enum WatchMode enum WatchMode
{ {
......
...@@ -120,7 +120,6 @@ public: ...@@ -120,7 +120,6 @@ public:
QFile *file() { return m_file; } QFile *file() { return m_file; }
private: private:
Q_DISABLE_COPY(FileSaver)
bool m_isSafe; bool m_isSafe;
}; };
...@@ -136,10 +135,9 @@ public: ...@@ -136,10 +135,9 @@ public:
void setAutoRemove(bool on) { m_autoRemove = on; } void setAutoRemove(bool on) { m_autoRemove = on; }
private: private:
Q_DISABLE_COPY(TempFileSaver)
bool m_autoRemove; bool m_autoRemove;
}; };
} } // namespace Utils
#endif // FILEUTILS_H #endif // FILEUTILS_H
...@@ -40,9 +40,9 @@ namespace Utils { ...@@ -40,9 +40,9 @@ namespace Utils {
class FileWizardPage; class FileWizardPage;
class QTCREATOR_UTILS_EXPORT FileWizardDialog : public Wizard { class QTCREATOR_UTILS_EXPORT FileWizardDialog : public Wizard
{
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(FileWizardDialog)
public: public:
explicit FileWizardDialog(QWidget *parent = 0); explicit FileWizardDialog(QWidget *parent = 0);
......
...@@ -44,9 +44,9 @@ struct FileWizardPagePrivate; ...@@ -44,9 +44,9 @@ struct FileWizardPagePrivate;
class QTCREATOR_UTILS_EXPORT FileWizardPage : public QWizardPage class QTCREATOR_UTILS_EXPORT FileWizardPage : public QWizardPage
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(FileWizardPage)
Q_PROPERTY(QString path READ path WRITE setPath DESIGNABLE true) Q_PROPERTY(QString path READ path WRITE setPath DESIGNABLE true)
Q_PROPERTY(QString fileName READ fileName WRITE setFileName DESIGNABLE true) Q_PROPERTY(QString fileName READ fileName WRITE setFileName DESIGNABLE true)
public: public:
explicit FileWizardPage(QWidget *parent = 0); explicit FileWizardPage(QWidget *parent = 0);
virtual ~FileWizardPage(); virtual ~FileWizardPage();
......
...@@ -42,7 +42,6 @@ class IpAddressLineEditPrivate; ...@@ -42,7 +42,6 @@ class IpAddressLineEditPrivate;
class QTCREATOR_UTILS_EXPORT IpAddressLineEdit : public Utils::BaseValidatingLineEdit class QTCREATOR_UTILS_EXPORT IpAddressLineEdit : public Utils::BaseValidatingLineEdit
{ {
Q_DISABLE_COPY(IpAddressLineEdit)
Q_OBJECT Q_OBJECT
public: public:
......
...@@ -46,10 +46,6 @@ LineColumnLabel::LineColumnLabel(QWidget *parent) ...@@ -46,10 +46,6 @@ LineColumnLabel::LineColumnLabel(QWidget *parent)
{ {
} }
LineColumnLabel::~LineColumnLabel()
{
}
void LineColumnLabel::setText(const QString &text, const QString &maxText) void LineColumnLabel::setText(const QString &text, const QString &maxText)
{ {
QLabel::setText(text); QLabel::setText(text);
......
...@@ -40,13 +40,11 @@ namespace Utils { ...@@ -40,13 +40,11 @@ namespace Utils {
class QTCREATOR_UTILS_EXPORT LineColumnLabel : public QLabel class QTCREATOR_UTILS_EXPORT LineColumnLabel : public QLabel
{ {
Q_DISABLE_COPY(LineColumnLabel)
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString maxText READ maxText WRITE setMaxText DESIGNABLE true) Q_PROPERTY(QString maxText READ maxText WRITE setMaxText DESIGNABLE true)
public: public:
explicit LineColumnLabel(QWidget *parent = 0); explicit LineColumnLabel(QWidget *parent = 0);
virtual ~LineColumnLabel();
void setText(const QString &text, const QString &maxText); void setText(const QString &text, const QString &maxText);
QSize sizeHint() const; QSize sizeHint() const;
......
...@@ -47,7 +47,6 @@ struct NewClassWidgetPrivate; ...@@ -47,7 +47,6 @@ struct NewClassWidgetPrivate;
class QTCREATOR_UTILS_EXPORT NewClassWidget : public QWidget class QTCREATOR_UTILS_EXPORT NewClassWidget : public QWidget
{ {
Q_DISABLE_COPY(NewClassWidget)
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool namespacesEnabled READ namespacesEnabled WRITE setNamespacesEnabled DESIGNABLE true) Q_PROPERTY(bool namespacesEnabled READ namespacesEnabled WRITE setNamespacesEnabled DESIGNABLE true)
Q_PROPERTY(bool baseClassInputVisible READ isBaseClassInputVisible WRITE setBaseClassInputVisible DESIGNABLE true) Q_PROPERTY(bool baseClassInputVisible READ isBaseClassInputVisible WRITE setBaseClassInputVisible DESIGNABLE true)
...@@ -73,6 +72,7 @@ class QTCREATOR_UTILS_EXPORT NewClassWidget : public QWidget ...@@ -73,6 +72,7 @@ class QTCREATOR_UTILS_EXPORT NewClassWidget : public QWidget
// Utility "USER" property for wizards containing file names. // Utility "USER" property for wizards containing file names.
Q_PROPERTY(QStringList files READ files DESIGNABLE false USER true) Q_PROPERTY(QStringList files READ files DESIGNABLE false USER true)
Q_ENUMS(ClassType) Q_ENUMS(ClassType)
public: public:
enum ClassType { NoClassType, ClassInheritsQObject, ClassInheritsQWidget, enum ClassType { NoClassType, ClassInheritsQObject, ClassInheritsQWidget,
ClassInheritsQDeclarativeItem, ClassInheritsQDeclarativeItem,
......
...@@ -50,7 +50,6 @@ class PathChooserPrivate; ...@@ -50,7 +50,6 @@ class PathChooserPrivate;
class QTCREATOR_UTILS_EXPORT PathChooser : public QWidget class QTCREATOR_UTILS_EXPORT PathChooser : public QWidget
{ {
Q_DISABLE_COPY(PathChooser)
Q_OBJECT Q_OBJECT
Q_ENUMS(Kind) Q_ENUMS(Kind)
Q_PROPERTY(QString path READ path WRITE setPath DESIGNABLE true) Q_PROPERTY(QString path READ path WRITE setPath DESIGNABLE true)
......
...@@ -48,7 +48,6 @@ struct PathListEditorPrivate; ...@@ -48,7 +48,6 @@ struct PathListEditorPrivate;
class QTCREATOR_UTILS_EXPORT PathListEditor : public QWidget class QTCREATOR_UTILS_EXPORT PathListEditor : public QWidget
{ {
Q_DISABLE_COPY(PathListEditor)
Q_OBJECT Q_OBJECT
Q_PROPERTY(QStringList pathList READ pathList WRITE setPathList DESIGNABLE true) Q_PROPERTY(QStringList pathList READ pathList WRITE setPathList DESIGNABLE true)
Q_PROPERTY(QString fileDialogTitle READ fileDialogTitle WRITE setFileDialogTitle DESIGNABLE true) Q_PROPERTY(QString fileDialogTitle READ fileDialogTitle WRITE setFileDialogTitle DESIGNABLE true)
......
...@@ -44,7 +44,6 @@ struct ProjectIntroPagePrivate; ...@@ -44,7 +44,6 @@ struct ProjectIntroPagePrivate;
class QTCREATOR_UTILS_EXPORT ProjectIntroPage : public QWizardPage class QTCREATOR_UTILS_EXPORT ProjectIntroPage : public QWizardPage
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(ProjectIntroPage)
Q_PROPERTY(QString description READ description WRITE setPath DESIGNABLE true) Q_PROPERTY(QString description READ description WRITE setPath DESIGNABLE true)
Q_PROPERTY(QString path READ path WRITE setPath DESIGNABLE true) Q_PROPERTY(QString path READ path WRITE setPath DESIGNABLE true)
Q_PROPERTY(QString projectName READ projectName WRITE setProjectName DESIGNABLE true) Q_PROPERTY(QString projectName READ projectName WRITE setProjectName DESIGNABLE true)
......
...@@ -40,7 +40,6 @@ namespace Utils { ...@@ -40,7 +40,6 @@ namespace Utils {
class QTCREATOR_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit class QTCREATOR_UTILS_EXPORT ProjectNameValidatingLineEdit : public BaseValidatingLineEdit
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(ProjectNameValidatingLineEdit)
public: public:
explicit ProjectNameValidatingLineEdit(QWidget *parent = 0); explicit ProjectNameValidatingLineEdit(QWidget *parent = 0);
......
...@@ -74,7 +74,6 @@ protected: ...@@ -74,7 +74,6 @@ protected:
private: private:
class QtColorButtonPrivate *d_ptr; class QtColorButtonPrivate *d_ptr;
friend class QtColorButtonPrivate; friend class QtColorButtonPrivate;
Q_DISABLE_COPY(QtColorButton)
}; };
} // namespace Utils } // namespace Utils
......
...@@ -53,13 +53,11 @@ public: ...@@ -53,13 +53,11 @@ public:
void setBackup(bool backup) { m_backup = backup; } void setBackup(bool backup) { m_backup = backup; }
private: private:
Q_DISABLE_COPY(SaveFile)
QString m_finalFileName; QString m_finalFileName;
bool m_finalized; bool m_finalized;
bool m_backup; bool m_backup;
}; };
} } // namespace Utils
#endif // SAVEFILE_H #endif // SAVEFILE_H
...@@ -73,7 +73,7 @@ QTCREATOR_UTILS_EXPORT bool operator!=(const SshConnectionParameters &p1, const ...@@ -73,7 +73,7 @@ QTCREATOR_UTILS_EXPORT bool operator!=(const SshConnectionParameters &p1, const
class QTCREATOR_UTILS_EXPORT SshConnection : public QObject class QTCREATOR_UTILS_EXPORT SshConnection : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(SshConnection)
public: public:
enum State { Unconnected, Connecting, Connected }; enum State { Unconnected, Connecting, Connected };
typedef QSharedPointer<SshConnection> Ptr; typedef QSharedPointer<SshConnection> Ptr;
......
...@@ -53,7 +53,6 @@ class SshSendFacility; ...@@ -53,7 +53,6 @@ class SshSendFacility;
class QTCREATOR_UTILS_EXPORT SshRemoteProcess : public QObject class QTCREATOR_UTILS_EXPORT SshRemoteProcess : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(SshRemoteProcess)
friend class Internal::SshChannelManager; friend class Internal::SshChannelManager;
friend class Internal::SshRemoteProcessPrivate; friend class Internal::SshRemoteProcessPrivate;
......
...@@ -44,7 +44,7 @@ class SshRemoteProcessRunnerPrivate; ...@@ -44,7 +44,7 @@ class SshRemoteProcessRunnerPrivate;
class QTCREATOR_UTILS_EXPORT SshRemoteProcessRunner : public QObject class QTCREATOR_UTILS_EXPORT SshRemoteProcessRunner : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(SshRemoteProcessRunner)
public: public:
typedef QSharedPointer<SshRemoteProcessRunner> Ptr; typedef QSharedPointer<SshRemoteProcessRunner> Ptr;
......
...@@ -55,7 +55,6 @@ struct SubmitEditorWidgetPrivate; ...@@ -55,7 +55,6 @@ struct SubmitEditorWidgetPrivate;
class QTCREATOR_UTILS_EXPORT SubmitEditorWidget : public QWidget class QTCREATOR_UTILS_EXPORT SubmitEditorWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(SubmitEditorWidget)
Q_PROPERTY(QString descriptionText READ descriptionText WRITE setDescriptionText DESIGNABLE true) Q_PROPERTY(QString descriptionText READ descriptionText WRITE setDescriptionText DESIGNABLE true)
Q_PROPERTY(int fileNameColumn READ fileNameColumn WRITE setFileNameColumn DESIGNABLE false) Q_PROPERTY(int fileNameColumn READ fileNameColumn WRITE setFileNameColumn DESIGNABLE false)
Q_PROPERTY(QAbstractItemView::SelectionMode fileListSelectionMode READ fileListSelectionMode WRITE setFileListSelectionMode DESIGNABLE true) Q_PROPERTY(QAbstractItemView::SelectionMode fileListSelectionMode READ fileListSelectionMode WRITE setFileListSelectionMode DESIGNABLE true)
......
...@@ -70,8 +70,6 @@ private slots: ...@@ -70,8 +70,6 @@ private slots:
void _q_pageRemoved(int pageId); void _q_pageRemoved(int pageId);
private: private:
Q_DISABLE_COPY(Wizard)
Q_DECLARE_PRIVATE(Wizard) Q_DECLARE_PRIVATE(Wizard)
class WizardPrivate *d_ptr; class WizardPrivate *d_ptr;
...@@ -124,7 +122,6 @@ private: ...@@ -124,7 +122,6 @@ private:
friend class Wizard; friend class Wizard;
friend class WizardProgressItem; friend class WizardProgressItem;
Q_DISABLE_COPY(WizardProgress)
Q_DECLARE_PRIVATE(WizardProgress) Q_DECLARE_PRIVATE(WizardProgress)
class WizardProgressPrivate *d_ptr; class WizardProgressPrivate *d_ptr;
...@@ -150,15 +147,12 @@ public: ...@@ -150,15 +147,12 @@ public:
bool titleWordWrap() const; bool titleWordWrap() const;
protected: protected:
WizardProgressItem(WizardProgress *progress, const QString &title); WizardProgressItem(WizardProgress *progress, const QString &title);
virtual ~WizardProgressItem(); virtual ~WizardProgressItem();
private: private:
friend class WizardProgress; friend class WizardProgress;
Q_DISABLE_COPY(WizardProgressItem)
Q_DECLARE_PRIVATE(WizardProgressItem) Q_DECLARE_PRIVATE(WizardProgressItem)
class WizardProgressItemPrivate *d_ptr; class WizardProgressItemPrivate *d_ptr;
......
...@@ -58,7 +58,6 @@ class NavigationWidgetFactory; ...@@ -58,7 +58,6 @@ class NavigationWidgetFactory;
class Manager : public QObject class Manager : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(Manager)
public: public:
/*! /*!
......
...@@ -53,7 +53,6 @@ namespace Internal { ...@@ -53,7 +53,6 @@ namespace Internal {
class NavigationWidget : public QWidget class NavigationWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(NavigationWidget)
public: public:
explicit NavigationWidget(QWidget *parent = 0); explicit NavigationWidget(QWidget *parent = 0);
......
...@@ -52,7 +52,6 @@ namespace Internal { ...@@ -52,7 +52,6 @@ namespace Internal {
class NavigationWidgetFactory : public Core::INavigationWidgetFactory class NavigationWidgetFactory : public Core::INavigationWidgetFactory
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(NavigationWidgetFactory)
public: public:
//! destructor //! destructor
......
...@@ -48,7 +48,6 @@ namespace Internal { ...@@ -48,7 +48,6 @@ namespace Internal {
class Plugin : public ExtensionSystem::IPlugin class Plugin : public ExtensionSystem::IPlugin
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(Plugin)
public: public:
//! Constructor //! Constructor
......
...@@ -379,7 +379,6 @@ void BaseFileWizardParameters::setDisplayCategory(const QString &v) ...@@ -379,7 +379,6 @@ void BaseFileWizardParameters::setDisplayCategory(const QString &v)
class WizardEventLoop : public QEventLoop class WizardEventLoop : public QEventLoop
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY(WizardEventLoop)
WizardEventLoop(QObject *parent); WizardEventLoop(QObject *parent);
public: public:
......
...@@ -150,7 +150,6 @@ CORE_EXPORT QDebug operator<<(QDebug d, const BaseFileWizardParameters &); ...@@ -150,7 +150,6 @@ CORE_EXPORT QDebug operator<<(QDebug d, const BaseFileWizardParameters &);
class CORE_EXPORT BaseFileWizard : public IWizard class CORE_EXPORT BaseFileWizard : public IWizard
{ {
Q_DISABLE_COPY(BaseFileWizard)