kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fix(gui): fix build errors in OriginSelectorWidget and OriginManager
Some checks failed
Build and Test / build (push) Has been cancelled
Details

Browse Source 
- 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
This commit is contained in:
forbes
2026-02-05 20:48:28 -06:00
parent 2f594dac0a
commit 724440dcb7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Gui/OriginManager.cpp
View File

@@ -124,7 +124,7 @@ bool OriginManager::registerOrigin(FileOrigin* origin)
}
_origins[originId] = std::unique_ptr<FileOrigin>(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;

4
src/Gui/OriginSelectorWidget.cpp
View File

@@ -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);
}
}