# HG changeset patch # User Mike Miller # Date 1522709829 25200 # Node ID c0d48cfbb59aa4539a9c7025b3a4685b889bb4d3 # Parent 69cbaa17978014740e8f65e6cc349175fb660411 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. diff -r 69cbaa179780 -r c0d48cfbb59a libgui/graphics/ObjectProxy.cc --- 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 #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"); diff -r 69cbaa179780 -r c0d48cfbb59a libgui/src/documentation.cc --- 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();