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/gui/text/qstatictext.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/gui/text/qstatictext.cpp')
-rw-r--r-- | src/gui/text/qstatictext.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 2c1683f416..cd88e3bbe4 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -60,8 +60,8 @@ QT_BEGIN_NAMESPACE \mainclass QStaticText provides a way to cache layout data for a block of text so that it can be drawn - more efficiently than by using QPainter::drawText() in which the layout information is - recalculated with every call. + more efficiently than by using QPainter::drawText() in which the layout information is + recalculated with every call. The class primarily provides an optimization for cases where the text, its font and the transformations on the painter are static over several paint events. If the text or its layout @@ -97,8 +97,8 @@ QT_BEGIN_NAMESPACE \endcode The QStaticText class can be used to mimic the behavior of QPainter::drawText() to a specific - point with no boundaries, and also when QPainter::drawText() is called with a bounding - rectangle. + point with no boundaries, and also when QPainter::drawText() is called with a bounding + rectangle. If a bounding rectangle is not required, create a QStaticText object without setting a preferred text width. The text will then occupy a single line. @@ -151,7 +151,7 @@ QT_BEGIN_NAMESPACE /*! Constructs an empty QStaticText */ -QStaticText::QStaticText() +QStaticText::QStaticText() : data(new QStaticTextPrivate) { } @@ -161,7 +161,7 @@ QStaticText::QStaticText() */ QStaticText::QStaticText(const QString &text) : data(new QStaticTextPrivate) -{ +{ data->text = text; data->invalidate(); } @@ -169,7 +169,7 @@ QStaticText::QStaticText(const QString &text) /*! Constructs a QStaticText object which is a copy of \a other. */ -QStaticText::QStaticText(const QStaticText &other) +QStaticText::QStaticText(const QStaticText &other) { data = other.data; } @@ -186,7 +186,7 @@ QStaticText::~QStaticText() \internal */ void QStaticText::detach() -{ +{ if (data->ref.load() != 1) data.detach(); } @@ -219,7 +219,7 @@ void QStaticText::prepare(const QTransform &matrix, const QFont &font) Assigns \a other to this QStaticText. */ QStaticText &QStaticText::operator=(const QStaticText &other) -{ +{ data = other.data; return *this; } @@ -300,7 +300,7 @@ Qt::TextFormat QStaticText::textFormat() const \sa setText() */ -QString QStaticText::text() const +QString QStaticText::text() const { return data->text; } @@ -651,7 +651,7 @@ void QStaticTextPrivate::paintText(const QPointF &topLeftPosition, QPainter *p) .arg(QString::number(color.blue(), 16), 2, QLatin1Char('0'))); #endif document.setDefaultFont(font); - document.setDocumentMargin(0.0); + document.setDocumentMargin(0.0); #ifndef QT_NO_TEXTHTMLPARSER document.setHtml(text); #else |