diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-10-28 21:13:02 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-09 22:39:56 +0100 |
| commit | ea82707e96f7a4c1de114a39de41ecc95fa976e9 (patch) | |
| tree | e74123a1145aa7a441ad04505b986cdb319ff082 /src | |
| parent | f9d122159e48f73a2b6e7df2e48ba470ccc87d77 (diff) | |
QTBF: Remove StartOfItem/EndOfItem enum values
Since the behavior of boundaryReasons() method has been changed a lot,
remove the StartWord/EndWord enum values to force the affected code be revised;
StartOfItem/EndOfItem must be used instead.
Change-Id: I3d1d97d2dbe9680d290646d8c3adb5558ca26bd7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qtextboundaryfinder.cpp | 11 | ||||
| -rw-r--r-- | src/corelib/tools/qtextboundaryfinder.h | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/tools/qtextboundaryfinder.cpp index 259a63335a..968a580725 100644 --- a/src/corelib/tools/qtextboundaryfinder.cpp +++ b/src/corelib/tools/qtextboundaryfinder.cpp @@ -172,13 +172,6 @@ static void init(QTextBoundaryFinder::BoundaryType type, const QChar *chars, int (can occur for a Line boundary type only). \value SoftHyphen The boundary finder is at the soft hyphen (can occur for a Line boundary type only). - - \value StartWord Deprecated since 5.0. Use StartOfItem instead. - The boundary finder is at the start of a word. - (can occur for a Word boundary type only). - \value EndWord Deprecated since 5.0. Use EndOfItem instead. - The boundary finder is at the end of a word. - (can occur for a Word boundary type only). */ /*! @@ -496,9 +489,9 @@ QTextBoundaryFinder::BoundaryReasons QTextBoundaryFinder::boundaryReasons() cons if (attr.wordBreak) { reasons |= BreakOpportunity; if (attr.wordStart) - reasons |= StartOfItem | StartWord; + reasons |= StartOfItem; if (attr.wordEnd) - reasons |= EndOfItem | EndWord; + reasons |= EndOfItem; } break; case Sentence: diff --git a/src/corelib/tools/qtextboundaryfinder.h b/src/corelib/tools/qtextboundaryfinder.h index 6e33167bcb..745dc4e764 100644 --- a/src/corelib/tools/qtextboundaryfinder.h +++ b/src/corelib/tools/qtextboundaryfinder.h @@ -73,10 +73,7 @@ public: StartOfItem = 0x20, EndOfItem = 0x40, MandatoryBreak = 0x80, - SoftHyphen = 0x100, - // ### Qt6: remove - StartWord = 0x1000, - EndWord = 0x2000 + SoftHyphen = 0x100 }; Q_DECLARE_FLAGS( BoundaryReasons, BoundaryReason ) |