using horizontalAdvance instead of width when possible to avoid depre…

…cation warnings (#715)
enthought · Oct 7, 2020 · daa26ff · daa26ff
1 parent 61ac7e1
commit daa26ff
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/pyface/ui/qt4/code_editor/code_widget.py b/pyface/ui/qt4/code_editor/code_widget.py
@@ -473,7 +473,12 @@ def sizeHint(self):
         style = self.style()
         opt = QtGui.QStyleOptionHeader()
         font_metrics = QtGui.QFontMetrics(self.document().defaultFont())
-        width = font_metrics.width(" ") * 80
+        # QFontMetrics.width() is deprecated and Qt docs suggest using
+        # horizontalAdvance() instead, but is only available since Qt 5.11
+        if QtCore.__version_info__ >= (5, 11):
+            width = font_metrics.horizontalAdvance(" ") * 80
+        else:
+            width = font_metrics.width(" ") * 80
         width += self.line_number_widget.sizeHint().width()
         width += self.status_widget.sizeHint().width()
         width += style.pixelMetric(QtGui.QStyle.PM_ScrollBarExtent, opt, self)

diff --git a/pyface/ui/qt4/code_editor/find_widget.py b/pyface/ui/qt4/code_editor/find_widget.py
@@ -19,7 +19,12 @@ def __init__(self, parent):
         super(FindWidget, self).__init__(parent)
         self.adv_code_widget = weakref.ref(parent)
 
-        self.button_size = self.fontMetrics().width("Replace All") + 20
+        # QFontMetrics.width() is deprecated and Qt docs suggest using
+        # horizontalAdvance() instead, but is only available since Qt 5.11
+        if QtCore.__version_info__ >= (5, 11):
+            self.button_size = self.fontMetrics().horizontalAdvance("Replace All") + 20
+        else:
+            self.button_size = self.fontMetrics().width("Replace All") + 20
 
         form_layout = QtGui.QFormLayout()
         form_layout.addRow("Fin&d", self._create_find_control())

diff --git a/pyface/ui/qt4/code_editor/gutters.py b/pyface/ui/qt4/code_editor/gutters.py
@@ -96,9 +96,17 @@ def digits_width(self):
         ndigits = max(
             self.min_char_width, int(math.floor(math.log10(nlines) + 1))
         )
-        width = max(
-            self.fontMetrics().width("0" * ndigits) + 3, self.min_width
-        )
+        # QFontMetrics.width() is deprecated and Qt docs suggest using
+        # horizontalAdvance() instead, but is only available since Qt 5.11
+        if QtCore.__version_info__ >= (5, 11):
+            width = max(
+                self.fontMetrics().horizontalAdvance("0" * ndigits) + 3,
+                self.min_width
+            )
+        else:
+            width = max(
+                self.fontMetrics().width("0" * ndigits) + 3, self.min_width
+            )
         return width
 
     def sizeHint(self):

diff --git a/pyface/ui/qt4/code_editor/replace_widget.py b/pyface/ui/qt4/code_editor/replace_widget.py
@@ -21,7 +21,12 @@ def __init__(self, parent):
         super(FindWidget, self).__init__(parent)
         self.adv_code_widget = weakref.ref(parent)
 
-        self.button_size = self.fontMetrics().width("Replace All") + 20
+        # QFontMetrics.width() is deprecated and Qt docs suggest using
+        # horizontalAdvance() instead, but is only available since Qt 5.11
+        if QtCore.__version_info__ >= (5, 11):
+            self.button_size = self.fontMetrics().horizontalAdvance("Replace All") + 20
+        else:
+            self.button_size = self.fontMetrics().width("Replace All") + 20
 
         form_layout = QtGui.QFormLayout()
         form_layout.addRow("Fin&d", self._create_find_control())