Commit c87692a4 authored by Andreas Buhr's avatar Andreas Buhr
Browse files

remove unused variables and parameters to fix compilation with g++-10.2

The changes in 94dd2ceb

,
"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: default avatarTor Arne Vestbø <tor.arne.vestbo@qt.io>
parent 1c56ff73
...@@ -1681,8 +1681,6 @@ void QRasterPaintEngine::stroke(const QVectorPath &path, const QPen &pen) ...@@ -1681,8 +1681,6 @@ void QRasterPaintEngine::stroke(const QVectorPath &path, const QPen &pen)
QRect QRasterPaintEngine::toNormalizedFillRect(const QRectF &rect) QRect QRasterPaintEngine::toNormalizedFillRect(const QRectF &rect)
{ {
QRasterPaintEngineState *s = state();
int x1 = qRound(rect.x()); int x1 = qRound(rect.x());
int y1 = qRound(rect.y()); int y1 = qRound(rect.y());
int x2 = qRound(rect.right()); int x2 = qRound(rect.right());
......
...@@ -649,7 +649,7 @@ QPdf::Stroker::Stroker() ...@@ -649,7 +649,7 @@ QPdf::Stroker::Stroker()
basicStroker.setStrokeWidth(.1); 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) { if (pen.style() == Qt::NoPen) {
stroker = nullptr; stroker = nullptr;
......
...@@ -79,7 +79,7 @@ static inline void skipDuplicatePoints(const qreal **pts, const qreal *endPts) ...@@ -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 qreal *pts = path.points();
const QPainterPath::ElementType *types = path.elements(); const QPainterPath::ElementType *types = path.elements();
...@@ -537,7 +537,7 @@ QDashedStrokeProcessor::QDashedStrokeProcessor() ...@@ -537,7 +537,7 @@ QDashedStrokeProcessor::QDashedStrokeProcessor()
m_dash_stroker.setCubicToHook(qdashprocessor_cubicTo); 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(); const qreal *pts = path.points();
......
...@@ -407,8 +407,6 @@ QAlphaPaintEnginePrivate::~QAlphaPaintEnginePrivate() ...@@ -407,8 +407,6 @@ QAlphaPaintEnginePrivate::~QAlphaPaintEnginePrivate()
QRectF QAlphaPaintEnginePrivate::addPenWidth(const QPainterPath &path) QRectF QAlphaPaintEnginePrivate::addPenWidth(const QPainterPath &path)
{ {
Q_Q(QAlphaPaintEngine);
QPainterPath tmp = path; QPainterPath tmp = path;
if (m_pen.style() == Qt::NoPen) if (m_pen.style() == Qt::NoPen)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment