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 /src/widgets/doc/snippets/javastyle.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 'src/widgets/doc/snippets/javastyle.cpp')
-rw-r--r-- | src/widgets/doc/snippets/javastyle.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp index 15cc53ce2d..37f02c7f13 100644 --- a/src/widgets/doc/snippets/javastyle.cpp +++ b/src/widgets/doc/snippets/javastyle.cpp @@ -103,7 +103,7 @@ QPalette JavaStyle::standardPalette() const palette.setBrush(QPalette::Inactive, QPalette::Highlight, QColor(184, 207, 229)); palette.setBrush(QPalette::Inactive, QPalette::HighlightedText, Qt::black); - + palette.setBrush(QPalette::Disabled, QPalette::Button, QColor(238, 238, 238)); palette.setBrush(QPalette::Disabled, QPalette::WindowText, @@ -968,7 +968,7 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option, painter->setBrush(QColor(200, 221, 242)); painter->drawPath(outerPath); painter->setPen(QColor(200, 221, 242)); - painter->drawRect(QRect(bottomLeft + adjustTabPoint( + painter->drawRect(QRect(bottomLeft + adjustTabPoint( QPoint(2, -3), tab->shape), bottomRight + adjustTabPoint( QPoint(-2, 0), tab->shape))); @@ -976,7 +976,7 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option, painter->setBrush(Qt::NoBrush); painter->drawPath(whitePath); - if (option->state & State_HasFocus) { + if (option->state & State_HasFocus) { painter->setPen(option->palette.color(QPalette::Mid)); painter->drawPath(innerPath); } @@ -1699,7 +1699,7 @@ void JavaStyle::drawComplexControl(ComplexControl control, menuOption.rect = menuRect; QStyleOptionToolButton label = *button; - int fw = 5; + int fw = 5; drawControl(CE_ToolButtonLabel, &label, painter, widget); if (button->subControls & SC_ToolButtonMenu) { @@ -1713,7 +1713,7 @@ void JavaStyle::drawComplexControl(ComplexControl control, drawPrimitive(PE_FrameFocusRect, &focusOption, painter, widget); } - + break; } case CC_ComboBox: { @@ -2113,7 +2113,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element, painter->drawLine(center, QPoint(center.x(), option->rect.bottom())); } - + if (option->state & State_Children) if (option->state & State_Open) painter->drawPixmap(pixmapRect.topLeft(), closedPixmap); @@ -2198,7 +2198,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element, painter->drawPoint(center.x() + 1 + add, center.y() + 1 + add); break; } - case PE_FrameDockWidget: { + case PE_FrameDockWidget: { drawPrimitive(PE_FrameWindow, option, painter, widget); break; } @@ -2226,7 +2226,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element, painter->drawPoint(offset + xySwitch(QPoint(add + 8, i), horizontal)); } - + break; } case PE_IndicatorToolBarSeparator: { @@ -2591,7 +2591,7 @@ int JavaStyle::styleHint(StyleHint hint, const QStyleOption *option, break; } case QStyle::SH_Menu_Scrollable: - ret = 1; + ret = 1; break; default: ret = QCommonStyle::styleHint(hint, option, widget, returnData); @@ -2719,7 +2719,7 @@ QSize JavaStyle::sizeFromContents(ContentsType type, int height = 0; if (!menuItem->icon.isNull()) { - width += 20; + width += 20; height += 20; } if (!menuItem->text.isEmpty()) { |