diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-06 12:04:36 +0200 |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-06 12:04:36 +0200 |
| commit | e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7 (patch) | |
| tree | c01e05d0ea5a42fa1ab5f2f5e686806bcd8e5280 /src/gui/itemviews/qstandarditemmodel.h | |
| parent | 7588eaee83776b510eabdb9206e3cabcb3ee9dc2 (diff) | |
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 'src/gui/itemviews/qstandarditemmodel.h')
| -rw-r--r-- | src/gui/itemviews/qstandarditemmodel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/itemviews/qstandarditemmodel.h b/src/gui/itemviews/qstandarditemmodel.h index 7e76a4ae87..c470b80727 100644 --- a/src/gui/itemviews/qstandarditemmodel.h +++ b/src/gui/itemviews/qstandarditemmodel.h @@ -245,7 +245,7 @@ protected: void emitDataChanged(); private: - Q_DECLARE_SCOPED_PRIVATE(QStandardItem) + Q_DECLARE_PRIVATE(QStandardItem) friend class QStandardItemModelPrivate; friend class QStandardItemModel; }; @@ -422,7 +422,7 @@ private: friend class QStandardItemPrivate; friend class QStandardItem; Q_DISABLE_COPY(QStandardItemModel) - Q_DECLARE_SCOPED_PRIVATE(QStandardItemModel) + Q_DECLARE_PRIVATE(QStandardItemModel) Q_PRIVATE_SLOT(d_func(), void _q_emitItemChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)) |