diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 11:51:33 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 11:51:33 +0200 |
commit | 0e3823d30c2294eb11c205ca11fca55508478151 (patch) | |
tree | 3ce927318590ce3e9e790ee08bc489d3f3f386ec /src/gui/text | |
parent | b9798615b43746b26619b7abdad3abf89f6fb2fb (diff) |
remove dependency to QStyle::visualAlignment
The current position of the code in QGuiAppPrivate
is a bit messy, but we can later on consider
consolidating some of this in some helper
namespace.
Diffstat (limited to 'src/gui/text')
-rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 4 | ||||
-rw-r--r-- | src/gui/text/qtextlayout.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index ce157be254..b53dfe1547 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -46,6 +46,7 @@ #include "qtextlist.h" #include "qtextengine_p.h" #include "private/qcssutil_p.h" +#include "private/qguiapplication_p.h" #include "qabstracttextdocumentlayout_p.h" #include "qcssparser_p.h" @@ -57,7 +58,6 @@ #include <qdebug.h> #include <qvarlengtharray.h> #include <limits.h> -#include <qstyle.h> #include <qbasictimer.h> #include "private/qfunctions_p.h" @@ -2572,7 +2572,7 @@ void QTextDocumentLayoutPrivate::layoutBlock(const QTextBlock &bl, int blockPosi Qt::Alignment align = docPrivate->defaultTextOption.alignment(); if (blockFormat.hasProperty(QTextFormat::BlockAlignment)) align = blockFormat.alignment(); - option.setAlignment(QStyle::visualAlignment(dir, align)); // for paragraph that are RTL, alignment is auto-reversed; + option.setAlignment(QGuiApplicationPrivate::visualAlignment(dir, align)); // for paragraph that are RTL, alignment is auto-reversed; if (blockFormat.nonBreakableLines() || document->pageSize().width() < 0) { option.setWrapMode(QTextOption::ManualWrap); diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 37762b6ebf..66b0427d4d 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -49,7 +49,6 @@ #include <qabstracttextdocumentlayout.h> #include "qtextdocument_p.h" #include "qtextformat_p.h" -#include "qstyleoption.h" #include "qpainterpath.h" #include "qglyphs.h" #include "qglyphs_p.h" |