From 724440dcb7539026bd62fed55556d8407fe44d21 Mon Sep 17 00:00:00 2001 From: forbes Date: Thu, 5 Feb 2026 20:48:28 -0600 Subject: [PATCH] fix(gui): fix build errors in OriginSelectorWidget and OriginManager - OriginSelectorWidget: use BitmapFactoryInst::mergePixmap() instead of BitmapFactory::mergePixmap() since BitmapFactory is a function, not a class - OriginManager: use Console().log() instead of Console().Log() which does not exist on ConsoleSingleton --- src/Gui/OriginManager.cpp | 4 ++-- src/Gui/OriginSelectorWidget.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Gui/OriginManager.cpp b/src/Gui/OriginManager.cpp index f97fb8a443..90763923a3 100644 --- a/src/Gui/OriginManager.cpp +++ b/src/Gui/OriginManager.cpp @@ -124,7 +124,7 @@ bool OriginManager::registerOrigin(FileOrigin* origin) } _origins[originId] = std::unique_ptr(origin); - Base::Console().Log("OriginManager: Registered origin '%s'\n", originId.c_str()); + Base::Console().log("OriginManager: Registered origin '%s'\n", originId.c_str()); signalOriginRegistered(originId); return true; @@ -150,7 +150,7 @@ bool OriginManager::unregisterOrigin(const std::string& id) } _origins.erase(it); - Base::Console().Log("OriginManager: Unregistered origin '%s'\n", id.c_str()); + Base::Console().log("OriginManager: Unregistered origin '%s'\n", id.c_str()); signalOriginUnregistered(id); return true; diff --git a/src/Gui/OriginSelectorWidget.cpp b/src/Gui/OriginSelectorWidget.cpp index cb2d6b41fe..a8e3f3aa3b 100644 --- a/src/Gui/OriginSelectorWidget.cpp +++ b/src/Gui/OriginSelectorWidget.cpp @@ -244,7 +244,7 @@ QIcon OriginSelectorWidget::iconForOrigin(FileOrigin* origin) const QPixmap overlay = BitmapFactory().pixmapFromSvg( "dagViewFail", QSizeF(8, 8)); if (!overlay.isNull()) { - baseIcon = BitmapFactory::mergePixmap( + baseIcon = BitmapFactoryInst::mergePixmap( baseIcon, overlay, BitmapFactoryInst::BottomRight); } } @@ -256,7 +256,7 @@ QIcon OriginSelectorWidget::iconForOrigin(FileOrigin* origin) const QPixmap overlay = BitmapFactory().pixmapFromSvg( "Warning", QSizeF(8, 8)); if (!overlay.isNull()) { - baseIcon = BitmapFactory::mergePixmap( + baseIcon = BitmapFactoryInst::mergePixmap( baseIcon, overlay, BitmapFactoryInst::BottomRight); } }