summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-01-17 19:33:29 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-20 16:53:10 +0100
commita0d27513f4eff3f76fd85e6442aca443b7c05a53 (patch)
tree2239ed849796744299fbe25ab3cc50c2867160e9 /src/declarative/graphicsitems/qdeclarativetextlayout.cpp
parent9ba631edb469599d3973982f8d5d72a9ba059eab (diff)
whitespace fixes
remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextlayout.cpp')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextlayout.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
index 9e03bfe3..895f1107 100644
--- a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
class QDeclarativeTextLayoutPrivate
{
public:
- QDeclarativeTextLayoutPrivate()
+ QDeclarativeTextLayoutPrivate()
: cached(false) {}
QPointF position;
@@ -103,7 +103,7 @@ class DrawTextItemRecorder: public QPaintEngine
last.numChars += ti.num_chars;
}
- }
+ }
if (needFreshCurrentItem) {
QStaticTextItem currentItem;
@@ -257,10 +257,10 @@ Q_GLOBAL_STATIC(InertTextPainter, inertTextPainter);
This class is basically a copy of the QStaticText code, but it is adapted to source its text from
QTextLayout.
-It is also considerably faster to create a QDeclarativeTextLayout than a QStaticText because it uses
+It is also considerably faster to create a QDeclarativeTextLayout than a QStaticText because it uses
a single, shared QPainter instance. QStaticText by comparison creates a new QPainter per instance.
-As a consequence this means that QDeclarativeTextLayout is not re-enterant. Adding a lock around
-the shared painter solves this, and only introduces a minor performance penalty, but is unnecessary
+As a consequence this means that QDeclarativeTextLayout is not re-enterant. Adding a lock around
+the shared painter solves this, and only introduces a minor performance penalty, but is unnecessary
for QDeclarativeTextLayout's current use (QDeclarativeText is already tied to the GUI thread).
*/
@@ -309,7 +309,7 @@ void QDeclarativeTextLayout::prepare()
{
if (!d || !d->cached) {
- if (!d)
+ if (!d)
d = new QDeclarativeTextLayoutPrivate;
InertTextPainter *itp = inertTextPainter();