electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #27968 material: sunset usage of reinterpret_cast

Browse Source
This commit is contained in:
chris jones @ipatch
2026-02-28 17:36:19 -06:00
committed by Chris Hennes
parent 93e537f3b3
commit 7e7045577f
6 changed files with 57 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mod/Material/App/MaterialConfigLoader.cpp
+2 -2
View File
@@ -40,6 +40,7 @@
#include "Exceptions.h"
#include "MaterialConfigLoader.h"
#include "MaterialLoader.h"
#include "MaterialLibrary.h"
#include "Model.h"
#include "ModelUuids.h"
@@ -1056,8 +1057,7 @@ MaterialConfigLoader::getMaterialFromPath(const std::shared_ptr<MaterialLibraryL
QString sourceReference = value(fcmat, "ReferenceSource", "");
QString sourceURL = value(fcmat, "SourceURL", "");
auto baseLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibrary>&>(library);
auto baseLibrary = std::static_pointer_cast<Materials::MaterialLibrary>(library);
std::shared_ptr<Material> finalModel =
std::make_shared<Material>(baseLibrary, path, uuid, name);
finalModel->setOldFormat(true);
src/Mod/Material/App/MaterialLoader.cpp
+6 -4
View File
@@ -418,8 +418,8 @@ MaterialLoader::getMaterialFromPath(const std::shared_ptr<MaterialLibraryLocal>&
const QString& path) const
{
std::shared_ptr<MaterialEntry> model = nullptr;
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
const auto& materialLibrary = library;
// Used for debugging
std::string pathName = path.toStdString();
@@ -577,8 +577,10 @@ void MaterialLoader::loadLibraries(
for (auto& it : *libraryList) {
if (it->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(it);
loadLibrary(materialLibrary);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(it);
if (materialLibrary) {
loadLibrary(materialLibrary);
}
}
}
}
src/Mod/Material/App/MaterialManager.cpp
+17 -11
View File
@@ -396,9 +396,10 @@ MaterialManager::getMaterialFolders(const std::shared_ptr<MaterialLibrary>& libr
{
if (library->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
return _localManager->getMaterialFolders(materialLibrary);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
if (materialLibrary) {
return _localManager->getMaterialFolders(materialLibrary);
}
}
return std::make_shared<std::list<QString>>();
@@ -409,7 +410,7 @@ void MaterialManager::createFolder(const std::shared_ptr<MaterialLibrary>& libra
{
if (library->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
_localManager->createFolder(materialLibrary, path);
}
@@ -429,9 +430,10 @@ void MaterialManager::renameFolder(const std::shared_ptr<MaterialLibrary>& libra
{
if (library->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
_localManager->renameFolder(materialLibrary, oldPath, newPath);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
if (materialLibrary) {
_localManager->renameFolder(materialLibrary, oldPath, newPath);
}
}
#if defined(BUILD_MATERIAL_EXTERNAL)
else if (_useExternal) {
@@ -448,9 +450,10 @@ void MaterialManager::deleteRecursive(const std::shared_ptr<MaterialLibrary>& li
{
if (library->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
_localManager->deleteRecursive(materialLibrary, path);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
if (materialLibrary) {
_localManager->deleteRecursive(materialLibrary, path);
}
}
#if defined(BUILD_MATERIAL_EXTERNAL)
else if (_useExternal) {
@@ -573,7 +576,10 @@ void MaterialManager::saveMaterial(const std::shared_ptr<MaterialLibrary>& libra
bool saveInherited) const
{
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
if (!materialLibrary) {
return;
}
_localManager
->saveMaterial(materialLibrary, material, path, overwrite, saveAsCopy, saveInherited);
}
src/Mod/Material/App/MaterialManagerLocal.cpp
+22 -8
View File
@@ -161,7 +161,10 @@ void MaterialManagerLocal::renameLibrary(const QString& libraryName, const QStri
for (auto& library : *_libraryList) {
if (library->isLocal() && library->isName(libraryName)) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
if (!materialLibrary) {
throw LibraryNotFound();
}
materialLibrary->setName(newName);
return;
}
@@ -175,7 +178,10 @@ void MaterialManagerLocal::changeIcon(const QString& libraryName, const QByteArr
for (auto& library : *_libraryList) {
if (library->isLocal() && library->isName(libraryName)) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
if (!materialLibrary) {
throw LibraryNotFound();
}
materialLibrary->setIcon(icon);
return;
}
@@ -312,7 +318,10 @@ std::shared_ptr<Material> MaterialManagerLocal::getMaterialByPath(const QString&
for (auto& library : *_libraryList) {
if (library->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
if (!materialLibrary) {
continue;
}
if (cleanPath.startsWith(materialLibrary->getDirectory())) {
try {
return materialLibrary->getMaterialByPath(cleanPath);
@@ -359,7 +368,10 @@ std::shared_ptr<Material> MaterialManagerLocal::getMaterialByPath(const QString&
auto library = getLibrary(lib); // May throw LibraryNotFound
if (library->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
if (!materialLibrary) {
throw LibraryNotFound();
}
return materialLibrary->getMaterialByPath(path); // May throw MaterialNotFound
}
@@ -385,11 +397,13 @@ bool MaterialManagerLocal::exists(const MaterialLibrary& library,
{
try {
auto material = getMaterial(uuid);
if (material && material->getLibrary()->isLocal()) {
if (material && material->getLibrary()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(
*(material->getLibrary()));
return (*materialLibrary == library);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(
material->getLibrary());
if (materialLibrary) {
return (*materialLibrary == library);
}
}
}
catch (const MaterialNotFound&) {
src/Mod/Material/App/MaterialManagerPyImp.cpp
+4 -1
View File
@@ -145,7 +145,10 @@ Py::List MaterialManagerPy::getMaterialLibraries() const
Py::Tuple libTuple(3);
if (lib->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(lib);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(lib);
if (!materialLibrary) {
continue;
}
libTuple.setItem(0, Py::String(materialLibrary->getName().toStdString()));
libTuple.setItem(1, Py::String(materialLibrary->getDirectoryPath().toStdString()));
libTuple.setItem(2,
src/Mod/Material/App/MaterialPyImp.cpp
+6 -3
View File
@@ -71,7 +71,7 @@ Py::String MaterialPy::getLibraryName() const
auto library = getMaterialPtr()->getLibrary();
if (library->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
return {materialLibrary ? materialLibrary->getName().toStdString() : ""};
}
return "";
@@ -82,7 +82,7 @@ Py::String MaterialPy::getLibraryRoot() const
auto library = getMaterialPtr()->getLibrary();
if (library->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
return {materialLibrary ? materialLibrary->getDirectoryPath().toStdString() : ""};
}
return "";
@@ -93,7 +93,10 @@ Py::Object MaterialPy::getLibraryIcon() const
auto library = getMaterialPtr()->getLibrary();
if (library->isLocal()) {
auto materialLibrary =
reinterpret_cast<const std::shared_ptr<Materials::MaterialLibraryLocal>&>(library);
std::dynamic_pointer_cast<Materials::MaterialLibraryLocal>(library);
if (!materialLibrary) {
return Py::Bytes();
}
auto icon = materialLibrary->getIcon();
if (icon.isNull()) {
return Py::Bytes();