AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes warnings about unused variables

Browse Source 
Reviewed-by: Samuel
(cherry picked from commit ddd253e14318af45e5c56df736028b88257068c4)
This commit is contained in:
Olivier Goffart 2011-04-27 17:02:35 +02:00
parent e8ac3549c5
commit bd64c94a26
5 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/painting/qdrawhelper_sse2.cpp
View File

@ -112,8 +112,6 @@ void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl,
// First, align dest to 16 bytes: // First, align dest to 16 bytes:
ALIGNMENT_PROLOGUE_16BYTES(dst, x, w) { ALIGNMENT_PROLOGUE_16BYTES(dst, x, w) {
quint32 s = src[x];
s = BYTE_MUL(s, const_alpha);
dst[x] = INTERPOLATE_PIXEL_255(src[x], const_alpha, dst[x], one_minus_const_alpha); dst[x] = INTERPOLATE_PIXEL_255(src[x], const_alpha, dst[x], one_minus_const_alpha);
} }
@ -127,8 +125,6 @@ void qt_blend_rgb32_on_rgb32_sse2(uchar *destPixels, int dbpl,
} }
} }
for (; x<w; ++x) { for (; x<w; ++x) {
quint32 s = src[x];
s = BYTE_MUL(s, const_alpha);
dst[x] = INTERPOLATE_PIXEL_255(src[x], const_alpha, dst[x], one_minus_const_alpha); dst[x] = INTERPOLATE_PIXEL_255(src[x], const_alpha, dst[x], one_minus_const_alpha);
} }
dst = (quint32 *)(((uchar *) dst) + dbpl); dst = (quint32 *)(((uchar *) dst) + dbpl);

10
src/gui/painting/qpaintbuffer.cpp
View File

@ -535,16 +535,6 @@ QString QPaintBuffer::commandDescription(int command) const
QTextItemInt &ti = (*tiCopy)(); QTextItemInt &ti = (*tiCopy)();
QString text(ti.text()); QString text(ti.text());
QFont font(ti.font());
font.setUnderline(false);
font.setStrikeOut(false);
font.setOverline(false);
const QTextItemInt &si = static_cast<const QTextItemInt &>(ti);
qreal justificationWidth = 0;
if (si.justified)
justificationWidth = si.width.toReal();
debug << "Cmd_DrawTextItem:" << pos << " " << text; debug << "Cmd_DrawTextItem:" << pos << " " << text;
break; } break; }
case QPaintBufferPrivate::Cmd_SystemStateChanged: { case QPaintBufferPrivate::Cmd_SystemStateChanged: {

3
src/gui/painting/qpaintengine_x11.cpp
View File

@ -1611,8 +1611,6 @@ void QX11PaintEnginePrivate::fillPolygon_dev(const QPointF *polygonPoints, int p
&& (fill.style() != Qt::NoBrush) && (fill.style() != Qt::NoBrush)
&& ((has_fill_texture && fill.texture().hasAlpha()) || antialias || !solid_fill || has_alpha_pen != has_alpha_brush)) && ((has_fill_texture && fill.texture().hasAlpha()) || antialias || !solid_fill || has_alpha_pen != has_alpha_brush))
{ {
QRect br = tessellator->tessellate((QPointF *)clippedPoints, clippedCount,
mode == QPaintEngine::WindingMode);
if (tessellator->size > 0) { if (tessellator->size > 0) {
XRenderPictureAttributes attrs; XRenderPictureAttributes attrs;
attrs.poly_edge = antialias ? PolyEdgeSmooth : PolyEdgeSharp; attrs.poly_edge = antialias ? PolyEdgeSmooth : PolyEdgeSharp;
@ -1771,7 +1769,6 @@ void QX11PaintEngine::drawPath(const QPainterPath &path)
Q_D(QX11PaintEngine); Q_D(QX11PaintEngine);
if (path.isEmpty()) if (path.isEmpty())
return; return;
QTransform old_matrix = d->matrix;
if (d->has_brush) if (d->has_brush)
d->fillPath(path, QX11PaintEnginePrivate::BrushGC, true); d->fillPath(path, QX11PaintEnginePrivate::BrushGC, true);

1
src/gui/painting/qpainterpath.cpp
View File

@ -1126,6 +1126,7 @@ void QPainterPath::addText(const QPointF &point, const QFont &f, const QString &
QTextEngine *eng = layout.engine(); QTextEngine *eng = layout.engine();
layout.beginLayout(); layout.beginLayout();
QTextLine line = layout.createLine(); QTextLine line = layout.createLine();
Q_UNUSED(line);
layout.endLayout(); layout.endLayout();
const QScriptLine &sl = eng->lines[0]; const QScriptLine &sl = eng->lines[0];
if (!sl.length || !eng->layoutData) if (!sl.length || !eng->layoutData)

1
src/gui/painting/qstroker.cpp
View File

@ -552,6 +552,7 @@ void QStroker::joinPoints(qfixed focal_x, qfixed focal_y, const QLineF &nextLine
// // line to the beginning of the arc segment, (should not be needed). // // line to the beginning of the arc segment, (should not be needed).
// emitLineTo(qt_real_to_fixed(curve_start.x()), qt_real_to_fixed(curve_start.y())); // emitLineTo(qt_real_to_fixed(curve_start.x()), qt_real_to_fixed(curve_start.y()));
Q_UNUSED(curve_start);
for (int i=0; i<point_count; i+=3) { for (int i=0; i<point_count; i+=3) {
emitCubicTo(qt_real_to_fixed(curves[i].x()), emitCubicTo(qt_real_to_fixed(curves[i].x()),