Changeset 88445 in vbox

Timestamp:

Apr 9, 2021 5:57:07 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9532: Fixing deprecated stuff: Replace QTextLayout::additionalFormat field setter/getter with format field stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• objects/UIRichTextString.cpp (modified) (1 diff)
• objects/UIRichTextString.h (modified) (1 diff)
• widgets/graphics/UIGraphicsTextPane.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/objects/UIRichTextString.cpp

@@ -68 +68 @@
 }
 
-QList<QTextLayout::FormatRange> UIRichTextString::formatRanges(int iShift /* = 0 */) const
+QVector<QTextLayout::FormatRange> UIRichTextString::formatRanges(int iShift /* = 0 */) const
 {
     /* Prepare format range list: */
-    QList<QTextLayout::FormatRange> ranges;
+    QVector<QTextLayout::FormatRange> ranges;
 
     /* Add own format range first: */

trunk/src/VBox/Frontends/VirtualBox/src/objects/UIRichTextString.h

@@ -61 +61 @@
     /** Returns the list of existing format ranges appropriate for QTextLayout.
       * @param  iShift  Brings the shift of <i>this</i> rich text block accordig to it's root. */
-    QList<QTextLayout::FormatRange> formatRanges(int iShift = 0) const;
+    QVector<QTextLayout::FormatRange> formatRanges(int iShift = 0) const;
 
     /** Defines the anchor to highlight in <i>this</i> rich text block and in it's children. */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp

@@ -449 +449 @@
     /* Create layout; */
     QTextLayout *pTextLayout = new QTextLayout(ms.toString(), font, pPaintDevice);
-    pTextLayout->setAdditionalFormats(ms.formatRanges());
+    pTextLayout->setFormats(ms.formatRanges());
 
     /* Configure layout: */
@@ -489 +489 @@
 
         /* Enumerate format ranges: */
-        foreach (const QTextLayout::FormatRange &range, pTextLayout->additionalFormats())
+        foreach (const QTextLayout::FormatRange &range, pTextLayout->formats())
         {
             /* Skip unrelated formats: */