From 20050d002dfd2ee0660c290b6c9c3a11dbdfcb35 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sun, 2 Mar 2025 17:09:19 -0600 Subject: [PATCH 1/2] Inventor: Fix old color ref --- src/Gui/Inventor/SoFCPlacementIndicatorKit.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Gui/Inventor/SoFCPlacementIndicatorKit.cpp b/src/Gui/Inventor/SoFCPlacementIndicatorKit.cpp index d794b4d4e5..2da7d24382 100644 --- a/src/Gui/Inventor/SoFCPlacementIndicatorKit.cpp +++ b/src/Gui/Inventor/SoFCPlacementIndicatorKit.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include @@ -152,7 +152,7 @@ SoSeparator* SoFCPlacementIndicatorKit::createAxes() Base::Vector3d axis, uint32_t packedColor, const double offset) { - App::Color axisColor(packedColor); + Base::Color axisColor(packedColor); auto sep = new SoSeparator; @@ -265,7 +265,7 @@ SoSeparator* SoFCPlacementIndicatorKit::createPlaneIndicator() pcCylinder->radius = planeIndicatorRadius; pcCylinder->parts = SoCylinder::TOP; - const auto gray = App::Color(0.75f, 0.75f, 0.75f); + const auto gray = Base::Color(0.75f, 0.75f, 0.75f); auto pcMaterial = new SoMaterial(); pcMaterial->diffuseColor.setValue(Base::convertTo(gray)); @@ -284,4 +284,4 @@ SoSeparator* SoFCPlacementIndicatorKit::createPlaneIndicator() SoFCPlacementIndicatorKit::~SoFCPlacementIndicatorKit() = default; -} // namespace Gui \ No newline at end of file +} // namespace Gui From c762d5660365bbe917960cd63586296d17adf690 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sun, 2 Mar 2025 17:23:26 -0600 Subject: [PATCH 2/2] Spreadsheet: Fix old ref to name in doc --- src/Mod/Spreadsheet/App/Sheet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Spreadsheet/App/Sheet.cpp b/src/Mod/Spreadsheet/App/Sheet.cpp index 3a0c0129cb..71da191938 100644 --- a/src/Mod/Spreadsheet/App/Sheet.cpp +++ b/src/Mod/Spreadsheet/App/Sheet.cpp @@ -118,7 +118,7 @@ Sheet::~Sheet() // Don't let an exception propagate out of a destructor (calls terminate()) Base::Console().Error( "clearAll() resulted in an exception when deleting the spreadsheet : %s\n", - *pcNameInDocument); + getNameInDocument()); } }