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/simplelistview.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/simplelistview.cpp')
-rw-r--r-- | tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp index 7bfda5173f..c59bd378e1 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp @@ -55,7 +55,7 @@ class SimpleListViewPrivate public: - SimpleListViewPrivate(SimpleListView *button) + SimpleListViewPrivate(SimpleListView *button) : m_content(0) , m_layout(0) , m_twoColumns(false) @@ -100,7 +100,7 @@ public: m_content->resize(q->viewport()->size().width(), m_layout->preferredHeight()); - const bool clip = + const bool clip = m_content->size().width() > q->viewport()->size().width() || m_content->size().height() > q->viewport()->size().height(); @@ -161,7 +161,7 @@ public: const QString defaultIcon = Theme::p()->pixmapPath()+"contact_default_icon.svg"; const int itemCount = m_layout->count(); - + for (int i=0; i<itemCount; ++i) { ListItem* item = static_cast<ListItem*>(m_layout->itemAt(i)); @@ -251,7 +251,7 @@ public: QGraphicsLayoutItem *item = m_layout->itemAt(i); m_layout->removeAt(i); moveditems.append(item); - } + } for ( int i = 0; i < moveditems.count(); ++i) m_layout->addItem(moveditems.at(i), i, 1); @@ -267,7 +267,7 @@ public: moveditems.append(m_layout->itemAt(i)); else moveditems.insert(moveditems.begin(), m_layout->itemAt(i)); - m_layout->removeAt(i); + m_layout->removeAt(i); } for (int i = 0; i<moveditems.count(); ++i) { m_layout->addItem(moveditems.at(i), m_layout->count(), 0); @@ -292,17 +292,17 @@ public: bool m_listItemCaching; }; -SimpleListView::SimpleListView(QGraphicsWidget *parent) +SimpleListView::SimpleListView(QGraphicsWidget *parent) : AbstractScrollArea(parent) , d_ptr(new SimpleListViewPrivate(this)) -{ +{ setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); setContentsMargins(0, 0, 0, 0); verticalScrollBar()->hide(); horizontalScrollBar()->hide(); } -SimpleListView::~SimpleListView() +SimpleListView::~SimpleListView() { Q_D(SimpleListView); @@ -403,7 +403,7 @@ bool SimpleListView::listItemCaching() const void SimpleListView::setListItemCaching(bool enabled) { Q_D(SimpleListView); - + if (d->m_listItemCaching == enabled) return; @@ -430,13 +430,13 @@ void SimpleListView::scrollContentsBy(qreal dx, qreal dy) if (newy < miny) newy = miny; - else if (newy > 0) + else if (newy > 0) newy = 0.0; d->m_content->setPos(contentPos.x(), newy); } -void SimpleListView::resizeEvent(QGraphicsSceneResizeEvent *event) +void SimpleListView::resizeEvent(QGraphicsSceneResizeEvent *event) { Q_D(SimpleListView); @@ -446,7 +446,7 @@ void SimpleListView::resizeEvent(QGraphicsSceneResizeEvent *event) } QSizeF SimpleListView::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const -{ +{ Q_D(const SimpleListView); if (which == Qt::PreferredSize) |