From ab4168fd93f7cf9c60c47b0204cd495da32e8e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Sat, 23 May 2020 17:32:01 +0200 Subject: [PATCH] Minor updates following changes in uibase. --- src/runner/pythonrunner.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index b562f06..d2c822c 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -307,7 +307,6 @@ BOOST_PYTHON_MODULE(mobase) .def("pathFrom", &FileTreeEntry::pathFrom, bpy::arg("sep") = "\\") // Mutable operation: - .def("setTime", &FileTreeEntry::setTime) .def("detach", &FileTreeEntry::detach) .def("moveTo", &FileTreeEntry::moveTo) @@ -361,13 +360,13 @@ BOOST_PYTHON_MODULE(mobase) // addFile() and addDirectory throws exception instead of returning null pointer in order // to have better traces. - .def("addFile", +[](IFileTree* w, QString name, QDateTime time) { - auto result = w->addFile(name, time); + .def("addFile", +[](IFileTree* w, QString name) { + auto result = w->addFile(name); if (result == nullptr) { throw std::logic_error("addFile failed"); } return result; - }, bpy::arg("time") = QDateTime()) + }) .def("addDirectory", +[](IFileTree* w, QString name) { auto result = w->addDirectory(name); if (result == nullptr) { @@ -887,11 +886,11 @@ BOOST_PYTHON_MODULE(moprivate) FileTree(std::shared_ptr parent, QString name, callback_t callback) : FileTreeEntry(parent, name), IFileTree(), m_Callback(callback){ } - std::shared_ptr addFile(QString name, QDateTime time) override { + std::shared_ptr addFile(QString name) override { if (m_Callback && !m_Callback(name, false)) { throw UnsupportedOperationException("File rejected by callback."); } - return IFileTree::addFile(name, time); + return IFileTree::addFile(name); } std::shared_ptr addDirectory(QString name) override { @@ -907,7 +906,7 @@ BOOST_PYTHON_MODULE(moprivate) return std::make_shared(parent, name, m_Callback); } - void doPopulate(std::shared_ptr parent, std::vector>& entries) const override { } + bool doPopulate(std::shared_ptr parent, std::vector>& entries) const override { return true; } std::shared_ptr doClone() const override { return std::make_shared(nullptr, name(), m_Callback); } private: