remove redundant QTextOption::WrapMode::ManualWrap enum

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index 1661376..707b473 100644 (file)
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -652,7 +652,7 @@ void QItemDelegate::drawDisplay(QPainter *painter, const QStyleOptionViewItem &o
     const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, option.widget) + 1;
     QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding
     const bool wrapText = option.features & QStyleOptionViewItemV2::WrapText;
-    d->textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::ManualWrap);
+    d->textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::NoWrap);
     d->textOption.setTextDirection(option.direction);
     d->textOption.setAlignment(QStyle::visualAlignment(option.direction, option.displayAlignment));
     d->textLayout.setTextOption(d->textOption);

diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 2bbed47..b00a7ce 100644 (file)
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -898,7 +898,7 @@ void QCommonStylePrivate::viewItemDrawText(QPainter *p, const QStyleOptionViewIt
     QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding
     const bool wrapText = option->features & QStyleOptionViewItemV2::WrapText;
     QTextOption textOption;
-    textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::ManualWrap);
+    textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::NoWrap);
     textOption.setTextDirection(option->direction);
     textOption.setAlignment(QStyle::visualAlignment(option->direction, option->displayAlignment));
     QTextLayout textLayout;

diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index c08ce28..a78da5a 100644 (file)
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -2553,7 +2553,7 @@ void QTextDocumentLayoutPrivate::layoutBlock(const QTextBlock &bl, int blockPosi
         option.setAlignment(QStyle::visualAlignment(dir, align)); // for paragraph that are RTL, alignment is auto-reversed;
 
         if (blockFormat.nonBreakableLines() || document->pageSize().width() < 0) {
-            option.setWrapMode(QTextOption::ManualWrap);
+            option.setWrapMode(QTextOption::NoWrap);
         }
 
         tl->setTextOption(option);

diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 85dafa3..265d06d 100644 (file)
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -1661,7 +1661,7 @@ void QTextLine::layout_helper(int maxGlyphs)
 
     QTextOption::WrapMode wrapMode = eng->option.wrapMode();
     bool breakany = (wrapMode == QTextOption::WrapAnywhere);
-    lbh.manualWrap = (wrapMode == QTextOption::ManualWrap || wrapMode == QTextOption::NoWrap);
+    lbh.manualWrap = (wrapMode == QTextOption::NoWrap);
 
     int item = -1;
     int newItem = eng->findItem(line.from);

diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp
index 60be3a9..148ffc3 100644 (file)
--- a/src/gui/text/qtextoption.cpp
+++ b/src/gui/text/qtextoption.cpp
@@ -122,7 +122,6 @@ QTextOption &QTextOption::operator=(const QTextOption &o)
 
     \value NoWrap       Text is not wrapped at all.
     \value WordWrap     Text is wrapped at word boundaries.
-    \value ManualWrap   Same as QTextOption::NoWrap
     \value WrapAnywhere Text can be wrapped at any point on a line, even if
                         it occurs in the middle of a word.
     \value WrapAtWordBoundaryOrAnywhere If possible, wrapping occurs at a word

diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h
index 474c5d0..57f03c1 100644 (file)
--- a/src/gui/text/qtextoption.h
+++ b/src/gui/text/qtextoption.h
@@ -53,7 +53,6 @@ public:
     enum WrapMode {
         NoWrap,
         WordWrap,
-        ManualWrap,
         WrapAnywhere,
         WrapAtWordBoundaryOrAnywhere
     };

diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp
index 48e0d82..879be85 100644 (file)
--- a/src/gui/widgets/qlabel.cpp
+++ b/src/gui/widgets/qlabel.cpp
@@ -1420,7 +1420,7 @@ void QLabelPrivate::ensureTextLayouted() const
         if (this->align & Qt::TextWordWrap)
             opt.setWrapMode(QTextOption::WordWrap);
         else
-            opt.setWrapMode(QTextOption::ManualWrap);
+            opt.setWrapMode(QTextOption::NoWrap);
 
         doc->setDefaultTextOption(opt);