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/webview.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/webview.cpp')
-rw-r--r-- | tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp index 0883580d70..4fee19230d 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/webview.cpp @@ -46,7 +46,7 @@ static const int MotionEndWaitTime = 2000; static const int TileSideLength = 128; -WebViewPrivate::WebViewPrivate(WebView *w) +WebViewPrivate::WebViewPrivate(WebView *w) : q(w) , cache(0) { @@ -56,14 +56,14 @@ WebViewPrivate::WebViewPrivate(WebView *w) web->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); web->page()->mainFrame()->setScrollBarPolicy( - Qt::Horizontal, Qt::ScrollBarAlwaysOff); + Qt::Horizontal, Qt::ScrollBarAlwaysOff); web->page()->mainFrame()->setScrollBarPolicy( Qt::Vertical, Qt::ScrollBarAlwaysOff); web->setZValue(3); // cache = new WebViewCache(web); // web->setGraphicsEffect(cache); - + adjustSize(); } @@ -85,9 +85,8 @@ void WebViewPrivate::adjustSize() q->horizontalScrollBar()->setSliderSize(w); else q->horizontalScrollBar()->setSliderSize(0.0); - - if (h > q->viewport()->boundingRect().height()) + if (h > q->viewport()->boundingRect().height()) q->verticalScrollBar()->setSliderSize(h); else q->verticalScrollBar()->setSliderSize(0.0); @@ -116,7 +115,7 @@ void WebViewPrivate::_q_loadFinished(bool ok) void WebViewPrivate::_q_viewportChanged(QGraphicsWidget* viewport) { web->setParentItem(viewport); - viewport->setFlag(QGraphicsItem::ItemClipsChildrenToShape, + viewport->setFlag(QGraphicsItem::ItemClipsChildrenToShape, true); adjustSize(); } @@ -131,7 +130,6 @@ void WebViewPrivate::_q_motionEnded() WebViewCache::WebViewCache(QGraphicsWebView *webView) : m_webView(webView) { - } WebViewCache::~WebViewCache() @@ -178,8 +176,8 @@ void WebViewCache::draw(QPainter * painter, QGraphicsEffectSource * source) for (int j = 0; j < tilesY; j++) { int x = i * TileSideLength; int y = j * TileSideLength; - - m_tileRects[i + j * tilesX] + + m_tileRects[i + j * tilesX] = QRectF(x, y, TileSideLength, TileSideLength); } } @@ -205,13 +203,13 @@ void WebViewCache::draw(QPainter * painter, QGraphicsEffectSource * source) QWebFrame *webFrame = m_webView->page()->mainFrame(); - QPainter tilePainter(&tilePixmap); + QPainter tilePainter(&tilePixmap); tilePainter.translate(-m_tileRects[i].left(), -m_tileRects[i].top()); webFrame->render(&tilePainter, m_tileRects[i].toRect()); tilePainter.end(); m_tilePixmaps[i] = QPixmapCache::insert(tilePixmap); - } + } tileRect = tileRect.translated(-itemPos); @@ -233,7 +231,7 @@ WebView::WebView(QGraphicsWidget *parent) this, SLOT(_q_loadFinished(bool))); connect(this, SIGNAL(viewportChanged(QGraphicsWidget*)), this, SLOT(_q_viewportChanged(QGraphicsWidget*))); - connect(&d->motionTimer, SIGNAL(timeout()), + connect(&d->motionTimer, SIGNAL(timeout()), this, SLOT(_q_motionEnded())); } @@ -272,21 +270,21 @@ void WebView::scrollContentsBy(qreal dx, qreal dy) if (x < minx) x = minx; - else if (x > 0) + else if (x > 0) x = 0.0; qreal y = d->web->pos().y() - dy; if (y < miny) y = miny; - else if (y > 0) + else if (y > 0) y = 0.0; d->web->setPos(x, y); } QSizeF WebView::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const -{ +{ if (which == Qt::PreferredSize) { QSizeF contentSize = d->web->page()->mainFrame()->contentsSize(); return contentSize; |