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 /src/plugins | |
| 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 'src/plugins')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/mng/qmnghandler.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h index 7585b4a..6148b14 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h @@ -53,7 +53,7 @@ class QDirectFBPaintEnginePrivate; class QDirectFBPaintEngine : public QRasterPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(QDirectFBPaintEngine) + Q_DECLARE_PRIVATE(QDirectFBPaintEngine) public: QDirectFBPaintEngine(QPaintDevice *device); virtual ~QDirectFBPaintEngine(); diff --git a/src/plugins/imageformats/mng/qmnghandler.h b/src/plugins/imageformats/mng/qmnghandler.h index aa6efd3..b9e37bf 100644 --- a/src/plugins/imageformats/mng/qmnghandler.h +++ b/src/plugins/imageformats/mng/qmnghandler.h @@ -74,7 +74,7 @@ class QMngHandler : public QImageIOHandler virtual bool supportsOption(ImageOption option) const; private: - Q_DECLARE_SCOPED_PRIVATE(QMngHandler) + Q_DECLARE_PRIVATE(QMngHandler) QScopedPointer<QMngHandlerPrivate> d_ptr; }; |