# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1594701939 14400
# Node ID 2219027f5bd4170ed65d505cb818ef36356a2c04
# Parent  50c112129700f53bb4afdca3f6d4215fd3ed51c7
avoid deprecated Qt QFontMetrics::width function

* acinclude.m4 (OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE):
New macro.
(OCTAVE_CHECK_QT_VERSION): Use it.

* qt-utils.h (qt_fontmetrics_horizontal_advance): New wrapper functions.

* TerminalView.cpp, variable-editor.cc:
Use qt_fontmetrics_horizontal_advance instead of QFontMetrics::width.

diff -r 50c112129700 -r 2219027f5bd4 libgui/qterminal/libqterminal/unix/TerminalView.cpp
--- a/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Mon Aug 03 09:07:11 2020 -0400
+++ b/libgui/qterminal/libqterminal/unix/TerminalView.cpp	Tue Jul 14 00:45:39 2020 -0400
@@ -27,6 +27,8 @@
 #  include "config.h"
 #endif
 
+#include "qt-utils.h"
+
 // Own
 #include "unix/TerminalView.h"
 
@@ -166,14 +168,15 @@
   // "Base character width on widest ASCII character. This prevents too wide
   //  characters in the presence of double wide (e.g. Japanese) characters."
   // Get the width from representative normal width characters
-  _fontWidth = (double)fm.width(REPCHAR)/(double)strlen(REPCHAR);
+  _fontWidth = ((double)octave::qt_fontmetrics_horizontal_advance(fm, REPCHAR)
+                / (double)strlen(REPCHAR));
 
   _fixedFont = true;
 
-  int fw = fm.width(REPCHAR[0]);
+  int fw = octave::qt_fontmetrics_horizontal_advance(fm, REPCHAR[0]);
   for(unsigned int i=1; i< strlen(REPCHAR); i++)
     {
-      if (fw != fm.width(REPCHAR[i]))
+      if (fw != octave::qt_fontmetrics_horizontal_advance(fm, REPCHAR[i]))
         {
           _fixedFont = false;
           break;
@@ -210,7 +213,7 @@
       // Disabling kerning saves some computation when rendering text.
       // font.setKerning(false);
 
-      QFont::StyleStrategy strategy = font.styleStrategy();
+      int strategy = font.styleStrategy();
 #if defined (HAVE_QFONT_FORCE_INTEGER_METRICS)
       strategy |= QFont::ForceIntegerMetrics;
 #endif
@@ -913,7 +916,7 @@
       if (!_resizeWidget)
         {
           _resizeWidget = new QLabel(("Size: XXX x XXX"), this);
-          _resizeWidget->setMinimumWidth(_resizeWidget->fontMetrics().width(("Size: XXX x XXX")));
+          _resizeWidget->setMinimumWidth(octave::qt_fontmetrics_horizontal_advance(_resizeWidget->fontMetrics(), "Size: XXX x XXX"));
           _resizeWidget->setMinimumHeight(_resizeWidget->sizeHint().height());
           _resizeWidget->setAlignment(Qt::AlignCenter);
 
diff -r 50c112129700 -r 2219027f5bd4 libgui/src/qt-utils.h
--- a/libgui/src/qt-utils.h	Mon Aug 03 09:07:11 2020 -0400
+++ b/libgui/src/qt-utils.h	Tue Jul 14 00:45:39 2020 -0400
@@ -28,12 +28,13 @@
 
 #include <list>
 
+#include <QFontMetrics>
 #include <QList>
 
 namespace octave
 {
   template <typename T>
-  QList<T>
+  inline QList<T>
   std_list_to_qt_list (const std::list<T>& lst)
   {
 #if defined (HAVE_QLIST_ITERATOR_CONSTRUCTOR)
@@ -42,6 +43,27 @@
     return QList<T>::fromStdList (lst);
 #endif
   }
+
+  inline int
+  qt_fontmetrics_horizontal_advance (const QFontMetrics& fm, QChar ch)
+  {
+#if defined (HAVE_QFONTMETRICS_HORIZONTAL_ADVANCE)
+    return fm.horizontalAdvance (ch);
+#else
+    return fm.width (ch);
+#endif
+  }
+
+  inline int
+  qt_fontmetrics_horizontal_advance (const QFontMetrics& fm,
+                                     const QString& text, int len = -1)
+  {
+#if defined (HAVE_QFONTMETRICS_HORIZONTAL_ADVANCE)
+    return fm.horizontalAdvance (text, len);
+#else
+    return fm.width (text, len);
+#endif
+  }
 }
 
 #endif
diff -r 50c112129700 -r 2219027f5bd4 libgui/src/variable-editor.cc
--- a/libgui/src/variable-editor.cc	Mon Aug 03 09:07:11 2020 -0400
+++ b/libgui/src/variable-editor.cc	Tue Jul 14 00:45:39 2020 -0400
@@ -54,6 +54,7 @@
 #include "gui-preferences-global.h"
 #include "gui-preferences-ve.h"
 #include "octave-qobject.h"
+#include "qt-utils.h"
 #include "shortcut-manager.h"
 #include "variable-editor-model.h"
 #include "variable-editor.h"
@@ -527,7 +528,8 @@
         // font, so any character will do.  If not, you lose!
 
         QFontMetrics fm (font ());
-        int w = m_var_model->column_width () * fm.width ('0');
+        int w = (m_var_model->column_width ()
+                 * qt_fontmetrics_horizontal_advance (fm, '0'));
         horizontalHeader ()->setDefaultSectionSize (w);
       }
   }
diff -r 50c112129700 -r 2219027f5bd4 m4/acinclude.m4
--- a/m4/acinclude.m4	Mon Aug 03 09:07:11 2020 -0400
+++ b/m4/acinclude.m4	Tue Jul 14 00:45:39 2020 -0400
@@ -934,6 +934,39 @@
   fi
 ])
 dnl
+dnl Check whether the Qt class QList has a constructor that accepts
+dnl a pair of iterators.  This constructor was introduced in Qt 5.14.
+dnl
+AC_DEFUN([OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE], [
+  AC_CACHE_CHECK([for QFontMetrics::horizontalAdvance function],
+    [octave_cv_func_qfontmetrics_horizontal_advance],
+    [AC_LANG_PUSH(C++)
+    ac_octave_save_CPPFLAGS="$CPPFLAGS"
+    ac_octave_save_CXXFLAGS="$CXXFLAGS"
+    CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
+    CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+        #include <QFont>
+        #include <QFontMetrics>
+        #include <QString>
+        ]], [[
+        QFont font;
+        QFontMetrics fm (font);
+        fm.horizontalAdvance ('x');
+        fm.horizontalAdvance (QString ("string"));
+        ]])],
+      octave_cv_func_qfontmetrics_horizontal_advance=yes,
+      octave_cv_func_qfontmetrics_horizontal_advance=no)
+    CPPFLAGS="$ac_octave_save_CPPFLAGS"
+    CXXFLAGS="$ac_octave_save_CXXFLAGS"
+    AC_LANG_POP(C++)
+  ])
+  if test $octave_cv_func_qfontmetrics_horizontal_advance = yes; then
+    AC_DEFINE(HAVE_QFONTMETRICS_HORIZONTAL_ADVANCE, 1,
+      [Define to 1 if you have the `QFontMetrics::horizontalAdvance' function.])
+  fi
+])
+dnl
 dnl Check whether HDF5 library has version 1.6 API functions.
 dnl
 AC_DEFUN([OCTAVE_CHECK_HDF5_HAS_VER_16_API], [
@@ -2328,6 +2361,7 @@
     ## version that we are testing now will be the one used.
 
     OCTAVE_CHECK_FUNC_QCOMBOBOX_SETCURRENTTEXT
+    OCTAVE_CHECK_FUNC_QFONTMETRICS_HORIZONTAL_ADVANCE
     OCTAVE_CHECK_FUNC_QGUIAPPLICATION_SETDESKTOPFILENAME
     OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONRESIZEMODE
     OCTAVE_CHECK_FUNC_QHEADERVIEW_SETSECTIONSCLICKABLE