alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove a number of unused variables

Browse Source
This commit is contained in:
Aaron Seigo 2012-10-25 21:16:42 +02:00
parent a6bcd52059
commit d1140aca7d
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framesvg.cpp
View File

@ -700,7 +700,6 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
QSize overlaySize; QSize overlaySize;
QPoint actualOverlayPos = QPoint(0, 0); QPoint actualOverlayPos = QPoint(0, 0);
if (overlayAvailable && !overlayCached) { if (overlayAvailable && !overlayCached) {
QPoint pos = QPoint(0, 0);
overlaySize = q->elementSize(prefix % "overlay"); overlaySize = q->elementSize(prefix % "overlay");
if (q->hasElement(prefix % "hint-overlay-pos-right")) { if (q->hasElement(prefix % "hint-overlay-pos-right")) {

2
private/applethandle.cpp
View File

@ -314,7 +314,6 @@ void AppletHandle::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
//XXX this code is duplicated in the next function //XXX this code is duplicated in the next function
QPointF basePoint = m_rect.topLeft() + QPointF(HANDLE_MARGIN, iconMargin); QPointF basePoint = m_rect.topLeft() + QPointF(HANDLE_MARGIN, iconMargin);
QPointF step = QPointF(0, m_iconSize + iconMargin); QPointF step = QPointF(0, m_iconSize + iconMargin);
QPointF separator = step + QPointF(0, iconMargin);
//end duplicate code //end duplicate code
QPointF shiftC; QPointF shiftC;
@ -401,7 +400,6 @@ AppletHandle::ButtonType AppletHandle::mapToButton(const QPointF &point) const
//XXX this code is duplicated in the prev. function //XXX this code is duplicated in the prev. function
QPointF basePoint = m_rect.topLeft() + QPointF(HANDLE_MARGIN, iconMargin); QPointF basePoint = m_rect.topLeft() + QPointF(HANDLE_MARGIN, iconMargin);
QPointF step = QPointF(0, m_iconSize + iconMargin); QPointF step = QPointF(0, m_iconSize + iconMargin);
QPointF separator = step + QPointF(0, iconMargin);
//end duplicate code //end duplicate code
QRectF activeArea = QRectF(basePoint, QSizeF(m_iconSize, m_iconSize)); QRectF activeArea = QRectF(basePoint, QSizeF(m_iconSize, m_iconSize));

5
widgets/iconwidget.cpp
View File

@ -1219,10 +1219,7 @@ void IconWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
PaintUtils::shadowBlur(shadow, 2, d->shadowColor); PaintUtils::shadowBlur(shadow, 2, d->shadowColor);
painter->drawImage(textBoundingRect.topLeft() + shadowPos, shadow); painter->drawImage(textBoundingRect.topLeft() + shadowPos, shadow);
} else if (!(d->text.isEmpty() && d->infoText.isEmpty()) && } else if (!(d->text.isEmpty() && d->infoText.isEmpty()) && !textBoundingRect.isEmpty()) {
!textBoundingRect.isEmpty()) {
QRect labelRect = d->labelRectangle(option, icon, d->text).toRect();
foreach (const QRect &rect, d->haloRects) { foreach (const QRect &rect, d->haloRects) {
Plasma::PaintUtils::drawHalo(painter, rect); Plasma::PaintUtils::drawHalo(painter, rect);
} }

5
widgets/scrollwidget.cpp
View File

@ -665,11 +665,12 @@ public:
void handleMouseMoveEvent(QGraphicsSceneMouseEvent *event) void handleMouseMoveEvent(QGraphicsSceneMouseEvent *event)
{ {
if (lastPosTime.isNull()) if (lastPosTime.isNull()) {
return; return;
}
bool rejectY = false; bool rejectY = false;
bool rejectX = false; bool rejectX = false;
bool moved = false;
if (canYFlick()) { if (canYFlick()) {
int dy = int(event->scenePos().y() - pressPos.y()); int dy = int(event->scenePos().y() - pressPos.y());