diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-03 13:12:46 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-03 13:12:46 (GMT) |
| commit | 41a83e1ff19ad1396e6001e6b0ac003c701ba55a (patch) | |
| tree | 609e40eda10418bbf925002c36552074796b96b6 /tools/shared/qtpropertybrowser/qtpropertybrowser.h | |
| parent | d1f3b9df2bc5c57d414da73a7d4f9ed7b25df3db (diff) | |
| download | Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.zip Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.gz Qt-41a83e1ff19ad1396e6001e6b0ac003c701ba55a.tar.bz2 | |
Squashed commit of the topic/exceptions branch.
Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)
Diffstat (limited to 'tools/shared/qtpropertybrowser/qtpropertybrowser.h')
| -rw-r--r-- | tools/shared/qtpropertybrowser/qtpropertybrowser.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.h b/tools/shared/qtpropertybrowser/qtpropertybrowser.h index 19996c0..dfcb65a 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_PRIVATE(QtAbstractPropertyManager) + Q_DECLARE_SCOPED_PRIVATE(QtAbstractPropertyManager) Q_DISABLE_COPY(QtAbstractPropertyManager) }; @@ -293,7 +293,7 @@ private: QtAbstractEditorFactoryBase *abstractFactory); QScopedPointer<QtAbstractPropertyBrowserPrivate> d_ptr; - Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) + Q_DECLARE_SCOPED_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) |