diff options
author | Axel Waggershauser <awagger@gmail.com> | 2013-03-15 00:42:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-16 20:22:50 +0100 |
commit | b11317a64339f5a4bcffc8234ecaf15c7fb416f2 (patch) | |
tree | f81e40ee49f5109b4100048d131d5bb922b448aa /tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp | |
parent | 72367a94a750355eb748793ce8c365373a332c9c (diff) |
Whitespace cleanup: remove trailing whitespace
Remove all trailing whitespace from the following list of files:
*.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README
excluding 3rdparty, test-data and auto generated code.
Note A): the only non 3rdparty c++-files that still
have trailing whitespace after this change are:
* src/corelib/codecs/cp949codetbl_p.h
* src/corelib/codecs/qjpunicode.cpp
* src/corelib/codecs/qbig5codec.cpp
* src/corelib/xml/qxmlstream_p.h
* src/tools/qdoc/qmlparser/qqmljsgrammar.cpp
* src/tools/uic/ui4.cpp
* tests/auto/other/qtokenautomaton/tokenizers/*
* tests/benchmarks/corelib/tools/qstring/data.cpp
* util/lexgen/tokenizer.cpp
Note B): in about 30 files some overlapping 'leading tab' and
'TAB character in non-leading whitespace' issues have been fixed
to make the sanity bot happy. Plus some general ws-fixes here
and there as asked for during review.
Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp')
-rw-r--r-- | tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp index e3c751dbca..2499c7094a 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/scrollbar.cpp @@ -52,7 +52,7 @@ class ScrollBarPrivate { public: - ScrollBarPrivate(Qt::Orientation orientation, ScrollBar *scrollBar) + ScrollBarPrivate(Qt::Orientation orientation, ScrollBar *scrollBar) : orientation(orientation) , sliderPosition(0.0) , sliderSize(0.0) @@ -96,15 +96,15 @@ public: void updateSlider() { QRectF oldSlider = slider; - slider = q_func()->boundingRect(); - + slider = q_func()->boundingRect(); + qreal x = 0; qreal y = 0; qreal w = scrollerPixmap.width(); qreal h = scrollerPixmap.height(); - + //Adjust the scrollBar in relation to the scroller - + if (orientation == Qt::Horizontal) { qreal scrollBarHeight = scrollBarPixmap.height(); @@ -120,7 +120,7 @@ public: } slider.setWidth(scrollBarWidth); } - + if(oldSlider != slider && (slider.size().width() > 0 &&slider.size().height() > 0 )) { scrollBarPixmap = Theme::p()->pixmap("scrollbar.svg", slider.size().toSize()); } @@ -153,7 +153,7 @@ public: ScrollBar::ScrollBar(Qt::Orientation orientation, QGraphicsWidget *parent) : QGraphicsWidget(parent) , d_ptr(new ScrollBarPrivate(orientation, this)) -{ +{ setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding); setContentsMargins(0, 0, 0, 0); @@ -198,8 +198,8 @@ bool ScrollBar::sliderDown() const return d->sliderDown; } -void ScrollBar::paint(QPainter *painter, - const QStyleOptionGraphicsItem *option, +void ScrollBar::paint(QPainter *painter, + const QStyleOptionGraphicsItem *option, QWidget *widget) { Q_D(ScrollBar); @@ -208,23 +208,23 @@ void ScrollBar::paint(QPainter *painter, d->updateSlider(); - QRect sliderRect = d->slider.toRect(); + QRect sliderRect = d->slider.toRect(); painter->drawPixmap(sliderRect.topLeft(), d->scrollBarPixmap); - + QRect cursorRect = d->cursor.toRect(); painter->drawPixmap(cursorRect.topLeft(), d->scrollerPixmap); } -QSizeF ScrollBar::sizeHint(Qt::SizeHint which, - const QSizeF &constraint) const +QSizeF ScrollBar::sizeHint(Qt::SizeHint which, + const QSizeF &constraint) const { Q_D(const ScrollBar); QSizeF s; - if (d->orientation == Qt::Horizontal) + if (d->orientation == Qt::Horizontal) s = QSizeF(-1, qMax(d->scrollBarPixmap.height(), d->scrollerPixmap.height())); - else + else s = QSizeF(qMax(d->scrollBarPixmap.width(), d->scrollerPixmap.width()), -1); switch (which) @@ -265,18 +265,18 @@ void ScrollBar::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { Q_D(ScrollBar); - if (!d->sliderDown) + if (!d->sliderDown) return; if (d->orientation == Qt::Horizontal) { qreal f = (event->pos().x() - d->pressPos.x())/(d->slider.width() - d->cursor.width()); qreal dx = f * d->sliderSize; - + d->setSliderPosition(d->sliderPosition + dx); } else { qreal f = (event->pos().y() - d->pressPos.y())/(d->slider.height() - d->cursor.height()); qreal dy = f * d->sliderSize; - + d->setSliderPosition(d->sliderPosition + dy); } |