From 4a736b7731056c7582bbcee000fca517c15f0c70 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Wed, 25 Dec 2019 08:02:48 -0500 Subject: [PATCH] [TD]fix Py2/Qt4 errors --- src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp | 7 +---- src/Mod/TechDraw/Gui/QGILeaderLine.cpp | 28 ++++++++++---------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp b/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp index 8955041ff8..3fbb9444f3 100644 --- a/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp +++ b/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp @@ -153,12 +153,7 @@ void CosmeticVertexPy::setPoint(Py::Object arg) Py::Boolean CosmeticVertexPy::getShow(void) const { bool show = getCosmeticVertexPtr()->visible; - if (show) { - Py_RETURN_TRUE; - } else { - Py_RETURN_FALSE; - } -// return Py::asObject(); + return Py::Boolean(show); } void CosmeticVertexPy::setShow(Py::Boolean arg) diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp index c20ab2e6ef..6d9d7a5b6a 100644 --- a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp @@ -22,21 +22,21 @@ #include "PreCompiled.h" #ifndef _PreComp_ - #include - #include - # include - # include - # include - # include - # include +#include +#include +#include +#include +#include +#include +#include - # include - # include - # include - # include - # include - - # include +#include +#include +#include +#include +#include +#include +#include #endif #include