From f83ed392872f8771f3d49771ca31f3b43109567b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Sun, 3 May 2020 12:57:23 +0200 Subject: [PATCH] Modify FileTypes enumeration for FileTreeEntry. --- src/runner/pythonrunner.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 4696d82..68a6851 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -938,9 +938,8 @@ BOOST_PYTHON_MODULE(mobase) { bpy::scope scope = fileTreeEntryClass; - - bpy::enum_("FileType") + bpy::enum_("FileTypes") .value("FILE_OR_DIRECTORY", FileTreeEntry::FILE_OR_DIRECTORY) .value("FILE", FileTreeEntry::FILE) .value("DIRECTORY", FileTreeEntry::DIRECTORY) @@ -951,7 +950,8 @@ BOOST_PYTHON_MODULE(mobase) .def("isFile", &FileTreeEntry::isFile) .def("isDir", &FileTreeEntry::isDir) - .def("fileType", &FileTreeEntry::fileType) + // Forcing the conversion to FileTypeS to avoid having to expose FileType in python: + .def("fileType", +[](FileTreeEntry* p) { return FileTreeEntry::FileTypes{ p->fileType() }; }) // This should probably not be exposed in python since we provide automatic downcast: // .def("getTree", static_cast(FileTreeEntry::*)()>(&FileTreeEntry::astree)) .def("name", &FileTreeEntry::name)