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

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: default avatarhjk <qthjk@ovi.com>
parent 9ec07bf2
......@@ -54,9 +54,7 @@ signals:
void parentDummyChanged();
private:
Q_DISABLE_COPY(DummyContextObject)
QWeakPointer<QObject> m_dummyParent;
};
} // namespace QmlDesigner
......
......@@ -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:
......
......@@ -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;
......
......@@ -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 };
......
......@@ -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)
......
......@@ -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);
......
......@@ -67,7 +67,6 @@ private:
class QTCREATOR_UTILS_EXPORT FancyLineEdit : public QLineEdit
{
Q_DISABLE_COPY(FancyLineEdit)
Q_OBJECT
Q_ENUMS(Side)
......
......@@ -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);
......
......@@ -44,8 +44,8 @@ class FileSystemWatcherPrivate;
// Documentation inside.
class QTCREATOR_UTILS_EXPORT FileSystemWatcher : public QObject
{
Q_DISABLE_COPY(FileSystemWatcher)
Q_OBJECT
public:
enum WatchMode
{
......
......@@ -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
......@@ -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);
......
......@@ -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();
......
......@@ -42,7 +42,6 @@ class IpAddressLineEditPrivate;
class QTCREATOR_UTILS_EXPORT IpAddressLineEdit : public Utils::BaseValidatingLineEdit
{
Q_DISABLE_COPY(IpAddressLineEdit)
Q_OBJECT
public:
......
......@@ -46,10 +46,6 @@ LineColumnLabel::LineColumnLabel(QWidget *parent)
{
}
LineColumnLabel::~LineColumnLabel()
{
}
void LineColumnLabel::setText(const QString &text, const QString &maxText)
{
QLabel::setText(text);
......
......@@ -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;
......
......@@ -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,
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment