Mercurial > octave

diff libgui/src/qt-interpreter-events.cc @ 28566:20ee8aa92897

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid QList deprecated function warnings * libgui/src/qt-utils.h: New file. * libgui/src/module.mk: Update. * qt-interpreter-events.cc: Avoid deprecated QList<T>::fromStdList and QList<T>::toStdList functions. * acinclude.m4 (OCTAVE_CHECK_FUNC_QLIST_ITERATOR_CONSTRUCTOR): New macro. (OCTAVE_CHECK_QT_VERSION): Use it.
author John W. Eaton <jwe@octave.org>
date Mon, 13 Jul 2020 14:57:22 -0400
parents f2789cae04f3
children aba2c4eadb83 8a05763823d1
line wrap: on
line diff
--- a/libgui/src/qt-interpreter-events.cc	Mon Jul 13 12:30:46 2020 -0400
+++ b/libgui/src/qt-interpreter-events.cc	Mon Jul 13 14:57:22 2020 -0400
@@ -38,6 +38,7 @@
 #include "gui-preferences-ed.h"
 #include "octave-qobject.h"
 #include "qt-interpreter-events.h"
+#include "qt-utils.h"
 
 #include "localcharset-wrapper.h"
 #include "oct-env.h"
@@ -161,8 +162,8 @@
     QStringList lst
       = m_uiwidget_creator.input_dialog (make_qstring_list (prompt),
                                          QString::fromStdString (title),
-                                         QFloatList::fromStdList (nr),
-                                         QFloatList::fromStdList (nc),
+                                         std_list_to_qt_list<float> (nr),
+                                         std_list_to_qt_list<float> (nc),
                                          make_qstring_list (defaults));
     std::list<std::string> retval;
 
@@ -186,13 +187,15 @@
       = m_uiwidget_creator.list_dialog (make_qstring_list (list),
                                         QString::fromStdString (mode),
                                         width, height,
-                                        QList<int>::fromStdList (initial),
+                                        std_list_to_qt_list<int> (initial),
                                         QString::fromStdString (name),
                                         make_qstring_list (prompt),
                                         QString::fromStdString (ok_string),
                                         QString::fromStdString (cancel_string));
 
-    return std::pair<std::list<int>, int> (result.first.toStdList (),
+    QIntList& lst = result.first;
+    return std::pair<std::list<int>, int> (std::list<int> (lst.begin (),
+                                                           lst.end ()),
                                            result.second);
   }