Mercurial > octave

changeset 25094:c0d48cfbb59a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use Octave system functions to avoid build failure with Qt 4 (bug #53540) * ObjectProxy.cc (ObjectProxy::get_pixels): Use octave_sleep function rather than QThread::msleep, which is not a public method in Qt 4. * documentation.cc (documentation::~documentation): Use sys::recursive_rmdir rather than QDir::removeRecursively, which does not exist in Qt 4.
author Mike Miller <mtmiller@octave.org>
date Mon, 02 Apr 2018 15:57:09 -0700
parents 69cbaa179780
children 71ed409b2ffb
files libgui/graphics/ObjectProxy.cc libgui/src/documentation.cc
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/ObjectProxy.cc	Mon Apr 02 15:55:01 2018 -0700
+++ b/libgui/graphics/ObjectProxy.cc	Mon Apr 02 15:57:09 2018 -0700
@@ -29,6 +29,7 @@
 #include <QThread>
 
 #include "oct-mutex.h"
+#include "utils.h"
 
 #include "Object.h"
 #include "ObjectProxy.h"
@@ -134,11 +135,11 @@
     if (! QMetaObject::invokeMethod (m_object, "slotGetPixels", t,
                                      Q_RETURN_ARG (uint8NDArray, retval)))
       {
-        QThread::msleep (100);
+        octave_sleep (0.1);
         if (! QMetaObject::invokeMethod (m_object, "slotGetPixels", t,
                                          Q_RETURN_ARG (uint8NDArray, retval)))
           {
-            QThread::msleep (200);
+            octave_sleep (0.2);
             if (! QMetaObject::invokeMethod (m_object, "slotGetPixels", t,
                                              Q_RETURN_ARG (uint8NDArray, retval)))
               error ("getframe: unable to retrieve figure pixels");
--- a/libgui/src/documentation.cc	Mon Apr 02 15:55:01 2018 -0700
+++ b/libgui/src/documentation.cc	Mon Apr 02 15:57:09 2018 -0700
@@ -200,8 +200,8 @@
         namefilter.append ("*" + bname + "*");
         foreach (QFileInfo fi, dir.entryInfoList (namefilter))
           {
-            QDir tmpdir (fi.absoluteFilePath ());
-            tmpdir.removeRecursively ();
+            std::string file_name = fi.absoluteFilePath ().toStdString ();
+            sys::recursive_rmdir (file_name);
           }
 
         file.remove();