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/svg | |
| 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/svg')
| -rw-r--r-- | src/svg/qgraphicssvgitem.h | 2 | ||||
| -rw-r--r-- | src/svg/qsvggenerator.cpp | 2 | ||||
| -rw-r--r-- | src/svg/qsvggenerator.h | 2 | ||||
| -rw-r--r-- | src/svg/qsvgrenderer.h | 2 | ||||
| -rw-r--r-- | src/svg/qsvgwidget.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h index 9a41e9b..e7ef4b3 100644 --- a/src/svg/qgraphicssvgitem.h +++ b/src/svg/qgraphicssvgitem.h @@ -87,7 +87,7 @@ public: private: Q_DISABLE_COPY(QGraphicsSvgItem) - // Q_DECLARE_SCOPED_PRIVATE_WITH_BASE(QGraphicsSvgItem, QObject) + // Q_DECLARE_PRIVATE_WITH_BASE(QGraphicsSvgItem, QObject) inline QGraphicsSvgItemPrivate *d_func() { return reinterpret_cast<QGraphicsSvgItemPrivate *>(QObject::d_ptr.data()); } inline const QGraphicsSvgItemPrivate *d_func() const diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index b5c56cd..9486479 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -155,7 +155,7 @@ static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures() class QSvgPaintEngine : public QPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(QSvgPaintEngine) + Q_DECLARE_PRIVATE(QSvgPaintEngine) public: QSvgPaintEngine() diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h index 951cee1..5b60a05 100644 --- a/src/svg/qsvggenerator.h +++ b/src/svg/qsvggenerator.h @@ -61,7 +61,7 @@ class QSvgGeneratorPrivate; class Q_SVG_EXPORT QSvgGenerator : public QPaintDevice { - Q_DECLARE_SCOPED_PRIVATE(QSvgGenerator) + Q_DECLARE_PRIVATE(QSvgGenerator) Q_PROPERTY(QSize size READ size WRITE setSize) Q_PROPERTY(QRectF viewBox READ viewBoxF WRITE setViewBox) diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h index 2b9a4f7..78e8a7e 100644 --- a/src/svg/qsvgrenderer.h +++ b/src/svg/qsvgrenderer.h @@ -109,7 +109,7 @@ Q_SIGNALS: void repaintNeeded(); private: - Q_DECLARE_SCOPED_PRIVATE(QSvgRenderer) + Q_DECLARE_PRIVATE(QSvgRenderer) }; QT_END_NAMESPACE diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h index 1a2cdd1..ccf66bb 100644 --- a/src/svg/qsvgwidget.h +++ b/src/svg/qsvgwidget.h @@ -74,7 +74,7 @@ protected: void paintEvent(QPaintEvent *event); private: Q_DISABLE_COPY(QSvgWidget) - Q_DECLARE_SCOPED_PRIVATE(QSvgWidget) + Q_DECLARE_PRIVATE(QSvgWidget) }; QT_END_NAMESPACE |