From b11317a64339f5a4bcffc8234ecaf15c7fb416f2 Mon Sep 17 00:00:00 2001 From: Axel Waggershauser Date: Fri, 15 Mar 2013 00:42:15 +0100 Subject: 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 --- .../GraphicsViewBenchmark/widgets/menu.cpp | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp') diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp index f8655bf725..540d7cf31b 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/menu.cpp @@ -73,14 +73,14 @@ Menu::~Menu() void Menu::init() { m_ButtonContainer = new QList; - + m_Layout->setContentsMargins(0,0,0,0); m_Layout->setSpacing(0); - - setMinimumWidth(150); - + + setMinimumWidth(150); + setLayout(m_Layout); - + connect(Theme::p(), SIGNAL(themeChanged()), this, SLOT(themeChange())); } @@ -124,9 +124,9 @@ void Menu::menuHide() void Menu::themeChange() { - QPixmap pixmap = Theme::p()->pixmap("status_field_middle.svg", + QPixmap pixmap = Theme::p()->pixmap("status_field_middle.svg", QSize(MinMenuItemWidth, MinMenuItemHeight)); - + for(int i = 0; i < m_ButtonContainer->count(); i++) { Button* button = m_ButtonContainer->at(i); button->setBackground(pixmap); @@ -142,7 +142,7 @@ void Menu::keyPressEvent(QKeyEvent *event) Button* button = m_ButtonContainer->at(m_currentSelectedIndex); button->select(false); button->update(); - + m_currentSelectedIndex--; button = m_ButtonContainer->at(m_currentSelectedIndex); button->select(true); @@ -162,7 +162,7 @@ void Menu::keyPressEvent(QKeyEvent *event) } } } - + if(event->key() == 16777237 ) { //Down Arrow if (m_currentSelectedIndex < m_ButtonContainer->count()-1) { //One step down if(m_currentSelectedIndex >= 0) { @@ -187,15 +187,15 @@ void Menu::keyPressEvent(QKeyEvent *event) } } } - + if(event->key() == 17825792 || event->key() == 16842752 || //LSK, center key or enter - event->key() == 16777221 ) { + event->key() == 16777221 ) { if(m_currentSelectedIndex >= 0) { Button* button = m_ButtonContainer->at(m_currentSelectedIndex); button->click(); } } - + if(event->key() == 17825793 ) { //RSK menuShowHide(); } -- cgit v1.2.3