From d1140aca7d31be567baa6b53f67595d187f983e0 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Thu, 25 Oct 2012 21:16:42 +0200 Subject: [PATCH] remove a number of unused variables --- framesvg.cpp | 1 - private/applethandle.cpp | 2 -- widgets/iconwidget.cpp | 5 +---- widgets/scrollwidget.cpp | 5 +++-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/framesvg.cpp b/framesvg.cpp index 86a90bb4f..bdb9748d5 100644 --- a/framesvg.cpp +++ b/framesvg.cpp @@ -700,7 +700,6 @@ void FrameSvgPrivate::generateBackground(FrameData *frame) QSize overlaySize; QPoint actualOverlayPos = QPoint(0, 0); if (overlayAvailable && !overlayCached) { - QPoint pos = QPoint(0, 0); overlaySize = q->elementSize(prefix % "overlay"); if (q->hasElement(prefix % "hint-overlay-pos-right")) { diff --git a/private/applethandle.cpp b/private/applethandle.cpp index 7b4f8a63d..3348e5f89 100644 --- a/private/applethandle.cpp +++ b/private/applethandle.cpp @@ -314,7 +314,6 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti //XXX this code is duplicated in the next function QPointF basePoint = m_rect.topLeft() + QPointF(HANDLE_MARGIN, iconMargin); QPointF step = QPointF(0, m_iconSize + iconMargin); - QPointF separator = step + QPointF(0, iconMargin); //end duplicate code QPointF shiftC; @@ -401,7 +400,6 @@ AppletHandle::ButtonType AppletHandle::mapToButton(const QPointF &point) const //XXX this code is duplicated in the prev. function QPointF basePoint = m_rect.topLeft() + QPointF(HANDLE_MARGIN, iconMargin); QPointF step = QPointF(0, m_iconSize + iconMargin); - QPointF separator = step + QPointF(0, iconMargin); //end duplicate code QRectF activeArea = QRectF(basePoint, QSizeF(m_iconSize, m_iconSize)); diff --git a/widgets/iconwidget.cpp b/widgets/iconwidget.cpp index 7dd749456..be7938e32 100644 --- a/widgets/iconwidget.cpp +++ b/widgets/iconwidget.cpp @@ -1219,10 +1219,7 @@ void IconWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option PaintUtils::shadowBlur(shadow, 2, d->shadowColor); painter->drawImage(textBoundingRect.topLeft() + shadowPos, shadow); - } else if (!(d->text.isEmpty() && d->infoText.isEmpty()) && - !textBoundingRect.isEmpty()) { - QRect labelRect = d->labelRectangle(option, icon, d->text).toRect(); - + } else if (!(d->text.isEmpty() && d->infoText.isEmpty()) && !textBoundingRect.isEmpty()) { foreach (const QRect &rect, d->haloRects) { Plasma::PaintUtils::drawHalo(painter, rect); } diff --git a/widgets/scrollwidget.cpp b/widgets/scrollwidget.cpp index 17ea77619..0da7000c9 100644 --- a/widgets/scrollwidget.cpp +++ b/widgets/scrollwidget.cpp @@ -665,11 +665,12 @@ public: void handleMouseMoveEvent(QGraphicsSceneMouseEvent *event) { - if (lastPosTime.isNull()) + if (lastPosTime.isNull()) { return; + } + bool rejectY = false; bool rejectX = false; - bool moved = false; if (canYFlick()) { int dy = int(event->scenePos().y() - pressPos.y());