From ea82707e96f7a4c1de114a39de41ecc95fa976e9 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Sun, 28 Oct 2012 21:13:02 +0200 Subject: 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 --- dist/changes-5.0.0 | 5 +++-- src/corelib/tools/qtextboundaryfinder.cpp | 11 ++--------- src/corelib/tools/qtextboundaryfinder.h | 5 +---- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index b54ab54b0f..a444cc31ed 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -478,8 +478,9 @@ QtCore - SoftHyphen enum value has been added to specify a line break opportunity at a soft hyphen (SHY) character. - MandatoryBreak enum value has been added to specify a mandatory (aka "hard") line breaks. - - StartWord/EndWord enum values has been logically replaced with StartOfItem/EndOfItem ones - to mention they are not about the word boundaries only. + - Source-incompatible change: Since the behavior of boundaryReasons() method + has been changed a lot, StartWord/EndWord enum values were intentionally replaced + with StartOfItem/EndOfItem ones to force the affected code be revised. * Softkeys API was removed. The following functions and enums were removed: - QAction::setSoftKeyRole() 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 ) -- cgit v1.2.3