Changeset 104585 in vbox

Timestamp:

May 13, 2024 11:37:59 AM (7 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10450: Get rid of pre-5.11 code related to QFontMetrics.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/overview/UIVMActivityOverviewWidget.cpp (modified) (1 diff)
• activity/vmactivity/UIVMActivityMonitor.cpp (modified) (3 diffs)
• extensions/QILabel.cpp (modified) (1 diff)
• extensions/QILineEdit.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• globals/UICommon.cpp (modified) (1 diff)
• helpbrowser/UIHelpViewer.cpp (modified) (1 diff)
• logviewer/UIVMLogPage.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerFilterWidget.cpp (modified) (3 diffs)
• logviewer/UIVMLogViewerTextEdit.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerWidget.cpp (modified) (1 diff)
• manager/chooser/UIChooserItem.cpp (modified) (3 diffs)
• manager/chooser/UIChooserItemGlobal.cpp (modified) (1 diff)
• manager/chooser/UIChooserItemGroup.cpp (modified) (2 diffs)
• manager/chooser/UIChooserItemMachine.cpp (modified) (3 diffs)
• manager/details/UIDetailsElement.cpp (modified) (1 diff)
• manager/tools/UIToolsItem.cpp (modified) (3 diffs)
• runtime/information/UIInformationConfiguration.cpp (modified) (1 diff)
• runtime/information/UIInformationRuntime.cpp (modified) (1 diff)
• settings/editors/UISerialSettingsEditor.cpp (modified) (2 diffs)
• settings/editors/UISharedFoldersEditor.cpp (modified) (3 diffs)
• settings/editors/UIStorageSettingsEditor.cpp (modified) (1 diff)
• softkeyboard/UISoftKeyboard.cpp (modified) (4 diffs)
• widgets/UIFilePathSelector.cpp (modified) (3 diffs)
• widgets/UIFileTableNavigationWidget.cpp (modified) (1 diff)
• widgets/UIPortForwardingTable.cpp (modified) (1 diff)
• widgets/UISearchLineEdit.cpp (modified) (1 diff)
• widgets/graphics/UIGraphicsTextPane.cpp (modified) (2 diffs)
• wizards/addcloudvm/UIWizardAddCloudVMPageSource.cpp (modified) (1 diff)
• wizards/importappliance/UIWizardImportAppPageExpert.cpp (modified) (1 diff)
• wizards/importappliance/UIWizardImportAppPageSource.cpp (modified) (1 diff)
• wizards/newcloudvm/UIWizardNewCloudVMPageSource.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

@@ -2106 +2106 @@
         int iColumnTitleWidth = m_columnTitles.value(i, QString()).length();
         int iMax = iColumnStringWidth > iColumnTitleWidth ? iColumnStringWidth : iColumnTitleWidth;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-        columnWidthsInPixels[i] = iMax * fontMetrics.horizontalAdvance('x') +
-#else
-        columnWidthsInPixels[i] = iMax * fontMetrics.width('x') +
-#endif
-            QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin) +
-            QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin) +
-            m_iSortIndicatorWidth;
+        columnWidthsInPixels[i] = iMax * fontMetrics.horizontalAdvance('x')
+                                + QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin)
+                                + QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin)
+                                + m_iSortIndicatorWidth;
     }
     m_pTableView->setMinimumColumnWidths(columnWidthsInPixels);

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -660 +660 @@
         else
             strAxisText = QString::number(iTotalSeconds - iTimeIndex);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-        int iTextWidth = fontMetrics.horizontalAdvance(strAxisText);
-#else
-        int iTextWidth = fontMetrics.width(strAxisText);
-#endif
-        int iTextX = m_lineChartRect.left() + i * m_lineChartRect.width() / (float) (iXSubAxisCount + 1);
+        const int iTextWidth = fontMetrics.horizontalAdvance(strAxisText);
+        const int iTextX = m_lineChartRect.left() + i * m_lineChartRect.width() / (float) (iXSubAxisCount + 1);
         if (i == 0)
         {
@@ -816 +812 @@
         font.setPixelSize(iFontSize);
         --iFontSize;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     } while (QFontMetrics(font).horizontalAdvance(m_strGAWarning) >= 0.8 * m_lineChartRect.width());
-#else
-    } while (QFontMetrics(font).width(m_strGAWarning) >= 0.8 * m_lineChartRect.width());
-#endif
     font.setBold(true);
     painter.setFont(font);
@@ -1233 +1225 @@
         if (pLabel)
         {
-            QFontMetrics labelFontMetric(pLabel->font());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-            int iWidth = m_iMaximumLabelLength * labelFontMetric.horizontalAdvance('X');
-#else
-            int iWidth = m_iMaximumLabelLength * labelFontMetric.width('X');
-#endif
+            const QFontMetrics labelFontMetric(pLabel->font());
+            const int iWidth = m_iMaximumLabelLength * labelFontMetric.horizontalAdvance('X');
             foreach (QLabel *pInfoLabel, m_infoLabels)
                 pInfoLabel->setFixedWidth(iWidth);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp

@@ -335 +335 @@
             const QString strFlat = removeHtmlTags(QString(strWork).remove(strCompact));
             /* What size will the text have without the compact text: */
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
             const int iFlatWidth = fm.horizontalAdvance(strFlat);
-#else
-            const int iFlatWidth = fm.width(strFlat);
-#endif
             /* Create the shortened text: */
             const QString strNew = fm.elidedText(strElide, toTextElideMode(strElideMode), width() - (2 * HOR_PADDING) - iFlatWidth);

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp

@@ -188 +188 @@
     // The margins are based on qlineedit.cpp of Qt.
     // Maybe they where changed at some time in the future.
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     QSize sc(fontMetrics().horizontalAdvance(strText) + 2 * 2,
              fontMetrics().xHeight()                  + 2 * 1);
-#else
-    QSize sc(fontMetrics().width(strText) + 2 * 2,
-             fontMetrics().xHeight()     + 2 * 1);
-#endif
     const QSize sa = style()->sizeFromContents(QStyle::CT_LineEdit, &sof, sc, this);
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -335 +335 @@
 
     /* Calculate width: */
-    const int iWidth = m_iMargin +
-                       pixmapSize.width() +
-                       2 * m_iSpacing +
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-                       qMax(fm.horizontalAdvance(index.data(Field_Name).toString()),
-                            fm.horizontalAdvance(index.data(Field_ID).toString())) +
-#else
-                       qMax(fm.width(index.data(Field_Name).toString()),
-                            fm.width(index.data(Field_ID).toString())) +
-#endif
-                       m_iMargin;
+    const int iWidth = m_iMargin
+                     + pixmapSize.width()
+                     + 2 * m_iSpacing
+                     + qMax(fm.horizontalAdvance(index.data(Field_Name).toString()),
+                            fm.horizontalAdvance(index.data(Field_ID).toString()))
+                     + m_iMargin;
     /* Calculate height: */
-    const int iHeight = m_iMargin +
-                        qMax(pixmapSize.height(),
-                             fm.height() + m_iSpacing + fm.height()) +
-                        m_iMargin;
+    const int iHeight = m_iMargin
+                      + qMax(pixmapSize.height(),
+                             fm.height() + m_iSpacing + fm.height())
+                      + m_iMargin;
 
     /* Return result: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -2508 +2508 @@
     const int iSpinBoxEditFieldWidth = rect.width();
     const int iSpinBoxDelta = qMax(0, iSpinBoxWidth - iSpinBoxEditFieldWidth);
-    QFontMetrics metrics(pSpinBox->font(), pSpinBox);
+    const QFontMetrics metrics(pSpinBox->font(), pSpinBox);
     const QString strDummy(cCount, '0');
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     const int iTextWidth = metrics.horizontalAdvance(strDummy);
-#else
-    const int iTextWidth = metrics.width(strDummy);
-#endif
 
     /* Tune spin-box minimum-width: */

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

@@ -345 +345 @@
     AssertReturnVoid(pLayout && m_pSearchLineEdit);
     setFocusProxy(m_pSearchLineEdit);
-    QFontMetrics fontMetric(m_pSearchLineEdit->font());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+    const QFontMetrics fontMetric(m_pSearchLineEdit->font());
     setMinimumSize(40 * fontMetric.horizontalAdvance("x"),
                    fontMetric.height() +
                    qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) +
                    qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin));
-
-#else
-    setMinimumSize(40 * fontMetric.width("x"),
-                   fontMetric.height() +
-                   qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) +
-                   qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin));
-#endif
     connect(m_pSearchLineEdit, &UISearchLineEdit::textChanged,
             this, &UIFindInPageWidget::sigSearchTextChanged);

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp

@@ -173 +173 @@
 
     /* Compute a width for 132 characters plus scrollbar and frame width: */
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int iDefaultWidth = m_pTextEdit->fontMetrics().horizontalAdvance(QChar('x')) * 132 +
-#else
-    int iDefaultWidth = m_pTextEdit->fontMetrics().width(QChar('x')) * 132 +
-#endif
-                        m_pTextEdit->verticalScrollBar()->width() +
-                        m_pTextEdit->frameWidth() * 2;
+    const int iDefaultWidth = m_pTextEdit->fontMetrics().horizontalAdvance(QChar('x')) * 132
+                            + m_pTextEdit->verticalScrollBar()->width()
+                            + m_pTextEdit->frameWidth() * 2;
 
     return iDefaultWidth;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterWidget.cpp

@@ -121 +121 @@
     setContextMenuPolicy(Qt::NoContextMenu);
     createButtons();
-    /** Try to guess the width of the space between filter terms so that remove button
-        we display when a term is selected does not hide the next/previous word: */
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int spaceWidth = fontMetrics().horizontalAdvance(' ');
-#else
-    int spaceWidth = fontMetrics().width(' ');
-#endif
-    if (spaceWidth != 0)
-        m_iTrailingSpaceCount = (m_iRemoveTermButtonSize / spaceWidth) + 1;
+    /* Try to guess the width of the space between filter terms so that remove button
+     * we display when a term is selected does not hide the next/previous word: */
+    const int iSpaceWidth = fontMetrics().horizontalAdvance(' ');
+    if (iSpaceWidth != 0)
+        m_iTrailingSpaceCount = (m_iRemoveTermButtonSize / iSpaceWidth) + 1;
 }
 
@@ -164 +160 @@
     if (!m_pClearAllButton || !m_pRemoveTermButton)
         createButtons();
-    int clearButtonSize = height();
-
-    int deltaHeight = 0.5 * (height() - m_pClearAllButton->height());
+    const int iClearButtonSize = height();
+
+    const int iDeltaHeight = 0.5 * (height() - m_pClearAllButton->height());
 #ifdef VBOX_WS_MAC
-    m_pClearAllButton->setGeometry(width() - clearButtonSize - 2, deltaHeight, clearButtonSize, clearButtonSize);
+    m_pClearAllButton->setGeometry(width() - iClearButtonSize - 2, iDeltaHeight, iClearButtonSize, iClearButtonSize);
 #else
-    m_pClearAllButton->setGeometry(width() - clearButtonSize - 1, deltaHeight, clearButtonSize, clearButtonSize);
+    m_pClearAllButton->setGeometry(width() - iClearButtonSize - 1, iDeltaHeight, iClearButtonSize, iClearButtonSize);
 #endif
 
@@ -177 +173 @@
     if (hasSelectedText())
     {
-        //int deltaHeight = 0.5 * (height() - m_pClearAllButton->height());
         m_pRemoveTermButton->show();
-        int buttonSize = m_iRemoveTermButtonSize;
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-        int charWidth = fontMetrics().horizontalAdvance('x');
+        const int iButtonSize = m_iRemoveTermButtonSize;
+        const int iCharWidth = fontMetrics().horizontalAdvance('x');
+#ifdef VBOX_WS_MAC
+        int iButtonLeft = cursorRect().left() + 1;
 #else
-        int charWidth = fontMetrics().width('x');
+        int iButtonLeft = cursorRect().right() - 0.9 * iCharWidth;
 #endif
-#ifdef VBOX_WS_MAC
-        int buttonLeft = cursorRect().left() + 1;
-#else
-        int buttonLeft = cursorRect().right() - 0.9 * charWidth;
-#endif
-        /* If buttonLeft is in far right of the line edit, move the
+        /* If iButtonLeft is in far right of the line edit, move the
            button to left side of the selected word: */
-        if (buttonLeft + buttonSize  >=  width() - clearButtonSize)
-        {
-            int selectionWidth = charWidth * selectedText().length();
-            buttonLeft -= (selectionWidth + buttonSize);
-        }
-        m_pRemoveTermButton->setGeometry(buttonLeft, deltaHeight, buttonSize, buttonSize);
+        if (iButtonLeft + iButtonSize  >=  width() - iClearButtonSize)
+        {
+            const int iSelectionWidth = iCharWidth * selectedText().length();
+            iButtonLeft -= (iSelectionWidth + iButtonSize);
+        }
+        m_pRemoveTermButton->setGeometry(iButtonLeft, iDeltaHeight, iButtonSize, iButtonSize);
     }
     else

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.cpp

@@ -356 +356 @@
         return 0;
 
-    int digits = 1;
-    int max = qMax(1, blockCount());
-    while (max >= 10) {
-        max /= 10;
-        ++digits;
-    }
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int space = 3 + fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits;
-#else
-    int space = 3 + fontMetrics().width(QLatin1Char('9')) * digits;
-#endif
-
-    return space;
+    int iDigits = 1;
+    int iMax = qMax(1, blockCount());
+    while (iMax >= 10) {
+        iMax /= 10;
+        ++iDigits;
+    }
+
+    return 3 + fontMetrics().horizontalAdvance(QLatin1Char('9')) * iDigits;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -242 +242 @@
         return 0;
     /* Compute a width for 132 characters plus scrollbar and frame width: */
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int iDefaultWidth = pBrowser->fontMetrics().horizontalAdvance(QChar('x')) * 132 +
-#else
-    int iDefaultWidth = pBrowser->fontMetrics().width(QChar('x')) * 132 +
-#endif
-                        pBrowser->verticalScrollBar()->width() +
-                        pBrowser->frameWidth() * 2;
+    const int iDefaultWidth = pBrowser->fontMetrics().horizontalAdvance(QChar('x')) * 132
+                            + pBrowser->verticalScrollBar()->width()
+                            + pBrowser->frameWidth() * 2;
 
     return iDefaultWidth;

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp

@@ -585 +585 @@
 
     /* Return text size, based on font-metrics: */
-    QFontMetrics fm(font, pPaintDevice);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+    const QFontMetrics fm(font, pPaintDevice);
     return QSize(fm.horizontalAdvance(strText), fm.height());
-#else
-    return QSize(fm.width(strText), fm.height());
-#endif
 }
 
@@ -597 +593 @@
 {
     /* Return text width: */
-    QFontMetrics fm(font, pPaintDevice);
+    const QFontMetrics fm(font, pPaintDevice);
     QString strString;
     strString.fill('_', iCount);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     return fm.horizontalAdvance(strString);
-#else
-    return fm.width(strString);
-#endif
 }
 
@@ -615 +607 @@
 
     /* Check if passed text fits maximum width: */
-    QFontMetrics fm(font, pPaintDevice);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+    const QFontMetrics fm(font, pPaintDevice);
     if (fm.horizontalAdvance(strText) <= iWidth)
-#else
-    if (fm.width(strText) <= iWidth)
-#endif
         return strText;
 
     /* Truncate otherwise: */
-    QString strEllipsis = QString("...");
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int iEllipsisWidth = fm.horizontalAdvance(strEllipsis + " ");
+    const QString strEllipsis = QString("...");
+    const int iEllipsisWidth = fm.horizontalAdvance(strEllipsis + " ");
     while (!strText.isEmpty() && fm.horizontalAdvance(strText) + iEllipsisWidth > iWidth)
         strText.truncate(strText.size() - 1);
-#else
-    int iEllipsisWidth = fm.width(strEllipsis + " ");
-    while (!strText.isEmpty() && fm.width(strText) + iEllipsisWidth > iWidth)
-        strText.truncate(strText.size() - 1);
-#endif
     return strText + strEllipsis;
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp

@@ -516 +516 @@
     QPaintDevice *pPaintDevice = model()->paintDevice();
     const QFontMetrics fm(m_nameFont, pPaintDevice);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     const int iMinimumNameWidth = fm.horizontalAdvance(compressText(m_nameFont, pPaintDevice, name(),
                                                                     textWidth(m_nameFont, pPaintDevice, 15)));
-#else
-    const int iMinimumNameWidth = fm.width(compressText(m_nameFont, pPaintDevice, name(), textWidth(m_nameFont, pPaintDevice, 15)));
-#endif
 
     /* Is there something changed? */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp

@@ -1562 +1562 @@
 
     /* Prepare variables: */
-    int iHeaderSpacing = data(GroupItemData_HeaderSpacing).toInt();
+    const int iHeaderSpacing = data(GroupItemData_HeaderSpacing).toInt();
 
     /* Calculate minimum visible name size: */
     QPaintDevice *pPaintDevice = model()->paintDevice();
-    QFontMetrics fm(m_nameFont, pPaintDevice);
-    int iMaximumNameWidth = textWidth(m_nameFont, pPaintDevice, 20);
-    QString strCompressedName = compressText(m_nameFont, pPaintDevice, name(), iMaximumNameWidth);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int iMinimumNameWidth = fm.horizontalAdvance(strCompressedName);
-#else
-    int iMinimumNameWidth = fm.width(strCompressedName);
-#endif
-    int iMinimumNameHeight = fm.height();
+    const QFontMetrics fm(m_nameFont, pPaintDevice);
+    const int iMaximumNameWidth = textWidth(m_nameFont, pPaintDevice, 20);
+    const QString strCompressedName = compressText(m_nameFont, pPaintDevice, name(), iMaximumNameWidth);
+    const int iMinimumNameWidth = fm.horizontalAdvance(strCompressedName);
+    const int iMinimumNameHeight = fm.height();
 
     /* Calculate minimum width: */
@@ -1611 +1607 @@
 
     /* Calculate new minimum header size: */
-    QSize minimumHeaderSize = QSize(iHeaderWidth, iHeaderHeight);
+    const QSize minimumHeaderSize = QSize(iHeaderWidth, iHeaderHeight);
 
     /* Is there something changed? */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -776 +776 @@
     /* Calculate new minimum name width: */
     QPaintDevice *pPaintDevice = model()->paintDevice();
-    QFontMetrics fm(m_nameFont, pPaintDevice);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int iMinimumNameWidth = fm.horizontalAdvance(compressText(m_nameFont, pPaintDevice, name(),
-                                                              textWidth(m_nameFont, pPaintDevice, 15)));
-#else
-    int iMinimumNameWidth = fm.width(compressText(m_nameFont, pPaintDevice, name(), textWidth(m_nameFont, pPaintDevice, 15)));
-#endif
+    const QFontMetrics fm(m_nameFont, pPaintDevice);
+    const int iMinimumNameWidth = fm.horizontalAdvance(compressText(m_nameFont, pPaintDevice, name(),
+                                                                    textWidth(m_nameFont, pPaintDevice, 15)));
 
     /* Is there something changed? */
@@ -801 +797 @@
         && !cache()->toLocal()->snapshotName().isEmpty())
     {
-        QFontMetrics fm(m_snapshotNameFont, model()->paintDevice());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-        int iBracketWidth = fm.horizontalAdvance("()"); /* bracket width */
-        int iActualTextWidth = fm.horizontalAdvance(cache()->toLocal()->snapshotName()); /* snapshot-name width */
-        int iMinimumTextWidth = fm.horizontalAdvance("..."); /* ellipsis width */
-#else
-        int iBracketWidth = fm.width("()"); /* bracket width */
-        int iActualTextWidth = fm.width(cache()->toLocal()->snapshotName()); /* snapshot-name width */
-        int iMinimumTextWidth = fm.width("..."); /* ellipsis width */
-#endif
+        const QFontMetrics fm(m_snapshotNameFont, model()->paintDevice());
+        const int iBracketWidth = fm.horizontalAdvance("()"); /* bracket width */
+        const int iActualTextWidth = fm.horizontalAdvance(cache()->toLocal()->snapshotName()); /* snapshot-name width */
+        const int iMinimumTextWidth = fm.horizontalAdvance("..."); /* ellipsis width */
         iMinimumSnapshotNameWidth = iBracketWidth + qMin(iActualTextWidth, iMinimumTextWidth);
     }
@@ -897 +887 @@
 
     /* Calculate new visible snapshot-name: */
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int iBracketWidth = QFontMetrics(m_snapshotNameFont, pPaintDevice).horizontalAdvance("()");
-#else
-    int iBracketWidth = QFontMetrics(m_snapshotNameFont, pPaintDevice).width("()");
-#endif
+    const int iBracketWidth = QFontMetrics(m_snapshotNameFont, pPaintDevice).horizontalAdvance("()");
     QString strVisibleSnapshotName = compressText(m_snapshotNameFont, pPaintDevice, cache()->toLocal()->snapshotName(),
                                                   m_iMaximumSnapshotNameWidth - iBracketWidth);
     strVisibleSnapshotName = QString("(%1)").arg(strVisibleSnapshotName);
-    QSize visibleSnapshotNameSize = textSize(m_snapshotNameFont, pPaintDevice, strVisibleSnapshotName);
+    const QSize visibleSnapshotNameSize = textSize(m_snapshotNameFont, pPaintDevice, strVisibleSnapshotName);
 
     /* Update linked values: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -360 +360 @@
     /* Cache name: */
     m_strName = strName;
-    QFontMetrics fm(m_nameFont, model()->paintDevice());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+    const QFontMetrics fm(m_nameFont, model()->paintDevice());
     m_nameSize = QSize(fm.horizontalAdvance(m_strName), fm.height());
-#else
-    m_nameSize = QSize(fm.width(m_strName), fm.height());
-#endif
 
     /* Update linked values: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp

@@ -645 +645 @@
     const int iWidthOf15Letters = textWidthMonospace(m_nameFont, pPaintDevice, 15);
     const QString strNameCompressedTo15Letters = compressText(m_nameFont, pPaintDevice, m_strName, iWidthOf15Letters);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     const QSize minimumNameSize = QSize(fm.horizontalAdvance(strNameCompressedTo15Letters), fm.height());
-#else
-    const QSize minimumNameSize = QSize(fm.width(strNameCompressedTo15Letters), fm.height());
-#endif
 
     /* Update linked values: */
@@ -700 +696 @@
 {
     /* Return text width, based on font-metrics: */
-    QFontMetrics fm(font, pPaintDevice);
+    const QFontMetrics fm(font, pPaintDevice);
     QString strString;
     strString.fill('_', iCount);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     return fm.horizontalAdvance(strString);
-#else
-    return fm.width(strString);
-#endif
 }
 
@@ -718 +710 @@
 
     /* Check if passed text already fits maximum width: */
-    QFontMetrics fm(font, pPaintDevice);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+    const QFontMetrics fm(font, pPaintDevice);
     if (fm.horizontalAdvance(strText) <= iWidth)
-#else
-    if (fm.width(strText) <= iWidth)
-#endif
         return strText;
 
     /* Truncate otherwise: */
-    QString strEllipsis = QString("...");
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int iEllipsisWidth = fm.horizontalAdvance(strEllipsis + " ");
+    const QString strEllipsis = QString("...");
+    const int iEllipsisWidth = fm.horizontalAdvance(strEllipsis + " ");
     while (!strText.isEmpty() && fm.horizontalAdvance(strText) + iEllipsisWidth > iWidth)
         strText.truncate(strText.size() - 1);
-#else
-    int iEllipsisWidth = fm.width(strEllipsis + " ");
-    while (!strText.isEmpty() && fm.width(strText) + iEllipsisWidth > iWidth)
-        strText.truncate(strText.size() - 1);
-#endif
     return strText + strEllipsis;
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationConfiguration.cpp

@@ -244 +244 @@
                                                const QFontMetrics &fontMetrics, int &iMaxColumn1Length)
 {
-    int iRow = m_pTableWidget->rowCount();
+    const int iRow = m_pTableWidget->rowCount();
     m_pTableWidget->insertRow(iRow);
     m_pTableWidget->setRowHeight(iRow, fontMetrics.height() + m_iRowTopMargin + m_iRowBottomMargin);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     iMaxColumn1Length = qMax(iMaxColumn1Length, fontMetrics.horizontalAdvance(strText1));
-#else
-    iMaxColumn1Length = qMax(iMaxColumn1Length, fontMetrics.width(strText1));
-#endif
     m_pTableWidget->setItem(iRow, 1, new QITableWidgetItem(strText1));
     m_pTableWidget->setItem(iRow, 2, new QITableWidgetItem(strText2));

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.cpp

@@ -221 +221 @@
             strLongest = strLabel;
     }
-    QFontMetrics fontMetrics(font());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+    const QFontMetrics fontMetrics(font());
     setColumnWidth(0, 1.5 * fontMetrics.horizontalAdvance(*strLongest));
-#else
-    setColumnWidth(0, 1.5 * fontMetrics.width(*strLongest));
-#endif
 
     /* Make the API calls and populate the table: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISerialSettingsEditor.cpp

@@ -364 +364 @@
                     if (m_pLabelIRQ)
                         m_pLabelIRQ->setBuddy(m_pLineEditIRQ);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                     m_pLineEditIRQ->setFixedWidth(m_pLineEditIRQ->fontMetrics().horizontalAdvance("8888"));
-#else
-                    m_pLineEditIRQ->setFixedWidth(m_pLineEditIRQ->fontMetrics().width("8888"));
-#endif
                     m_pLineEditIRQ->setValidator(new QIULongValidator(0, 255, this));
                     pLayoutPortSettings->addWidget(m_pLineEditIRQ, 0, 3);
@@ -382 +378 @@
                     if (m_pLabelIOAddress)
                         m_pLabelIOAddress->setBuddy(m_pLineEditIOAddress);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                     m_pLineEditIOAddress->setFixedWidth(m_pLineEditIOAddress->fontMetrics().horizontalAdvance("8888888"));
-#else
-                    m_pLineEditIOAddress->setFixedWidth(m_pLineEditIOAddress->fontMetrics().width("8888888"));
-#endif
                     m_pLineEditIOAddress->setValidator(new QIULongValidator(0, 0xFFFF, this));
                     pLayoutPortSettings->addWidget(m_pLineEditIOAddress, 0, 5);

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UISharedFoldersEditor.cpp

@@ -186 +186 @@
         return;
     const QFontMetrics fm = treeWidget()->fontMetrics();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     const int iOldSize = fm.horizontalAdvance(strOneString);
-#else
-    const int iOldSize = fm.width(strOneString);
-#endif
     const int iItemIndent = parentItem() ? treeWidget()->indentation() * 2 : treeWidget()->indentation();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     int iIndentSize = fm.horizontalAdvance(" ... ");
-#else
-    int iIndentSize = fm.width(" ... ");
-#endif
     if (iColumn == 0)
         iIndentSize += iItemIndent;
@@ -208 +200 @@
     do
     {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
         iTextWidth = fm.horizontalAdvance(strOneString);
-#else
-        iTextWidth = fm.width(strOneString);
-#endif
         if (   iTextWidth
             && iTextWidth + iIndentSize > cWidth)
@@ -256 +244 @@
     if (iPosition || m_enmFormat == FormatType_EllipsisFile)
         strOneString.insert(iPosition, "...");
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     const int iNewSize = fm.horizontalAdvance(strOneString);
-#else
-    const int iNewSize = fm.width(strOneString);
-#endif
     setText(iColumn, iNewSize < iOldSize ? strOneString : m_fields.at(iColumn));
     setToolTip(iColumn, text(iColumn) == getText(iColumn) ? QString() : getText(iColumn));
 
     /* Calculate item's size-hint: */
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     setSizeHint(iColumn, QSize(fm.horizontalAdvance(QString("  %1  ").arg(getText(iColumn))), fm.height()));
-#else
-    setSizeHint(iColumn, QSize(fm.width(QString("  %1  ").arg(getText(iColumn))), fm.height()));
-#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp

@@ -2791 +2791 @@
     QFont font = pModel->data(index, Qt::FontRole).value<QFont>();
     QFontMetrics fm(font);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
     while ((strShortText.size() > 1) && (fm.horizontalAdvance(strShortText) + fm.horizontalAdvance("...") > iTextWidth))
-#else
-    while ((strShortText.size() > 1) && (fm.width(strShortText) + fm.width("...") > iTextWidth))
-#endif
         strShortText.truncate(strShortText.size() - 1);
     if (strShortText != strText)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -2107 +2107 @@
              painterFont.setBold(true);
              painter.setFont(painterFont);
-             QFontMetrics fontMetrics = painter.fontMetrics();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-             int iMargin = 0.25 * fontMetrics.horizontalAdvance('X');
-#else
-             int iMargin = 0.25 * fontMetrics.width('X');
-#endif
+             const QFontMetrics fontMetrics = painter.fontMetrics();
+             const int iMargin = 0.25 * fontMetrics.horizontalAdvance('X');
 
              int iTopWidth = 0;
@@ -2125 +2121 @@
 #endif
              foreach (const QString &strPart, strList)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                  iTopWidth = qMax(iTopWidth, fontMetrics.horizontalAdvance(strPart));
-#else
-                 iTopWidth = qMax(iTopWidth, fontMetrics.width(strPart));
-#endif
              strList.clear();
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
@@ -2141 +2133 @@
              int iBottomWidth = 0;
              foreach (const QString &strPart, strList)
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                  iBottomWidth = qMax(iBottomWidth, fontMetrics.horizontalAdvance(strPart));
-#else
-                 iBottomWidth = qMax(iBottomWidth, fontMetrics.width(strPart));
-#endif
              int iTextWidth =  2 * iMargin + qMax(iTopWidth, iBottomWidth);
              int iTextHeight = 0;
@@ -2170 +2158 @@
      }
 
-     QFontMetrics fontMetrics = painter.fontMetrics();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-     int iMargin = 0.25 * fontMetrics.horizontalAdvance('X');
-#else
-     int iMargin = 0.25 * fontMetrics.width('X');
-#endif
+     const QFontMetrics fontMetrics = painter.fontMetrics();
+     const int iMargin = 0.25 * fontMetrics.horizontalAdvance('X');
      QRect textRect;
      if (key.keyboardRegion() == KeyboardRegion_MultimediaKeys)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp

@@ -498 +498 @@
         return strFullText;
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int iOldSize = fontMetrics().horizontalAdvance(strFullText);
-    int iIndentSize = fontMetrics().horizontalAdvance("x...x");
-#else
-    int iOldSize = fontMetrics().width(strFullText);
-    int iIndentSize = fontMetrics().width("x...x");
-#endif
+    const int iOldSize = fontMetrics().horizontalAdvance(strFullText);
+    const int iIndentSize = fontMetrics().horizontalAdvance("x...x");
 
     /* Compress text: */
@@ -512 +507 @@
     int iTextWidth = 0;
     do {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
         iTextWidth = fontMetrics().horizontalAdvance(strFullText);
-#else
-        iTextWidth = fontMetrics().width(strFullText);
-#endif
         if (iTextWidth + iIndentSize > iWidth)
         {
@@ -538 +529 @@
 
     strFullText.insert(iPosition, "...");
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    int newSize = fontMetrics().horizontalAdvance(strFullText);
-#else
-    int newSize = fontMetrics().width(strFullText);
-#endif
+    const int newSize = fontMetrics().horizontalAdvance(strFullText);
 
     return newSize < iOldSize ? strFullText : fullPath(false);

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFileTableNavigationWidget.cpp

@@ -166 +166 @@
         if (i < folderList.size() - 1)
         {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
             iWidth += fontMetrics().horizontalAdvance(" > ");
-#else
-            iWidth += fontMetrics().width(" > ");
-#endif
             strWord.append("<b> > </b>");
         }
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
         iWidth += fontMetrics().horizontalAdvance(strFolder);
-#else
-        iWidth += fontMetrics().width(strFolder);
-#endif
 
         if (iWidth < width())

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp

@@ -774 +774 @@
                 case UIPortForwardingDataType_GuestIp:
                 {
-                    QFontMetrics fm = qobject_cast<QWidget*>(parent())->fontMetrics();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+                    const QFontMetrics fm = qobject_cast<QWidget*>(parent())->fontMetrics();
                     return QSize(fm.horizontalAdvance(" 888.888.888.888 "), fm.height());
-#else
-                    return QSize(fm.width(" 888.888.888.888 "), fm.height());
-#endif
                 }
                 default: return QVariant();

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISearchLineEdit.cpp

@@ -57 +57 @@
     /* Draw the total match count and the current scrolled item's index on the right hand side of the line edit: */
     QPainter painter(this);
-    QFont pfont = font();
-    QString strText = QString("%1/%2").arg(QString::number(m_iScrollToIndex + 1)).arg(QString::number(m_iMatchCount));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-    QSize textSize(QApplication::fontMetrics().horizontalAdvance(strText),
-                   QApplication::fontMetrics().height());
-#else
-    QSize textSize(QApplication::fontMetrics().width(strText),
-                   QApplication::fontMetrics().height());
-#endif
+    const QFont pfont = font();
+    const QString strText = QString("%1/%2").arg(QString::number(m_iScrollToIndex + 1)).arg(QString::number(m_iMatchCount));
+    const QSize textSize(QApplication::fontMetrics().horizontalAdvance(strText),
+                         QApplication::fontMetrics().height());
 
     /* Dont draw anything if we dont have enough space: */
     if (textSize.width() > 0.5 * width())
         return;
-    int iTopMargin = (height() - textSize.height()) / 2;
-    int iRightMargin = iTopMargin;
+    const int iTopMargin = (height() - textSize.height()) / 2;
+    const int iRightMargin = iTopMargin;
 
     QColor fontColor(Qt::black);

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

@@ -206 +206 @@
     foreach (const UITextTableLine &line, m_text)
     {
-        bool fRightColumnPresent = !line.string2().isEmpty();
+        const bool fRightColumnPresent = !line.string2().isEmpty();
         if (fRightColumnPresent)
             fSingleColumnText = false;
-        QString strLeftLine = fRightColumnPresent ? line.string1() + ":" : line.string1();
-        QString strRightLine = line.string2();
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+        const QString strLeftLine = fRightColumnPresent ? line.string1() + ":" : line.string1();
+        const QString strRightLine = line.string2();
         iMaximumLeftColumnWidth = qMax(iMaximumLeftColumnWidth, fm.horizontalAdvance(strLeftLine));
         iMaximumRightColumnWidth = qMax(iMaximumRightColumnWidth, fm.horizontalAdvance(strRightLine));
-#else
-        iMaximumLeftColumnWidth = qMax(iMaximumLeftColumnWidth, fm.width(strLeftLine));
-        iMaximumRightColumnWidth = qMax(iMaximumRightColumnWidth, fm.width(strRightLine));
-#endif
     }
     iMaximumLeftColumnWidth += 1;
@@ -521 +516 @@
                 QRect symbolRect = QRect(layoutPosition.x() + linePosition.x() + iSymbolX,
                                          layoutPosition.y() + linePosition.y(),
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                                          fm.horizontalAdvance(strLayoutText[iTextPosition]) + 1,
-#else
-                                         fm.width(strLayoutText[iTextPosition]) + 1,
-#endif
                                          fm.height());
                 formatRegion += symbolRect;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageSource.cpp

@@ -357 +357 @@
                  * horizontally and 8 lines vertically: */
                 const QFontMetrics fm(m_pSourceInstanceList->font());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                 const int iFontWidth = fm.horizontalAdvance('x');
-#else
-                const int iFontWidth = fm.width('x');
-#endif
                 const int iTotalWidth = 50 * iFontWidth;
                 const int iFontHeight = fm.height();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp

@@ -227 +227 @@
                                     m_pProfileInstanceLabel->setBuddy(m_pProfileInstanceLabel);
                                     const QFontMetrics fm(m_pProfileInstanceList->font());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                                     const int iFontWidth = fm.horizontalAdvance('x');
-#else
-                                    const int iFontWidth = fm.width('x');
-#endif
                                     const int iTotalWidth = 50 * iFontWidth;
                                     const int iFontHeight = fm.height();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageSource.cpp

@@ -588 +588 @@
                         m_pProfileInstanceLabel->setBuddy(m_pProfileInstanceLabel);
                         const QFontMetrics fm(m_pProfileInstanceList->font());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                         const int iFontWidth = fm.horizontalAdvance('x');
-#else
-                        const int iFontWidth = fm.width('x');
-#endif
                         const int iTotalWidth = 50 * iFontWidth;
                         const int iFontHeight = fm.height();

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageSource.cpp

@@ -415 +415 @@
                      * horizontally and 8 lines vertically: */
                     const QFontMetrics fm(m_pSourceImageList->font());
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
                     const int iFontWidth = fm.horizontalAdvance('x');
-#else
-                    const int iFontWidth = fm.width('x');
-#endif
                     const int iTotalWidth = 50 * iFontWidth;
                     const int iFontHeight = fm.height();