remove unused and internal QRasterPaintEngine methods

note that QPainter::clipBoundingRect() exists but it is not virtual

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index eb17b69..6bfb7f4 100644 (file)
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -336,15 +336,6 @@ bool QRasterPaintEngine::end()
 /*!
     \internal
 */
-QSize QRasterPaintEngine::size() const
-{
-    Q_D(const QRasterPaintEngine);
-    return QSize(d->rasterBuffer->width(), d->rasterBuffer->height());
-}
-
-/*!
-    \internal
-*/
 #ifndef QT_NO_DEBUG
 void QRasterPaintEngine::saveBuffer(const QString &s) const
 {
@@ -2557,8 +2548,7 @@ bool QRasterPaintEngine::supportsTransformations(const QFontEngine *fontEngine)
 {
     if (!state()->WxF)
         return false;
-    const QTransform &m = state()->matrix;
-    return supportsTransformations(fontEngine->fontDef.pixelSize, m);
+    return supportsTransformations(fontEngine->fontDef.pixelSize, state()->matrix);
 }
 
 bool QRasterPaintEngine::supportsTransformations(const qreal pixelSize, const QTransform &m) const
@@ -2658,48 +2648,6 @@ void QRasterPaintEngine::drawBitmap(const QPointF &pos, const QImage &image, QSp
     }
 }
 
-/*!
-    \enum QRasterPaintEngine::ClipType
-    \internal
-
-    \value RectClip Indicates that the currently set clip is a single rectangle.
-    \value ComplexClip Indicates that the currently set clip is a combination of several shapes.
-*/
-
-/*!
-    \internal
-    Returns the type of the clip currently set.
-*/
-QRasterPaintEngine::ClipType QRasterPaintEngine::clipType() const
-{
-    Q_D(const QRasterPaintEngine);
-
-    const QClipData *clip = d->clip();
-    if (!clip || clip->hasRectClip)
-        return RectClip;
-    else
-        return ComplexClip;
-}
-
-/*!
-    \internal
-    Returns the bounding rect of the currently set clip.
-*/
-QRect QRasterPaintEngine::clipBoundingRect() const
-{
-    Q_D(const QRasterPaintEngine);
-
-    const QClipData *clip = d->clip();
-
-    if (!clip)
-        return d->deviceRect;
-
-    if (clip->hasRectClip)
-        return clip->clipRect;
-
-    return QRect(clip->xmin, clip->ymin, clip->xmax - clip->xmin, clip->ymax - clip->ymin);
-}
-
 static void qt_merge_clip(const QClipData *c1, const QClipData *c2, QClipData *result)
 {
     Q_ASSERT(c1->clipSpanHeight == c2->clipSpanHeight && c1->clipSpanHeight == result->clipSpanHeight);

diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 5a898c0..695fea6 100644 (file)
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -179,21 +179,12 @@ public:
 
     void drawStaticTextItem(QStaticTextItem *textItem);
 
-    enum ClipType {
-        RectClip,
-        ComplexClip
-    };
-    ClipType clipType() const;
-    QRect clipBoundingRect() const;
-
 #ifdef Q_NO_USING_KEYWORD
     inline void drawEllipse(const QRect &rect) { QPaintEngineEx::drawEllipse(rect); }
 #else
     using QPaintEngineEx::drawEllipse;
 #endif
 
-    QSize size() const;
-
 #ifndef QT_NO_DEBUG
     void saveBuffer(const QString &s) const;
 #endif