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/shared/qttoolbardialog | |
| 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/shared/qttoolbardialog')
| -rw-r--r-- | tools/shared/qttoolbardialog/qttoolbardialog.cpp | 2 | ||||
| -rw-r--r-- | tools/shared/qttoolbardialog/qttoolbardialog.h | 4 |
2 files changed, 3 insertions, 3 deletions
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()) |