diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2020-11-12 15:54:07 +0100 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2020-11-13 10:08:49 +0100 |
| commit | c87692a48b053b830ca192a2580f7d27723f16df (patch) | |
| tree | 8c78f3b042367ad4850e4af0d65099595b8809ca | |
| parent | 1c56ff73aa7f81d543f1b697c2db8cb2b67697ab (diff) | |
remove unused variables and parameters to fix compilation with g++-10.2
The changes in 94dd2cebdcb9446626cd32a00086431eb11ab2a4,
"Remove Qt4Compatible painting" left some unused variables and
parameters. This leads to warnings which are treted as errors and
thus inhibit a successful build with g++-10.2. This patch removes
them and thus enables building with g++-10.2 again.
Change-Id: I5f83aa8ec8706c3e783540f5116f455ea8fe44c2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpdf.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qtriangulatingstroker.cpp | 4 | ||||
| -rw-r--r-- | src/printsupport/kernel/qpaintengine_alpha.cpp | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 0a4628b158..a6e69dd89b 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -1681,8 +1681,6 @@ void QRasterPaintEngine::stroke(const QVectorPath &path, const QPen &pen) QRect QRasterPaintEngine::toNormalizedFillRect(const QRectF &rect) { - QRasterPaintEngineState *s = state(); - int x1 = qRound(rect.x()); int y1 = qRound(rect.y()); int x2 = qRound(rect.right()); diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 0ef3b968a1..626274d856 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -649,7 +649,7 @@ QPdf::Stroker::Stroker() basicStroker.setStrokeWidth(.1); } -void QPdf::Stroker::setPen(const QPen &pen, QPainter::RenderHints hints) +void QPdf::Stroker::setPen(const QPen &pen, QPainter::RenderHints) { if (pen.style() == Qt::NoPen) { stroker = nullptr; diff --git a/src/gui/painting/qtriangulatingstroker.cpp b/src/gui/painting/qtriangulatingstroker.cpp index 0719b9a76d..44365685c8 100644 --- a/src/gui/painting/qtriangulatingstroker.cpp +++ b/src/gui/painting/qtriangulatingstroker.cpp @@ -79,7 +79,7 @@ static inline void skipDuplicatePoints(const qreal **pts, const qreal *endPts) } } -void QTriangulatingStroker::process(const QVectorPath &path, const QPen &pen, const QRectF &, QPainter::RenderHints hints) +void QTriangulatingStroker::process(const QVectorPath &path, const QPen &pen, const QRectF &, QPainter::RenderHints) { const qreal *pts = path.points(); const QPainterPath::ElementType *types = path.elements(); @@ -537,7 +537,7 @@ QDashedStrokeProcessor::QDashedStrokeProcessor() m_dash_stroker.setCubicToHook(qdashprocessor_cubicTo); } -void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, const QRectF &clip, QPainter::RenderHints hints) +void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, const QRectF &clip, QPainter::RenderHints) { const qreal *pts = path.points(); diff --git a/src/printsupport/kernel/qpaintengine_alpha.cpp b/src/printsupport/kernel/qpaintengine_alpha.cpp index 05a774656b..a394ca378d 100644 --- a/src/printsupport/kernel/qpaintengine_alpha.cpp +++ b/src/printsupport/kernel/qpaintengine_alpha.cpp @@ -407,8 +407,6 @@ QAlphaPaintEnginePrivate::~QAlphaPaintEnginePrivate() QRectF QAlphaPaintEnginePrivate::addPenWidth(const QPainterPath &path) { - Q_Q(QAlphaPaintEngine); - QPainterPath tmp = path; if (m_pen.style() == Qt::NoPen) |