From 575ca14433992fe5a86a42181a26d5fb1a697364 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 31 Jul 2020 11:12:09 -0400 Subject: [PATCH] remove unused QX11PaintEngine methods Signed-off-by: Ivailo Monev --- src/gui/painting/qpaintengine_x11.cpp | 13 ------------- src/gui/painting/qpaintengine_x11_p.h | 6 +----- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp index 8e873e0d9..14d1c9bc6 100644 --- a/src/gui/painting/qpaintengine_x11.cpp +++ b/src/gui/painting/qpaintengine_x11.cpp @@ -1034,7 +1034,6 @@ void QX11PaintEngine::updateState(const QPaintEngineState &state) if (flags & DirtyTransform) updateMatrix(state.transform()); if (flags & DirtyPen) updatePen(state.pen()); if (flags & (DirtyBrush | DirtyBrushOrigin)) updateBrush(state.brush(), state.brushOrigin()); - if (flags & DirtyFont) updateFont(state.font()); if (state.state() & DirtyClipEnabled) { if (state.isClipEnabled()) { @@ -2039,18 +2038,6 @@ void QX11PaintEngine::updateClipRegion_dev(const QRegion &clipRegion, Qt::ClipOp x11SetClipRegion(d->dpy, d->gc, d->gc_brush, d->picture, d->crgn); } -void QX11PaintEngine::updateFont(const QFont &) -{ -} - -Qt::HANDLE QX11PaintEngine::handle() const -{ - Q_D(const QX11PaintEngine); - Q_ASSERT(isActive()); - Q_ASSERT(d->hd); - return d->hd; -} - extern void qt_draw_tile(QPaintEngine *, qreal, qreal, qreal, qreal, const QPixmap &, qreal, qreal); diff --git a/src/gui/painting/qpaintengine_x11_p.h b/src/gui/painting/qpaintengine_x11_p.h index a07fd8f76..360141c6b 100644 --- a/src/gui/painting/qpaintengine_x11_p.h +++ b/src/gui/painting/qpaintengine_x11_p.h @@ -76,7 +76,6 @@ public: void updatePen(const QPen &pen); void updateBrush(const QBrush &brush, const QPointF &pt); void updateRenderHints(QPainter::RenderHints hints); - void updateFont(const QFont &font); void updateMatrix(const QTransform &matrix); void updateClipRegion_dev(const QRegion ®ion, Qt::ClipOperation op); @@ -92,9 +91,7 @@ public: void drawEllipse(const QRect &r); void drawEllipse(const QRectF &r); - virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); - inline void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) - { QPaintEngine::drawPolygon(points, pointCount, mode); } + void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s); @@ -103,7 +100,6 @@ public: void drawImage(const QRectF &r, const QImage &img, const QRectF &sr, Qt::ImageConversionFlags flags = Qt::AutoColor); - virtual Qt::HANDLE handle() const; inline Type type() const { return QPaintEngine::X11; } QPainter::RenderHints supportedRenderHints() const; -- 2.11.0