diff options
author | Harald Fernengel <harald@trolltech.com> | 2009-08-06 10:04:36 (GMT) |
---|---|---|
committer | Harald Fernengel <harald@trolltech.com> | 2009-08-06 10:04:36 (GMT) |
commit | e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7 (patch) | |
tree | c01e05d0ea5a42fa1ab5f2f5e686806bcd8e5280 /tools | |
parent | 7588eaee83776b510eabdb9206e3cabcb3ee9dc2 (diff) | |
download | Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.zip Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.tar.gz Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.tar.bz2 |
Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE
Rationale: We're using template magic now to get the private
pointer in qglobal.h, so no need to have two macros. Also
keeps backward compatibility with outside (KDE) code.
Diffstat (limited to 'tools')
24 files changed, 65 insertions, 65 deletions
diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.h b/tools/designer/src/components/formeditor/brushmanagerproxy.h index 9314120..bfd95e5 100644 --- a/tools/designer/src/components/formeditor/brushmanagerproxy.h +++ b/tools/designer/src/components/formeditor/brushmanagerproxy.h @@ -64,7 +64,7 @@ public: private: QScopedPointer<BrushManagerProxyPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(BrushManagerProxy) + Q_DECLARE_PRIVATE(BrushManagerProxy) Q_DISABLE_COPY(BrushManagerProxy) Q_PRIVATE_SLOT(d_func(), void brushAdded(const QString &, const QBrush &)) Q_PRIVATE_SLOT(d_func(), void brushRemoved(const QString &name)) diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.h b/tools/designer/src/components/formeditor/qtbrushmanager.h index e6ced60..4884c577 100644 --- a/tools/designer/src/components/formeditor/qtbrushmanager.h +++ b/tools/designer/src/components/formeditor/qtbrushmanager.h @@ -78,7 +78,7 @@ signals: private: QScopedPointer<QtBrushManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtBrushManager) + Q_DECLARE_PRIVATE(QtBrushManager) Q_DISABLE_COPY(QtBrushManager) }; diff --git a/tools/designer/src/lib/shared/iconselector_p.h b/tools/designer/src/lib/shared/iconselector_p.h index e91a21e..9190d54 100644 --- a/tools/designer/src/lib/shared/iconselector_p.h +++ b/tools/designer/src/lib/shared/iconselector_p.h @@ -88,7 +88,7 @@ public: private: QScopedPointer<class LanguageResourceDialogPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(LanguageResourceDialog) + Q_DECLARE_PRIVATE(LanguageResourceDialog) Q_DISABLE_COPY(LanguageResourceDialog) Q_PRIVATE_SLOT(d_func(), void slotAccepted()) Q_PRIVATE_SLOT(d_func(), void slotPathChanged(QString)) @@ -121,7 +121,7 @@ signals: void iconChanged(const PropertySheetIconValue &icon); private: QScopedPointer<class IconSelectorPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(IconSelector) + Q_DECLARE_PRIVATE(IconSelector) Q_DISABLE_COPY(IconSelector) Q_PRIVATE_SLOT(d_func(), void slotStateActivated()) diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h index 59c5ca6..6eac2b8 100644 --- a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h +++ b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h @@ -85,7 +85,7 @@ private: ~QtResourceEditorDialog(); QScopedPointer<class QtResourceEditorDialogPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtResourceEditorDialog) + Q_DECLARE_PRIVATE(QtResourceEditorDialog) Q_DISABLE_COPY(QtResourceEditorDialog) Q_PRIVATE_SLOT(d_func(), void slotQrcFileInserted(QtQrcFile *)) diff --git a/tools/designer/src/lib/shared/qtresourcemodel_p.h b/tools/designer/src/lib/shared/qtresourcemodel_p.h index 22e98bb..e9f1c93 100644 --- a/tools/designer/src/lib/shared/qtresourcemodel_p.h +++ b/tools/designer/src/lib/shared/qtresourcemodel_p.h @@ -89,7 +89,7 @@ private: friend class QtResourceModel; QScopedPointer<class QtResourceSetPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtResourceSet) + Q_DECLARE_PRIVATE(QtResourceSet) Q_DISABLE_COPY(QtResourceSet) }; @@ -134,7 +134,7 @@ private: friend class QtResourceSet; QScopedPointer<class QtResourceModelPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtResourceModel) + Q_DECLARE_PRIVATE(QtResourceModel) Q_DISABLE_COPY(QtResourceModel) Q_PRIVATE_SLOT(d_func(), void slotFileChanged(const QString &)) diff --git a/tools/designer/src/lib/shared/qtresourceview_p.h b/tools/designer/src/lib/shared/qtresourceview_p.h index 82bb8d8..0484686 100644 --- a/tools/designer/src/lib/shared/qtresourceview_p.h +++ b/tools/designer/src/lib/shared/qtresourceview_p.h @@ -103,7 +103,7 @@ protected: private: QScopedPointer<class QtResourceViewPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtResourceView) + Q_DECLARE_PRIVATE(QtResourceView) Q_DISABLE_COPY(QtResourceView) Q_PRIVATE_SLOT(d_func(), void slotResourceSetActivated(QtResourceSet *)) Q_PRIVATE_SLOT(d_func(), void slotCurrentPathChanged(QTreeWidgetItem *)) @@ -131,7 +131,7 @@ public: private: QScopedPointer<class QtResourceViewDialogPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtResourceViewDialog) + Q_DECLARE_PRIVATE(QtResourceViewDialog) Q_DISABLE_COPY(QtResourceViewDialog) Q_PRIVATE_SLOT(d_func(), void slotResourceSelected(const QString &)) }; diff --git a/tools/designer/src/uitools/quiloader.h b/tools/designer/src/uitools/quiloader.h index 7f718a6..40b5010 100644 --- a/tools/designer/src/uitools/quiloader.h +++ b/tools/designer/src/uitools/quiloader.h @@ -92,7 +92,7 @@ public: private: QScopedPointer<QUiLoaderPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QUiLoader) + Q_DECLARE_PRIVATE(QUiLoader) Q_DISABLE_COPY(QUiLoader) }; diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.h b/tools/shared/qtgradienteditor/qtcolorbutton.h index 5f34815..0348998 100644 --- a/tools/shared/qtgradienteditor/qtcolorbutton.h +++ b/tools/shared/qtgradienteditor/qtcolorbutton.h @@ -76,7 +76,7 @@ protected: #endif private: QScopedPointer<class QtColorButtonPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtColorButton) + Q_DECLARE_PRIVATE(QtColorButton) Q_DISABLE_COPY(QtColorButton) Q_PRIVATE_SLOT(d_func(), void slotEditColor()) }; diff --git a/tools/shared/qtgradienteditor/qtcolorline.h b/tools/shared/qtgradienteditor/qtcolorline.h index f54ec70..ffd3eea 100644 --- a/tools/shared/qtgradienteditor/qtcolorline.h +++ b/tools/shared/qtgradienteditor/qtcolorline.h @@ -115,7 +115,7 @@ protected: private: QScopedPointer<class QtColorLinePrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtColorLine) + Q_DECLARE_PRIVATE(QtColorLine) Q_DISABLE_COPY(QtColorLine) }; diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.h b/tools/shared/qtgradienteditor/qtgradientdialog.h index 6f40794..f293a28 100644 --- a/tools/shared/qtgradienteditor/qtgradientdialog.h +++ b/tools/shared/qtgradienteditor/qtgradientdialog.h @@ -77,7 +77,7 @@ public: private: QScopedPointer<class QtGradientDialogPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientDialog) + Q_DECLARE_PRIVATE(QtGradientDialog) Q_DISABLE_COPY(QtGradientDialog) Q_PRIVATE_SLOT(d_func(), void slotAboutToShowDetails(bool details, int extensionWidthHint)) }; diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.h b/tools/shared/qtgradienteditor/qtgradienteditor.h index b7dcfd3..2d96515 100644 --- a/tools/shared/qtgradienteditor/qtgradienteditor.h +++ b/tools/shared/qtgradienteditor/qtgradienteditor.h @@ -79,7 +79,7 @@ signals: private: QScopedPointer<class QtGradientEditorPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientEditor) + Q_DECLARE_PRIVATE(QtGradientEditor) Q_DISABLE_COPY(QtGradientEditor) Q_PRIVATE_SLOT(d_func(), void slotGradientStopsChanged(const QGradientStops &stops)) Q_PRIVATE_SLOT(d_func(), void slotTypeChanged(int type)) diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h index 94a5619..7c6a660 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h +++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h @@ -71,7 +71,7 @@ signals: private: QScopedPointer<class QtGradientStopsControllerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsController) + Q_DECLARE_PRIVATE(QtGradientStopsController) Q_DISABLE_COPY(QtGradientStopsController) Q_PRIVATE_SLOT(d_func(), void slotHsvClicked()) Q_PRIVATE_SLOT(d_func(), void slotRgbClicked()) diff --git a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h index 8190829..a02ebc5 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h +++ b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h @@ -112,7 +112,7 @@ signals: private: QScopedPointer<class QtGradientStopsModelPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsModel) + Q_DECLARE_PRIVATE(QtGradientStopsModel) Q_DISABLE_COPY(QtGradientStopsModel) }; diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.h b/tools/shared/qtgradienteditor/qtgradientstopswidget.h index 7c7c5fc..753d695 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopswidget.h +++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.h @@ -92,7 +92,7 @@ protected: private: QScopedPointer<QtGradientStopsWidgetPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsWidget) + Q_DECLARE_PRIVATE(QtGradientStopsWidget) Q_DISABLE_COPY(QtGradientStopsWidget) Q_PRIVATE_SLOT(d_func(), void slotStopAdded(QtGradientStop *stop)) Q_PRIVATE_SLOT(d_func(), void slotStopRemoved(QtGradientStop *stop)) diff --git a/tools/shared/qtgradienteditor/qtgradientwidget.h b/tools/shared/qtgradienteditor/qtgradientwidget.h index 52fdcbb..3e23bf9 100644 --- a/tools/shared/qtgradienteditor/qtgradientwidget.h +++ b/tools/shared/qtgradienteditor/qtgradientwidget.h @@ -111,7 +111,7 @@ protected: private: QScopedPointer<class QtGradientWidgetPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientWidget) + Q_DECLARE_PRIVATE(QtGradientWidget) Q_DISABLE_COPY(QtGradientWidget) }; diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h index 13d37e2..a558657 100644 --- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h @@ -72,7 +72,7 @@ protected: private: QScopedPointer<QtButtonPropertyBrowserPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtButtonPropertyBrowser) + Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.h b/tools/shared/qtpropertybrowser/qteditorfactory.h index ec30f9d..bad2080 100644 --- a/tools/shared/qtpropertybrowser/qteditorfactory.h +++ b/tools/shared/qtpropertybrowser/qteditorfactory.h @@ -61,7 +61,7 @@ protected: void disconnectPropertyManager(QtIntPropertyManager *manager); private: QScopedPointer<QtSpinBoxFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtSpinBoxFactory) + Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) @@ -85,7 +85,7 @@ protected: void disconnectPropertyManager(QtIntPropertyManager *manager); private: QScopedPointer<QtSliderFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtSliderFactory) + Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) @@ -109,7 +109,7 @@ protected: void disconnectPropertyManager(QtIntPropertyManager *manager); private: QScopedPointer<QtScrollBarFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtScrollBarFactory) + Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) @@ -133,7 +133,7 @@ protected: void disconnectPropertyManager(QtBoolPropertyManager *manager); private: QScopedPointer<QtCheckBoxFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtCheckBoxFactory) + Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) @@ -155,7 +155,7 @@ protected: void disconnectPropertyManager(QtDoublePropertyManager *manager); private: QScopedPointer<QtDoubleSpinBoxFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDoubleSpinBoxFactory) + Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) @@ -180,7 +180,7 @@ protected: void disconnectPropertyManager(QtStringPropertyManager *manager); private: QScopedPointer<QtLineEditFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtLineEditFactory) + Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) @@ -203,7 +203,7 @@ protected: void disconnectPropertyManager(QtDatePropertyManager *manager); private: QScopedPointer<QtDateEditFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDateEditFactory) + Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, @@ -227,7 +227,7 @@ protected: void disconnectPropertyManager(QtTimePropertyManager *manager); private: QScopedPointer<QtTimeEditFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtTimeEditFactory) + Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) @@ -249,7 +249,7 @@ protected: void disconnectPropertyManager(QtDateTimePropertyManager *manager); private: QScopedPointer<QtDateTimeEditFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDateTimeEditFactory) + Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) @@ -271,7 +271,7 @@ protected: void disconnectPropertyManager(QtKeySequencePropertyManager *manager); private: QScopedPointer<QtKeySequenceEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtKeySequenceEditorFactory) + Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) @@ -293,7 +293,7 @@ protected: void disconnectPropertyManager(QtCharPropertyManager *manager); private: QScopedPointer<QtCharEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtCharEditorFactory) + Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) @@ -315,7 +315,7 @@ protected: void disconnectPropertyManager(QtEnumPropertyManager *manager); private: QScopedPointer<QtEnumEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtEnumEditorFactory) + Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, @@ -341,7 +341,7 @@ protected: void disconnectPropertyManager(QtCursorPropertyManager *manager); private: QScopedPointer<QtCursorEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtCursorEditorFactory) + Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) @@ -363,7 +363,7 @@ protected: void disconnectPropertyManager(QtColorPropertyManager *manager); private: QScopedPointer<QtColorEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtColorEditorFactory) + Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) @@ -385,7 +385,7 @@ protected: void disconnectPropertyManager(QtFontPropertyManager *manager); private: QScopedPointer<QtFontEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtFontEditorFactory) + Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h index 5124fd5..1cfda63 100644 --- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h @@ -64,7 +64,7 @@ protected: private: QScopedPointer<QtGroupBoxPropertyBrowserPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGroupBoxPropertyBrowser) + Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.h b/tools/shared/qtpropertybrowser/qtpropertybrowser.h index dfcb65a..19996c0 100644 --- a/tools/shared/qtpropertybrowser/qtpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.h @@ -119,7 +119,7 @@ protected: private: friend class QtProperty; QScopedPointer<QtAbstractPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtAbstractPropertyManager) + Q_DECLARE_PRIVATE(QtAbstractPropertyManager) Q_DISABLE_COPY(QtAbstractPropertyManager) }; @@ -293,7 +293,7 @@ private: QtAbstractEditorFactoryBase *abstractFactory); QScopedPointer<QtAbstractPropertyBrowserPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtAbstractPropertyBrowser) + Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.h b/tools/shared/qtpropertybrowser/qtpropertymanager.h index 14b71fb..31c308e 100644 --- a/tools/shared/qtpropertybrowser/qtpropertymanager.h +++ b/tools/shared/qtpropertybrowser/qtpropertymanager.h @@ -95,7 +95,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtIntPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtIntPropertyManager) + Q_DECLARE_PRIVATE(QtIntPropertyManager) Q_DISABLE_COPY(QtIntPropertyManager) }; @@ -121,7 +121,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtBoolPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtBoolPropertyManager) + Q_DECLARE_PRIVATE(QtBoolPropertyManager) Q_DISABLE_COPY(QtBoolPropertyManager) }; @@ -158,7 +158,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtDoublePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDoublePropertyManager) + Q_DECLARE_PRIVATE(QtDoublePropertyManager) Q_DISABLE_COPY(QtDoublePropertyManager) }; @@ -186,7 +186,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtStringPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtStringPropertyManager) + Q_DECLARE_PRIVATE(QtStringPropertyManager) Q_DISABLE_COPY(QtStringPropertyManager) }; @@ -217,7 +217,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtDatePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDatePropertyManager) + Q_DECLARE_PRIVATE(QtDatePropertyManager) Q_DISABLE_COPY(QtDatePropertyManager) }; @@ -242,7 +242,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtTimePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtTimePropertyManager) + Q_DECLARE_PRIVATE(QtTimePropertyManager) Q_DISABLE_COPY(QtTimePropertyManager) }; @@ -267,7 +267,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtDateTimePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDateTimePropertyManager) + Q_DECLARE_PRIVATE(QtDateTimePropertyManager) Q_DISABLE_COPY(QtDateTimePropertyManager) }; @@ -292,7 +292,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtKeySequencePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtKeySequencePropertyManager) + Q_DECLARE_PRIVATE(QtKeySequencePropertyManager) Q_DISABLE_COPY(QtKeySequencePropertyManager) }; @@ -317,7 +317,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtCharPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtCharPropertyManager) + Q_DECLARE_PRIVATE(QtCharPropertyManager) Q_DISABLE_COPY(QtCharPropertyManager) }; @@ -345,7 +345,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtLocalePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtLocalePropertyManager) + Q_DECLARE_PRIVATE(QtLocalePropertyManager) Q_DISABLE_COPY(QtLocalePropertyManager) Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -374,7 +374,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtPointPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtPointPropertyManager) + Q_DECLARE_PRIVATE(QtPointPropertyManager) Q_DISABLE_COPY(QtPointPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -406,7 +406,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtPointFPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtPointFPropertyManager) + Q_DECLARE_PRIVATE(QtPointFPropertyManager) Q_DISABLE_COPY(QtPointFPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -441,7 +441,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtSizePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtSizePropertyManager) + Q_DECLARE_PRIVATE(QtSizePropertyManager) Q_DISABLE_COPY(QtSizePropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -479,7 +479,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtSizeFPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtSizeFPropertyManager) + Q_DECLARE_PRIVATE(QtSizeFPropertyManager) Q_DISABLE_COPY(QtSizeFPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -511,7 +511,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtRectPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtRectPropertyManager) + Q_DECLARE_PRIVATE(QtRectPropertyManager) Q_DISABLE_COPY(QtRectPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -546,7 +546,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtRectFPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtRectFPropertyManager) + Q_DECLARE_PRIVATE(QtRectFPropertyManager) Q_DISABLE_COPY(QtRectFPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -580,7 +580,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtEnumPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtEnumPropertyManager) + Q_DECLARE_PRIVATE(QtEnumPropertyManager) Q_DISABLE_COPY(QtEnumPropertyManager) }; @@ -610,7 +610,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtFlagPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtFlagPropertyManager) + Q_DECLARE_PRIVATE(QtFlagPropertyManager) Q_DISABLE_COPY(QtFlagPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -640,7 +640,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtSizePolicyPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtSizePolicyPropertyManager) + Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager) Q_DISABLE_COPY(QtSizePolicyPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) @@ -673,7 +673,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtFontPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtFontPropertyManager) + Q_DECLARE_PRIVATE(QtFontPropertyManager) Q_DISABLE_COPY(QtFontPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) @@ -707,7 +707,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtColorPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtColorPropertyManager) + Q_DECLARE_PRIVATE(QtColorPropertyManager) Q_DISABLE_COPY(QtColorPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -737,7 +737,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtCursorPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtCursorPropertyManager) + Q_DECLARE_PRIVATE(QtCursorPropertyManager) Q_DISABLE_COPY(QtCursorPropertyManager) }; diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h index 4994bfc..ebcf185 100644 --- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h @@ -119,7 +119,7 @@ protected: private: QScopedPointer<QtTreePropertyBrowserPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtTreePropertyBrowser) + Q_DECLARE_PRIVATE(QtTreePropertyBrowser) Q_DISABLE_COPY(QtTreePropertyBrowser) Q_PRIVATE_SLOT(d_func(), void slotCollapsed(const QModelIndex &)) diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.h b/tools/shared/qtpropertybrowser/qtvariantproperty.h index f4f45da..4f32c57 100644 --- a/tools/shared/qtpropertybrowser/qtvariantproperty.h +++ b/tools/shared/qtpropertybrowser/qtvariantproperty.h @@ -149,7 +149,7 @@ private: Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) - Q_DECLARE_SCOPED_PRIVATE(QtVariantPropertyManager) + Q_DECLARE_PRIVATE(QtVariantPropertyManager) Q_DISABLE_COPY(QtVariantPropertyManager) }; @@ -166,7 +166,7 @@ protected: void disconnectPropertyManager(QtVariantPropertyManager *manager); private: QScopedPointer<class QtVariantEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtVariantEditorFactory) + Q_DECLARE_PRIVATE(QtVariantEditorFactory) Q_DISABLE_COPY(QtVariantEditorFactory) }; diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.cpp b/tools/shared/qttoolbardialog/qttoolbardialog.cpp index 0c4622f..8ceb582 100644 --- a/tools/shared/qttoolbardialog/qttoolbardialog.cpp +++ b/tools/shared/qttoolbardialog/qttoolbardialog.cpp @@ -120,7 +120,7 @@ signals: private: QScopedPointer<QtFullToolBarManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtFullToolBarManager) + Q_DECLARE_PRIVATE(QtFullToolBarManager) Q_DISABLE_COPY(QtFullToolBarManager) }; diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.h b/tools/shared/qttoolbardialog/qttoolbardialog.h index d3f7396..9227b56 100644 --- a/tools/shared/qttoolbardialog/qttoolbardialog.h +++ b/tools/shared/qttoolbardialog/qttoolbardialog.h @@ -89,7 +89,7 @@ private: friend class QtToolBarDialog; QScopedPointer<QtToolBarManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtToolBarManager) + Q_DECLARE_PRIVATE(QtToolBarManager) Q_DISABLE_COPY(QtToolBarManager) }; @@ -113,7 +113,7 @@ protected: private: QScopedPointer<QtToolBarDialogPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtToolBarDialog) + Q_DECLARE_PRIVATE(QtToolBarDialog) Q_DISABLE_COPY(QtToolBarDialog) Q_PRIVATE_SLOT(d_func(), void newClicked()) |