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/designer/src/lib/shared/qtresourcemodel_p.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/designer/src/lib/shared/qtresourcemodel_p.h')
| -rw-r--r-- | tools/designer/src/lib/shared/qtresourcemodel_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/designer/src/lib/shared/qtresourcemodel_p.h b/tools/designer/src/lib/shared/qtresourcemodel_p.h index e9f1c93..22e98bb 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_PRIVATE(QtResourceSet) + Q_DECLARE_SCOPED_PRIVATE(QtResourceSet) Q_DISABLE_COPY(QtResourceSet) }; @@ -134,7 +134,7 @@ private: friend class QtResourceSet; QScopedPointer<class QtResourceModelPrivate> d_ptr; - Q_DECLARE_PRIVATE(QtResourceModel) + Q_DECLARE_SCOPED_PRIVATE(QtResourceModel) Q_DISABLE_COPY(QtResourceModel) Q_PRIVATE_SLOT(d_func(), void slotFileChanged(const QString &)) |