diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-10-16 07:20:23 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-19 09:41:36 +0200 |
commit | dbb2581af5cd1e891cb4202ff8a8caa68cd74b6a (patch) | |
tree | f460885ca57d0f08bb5d7ec4ed307058a00546f9 /src/gui | |
parent | 734324c37cb9d8417aa86f76fc81dadc21be2156 (diff) |
Remove Qt3 compat leftovers
Change-Id: I91c3d26125168998d6279bddb0671cfb68eac2f4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/text/qtextengine_p.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h index bef461f448..82467229eb 100644 --- a/src/gui/text/qtextengine_p.h +++ b/src/gui/text/qtextengine_p.h @@ -540,24 +540,14 @@ public: int findItem(int strPos) const; inline QTextFormatCollection *formats() const { -#ifdef QT_BUILD_COMPAT_LIB - return 0; // Compat should never reference this symbol -#else if (block.docHandle()) return block.docHandle()->formatCollection(); - else if (specialData) - return specialData->formats.data(); - - return 0; -#endif + return specialData ? specialData->formats.data() : 0; } QTextCharFormat format(const QScriptItem *si) const; inline QAbstractTextDocumentLayout *docLayout() const { -#ifdef QT_BUILD_COMPAT_LIB - return 0; // Compat should never reference this symbol -#else + Q_ASSERT(block.docHandle()); return block.docHandle()->document()->documentLayout(); -#endif } int formatIndex(const QScriptItem *si) const; |