From 3757ec7ee8980869505b799fd1cbbae6ff92ab0f Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Tue, 11 Jul 2023 14:39:50 +0200 Subject: [PATCH] Silence unused variable warning in Outliner code Also add type forward declarations to avoid breaking IDE features (because type name is not known from the header only). --- .../editors/space_outliner/tree/tree_element_bone.cc | 8 ++++---- .../editors/space_outliner/tree/tree_element_bone.hh | 6 +++++- .../space_outliner/tree/tree_element_edit_bone.cc | 10 ++++++---- .../space_outliner/tree/tree_element_edit_bone.hh | 4 +++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/source/blender/editors/space_outliner/tree/tree_element_bone.cc b/source/blender/editors/space_outliner/tree/tree_element_bone.cc index a9117217a92..057f54b075e 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_bone.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_bone.cc @@ -15,12 +15,12 @@ namespace blender::ed::outliner { -TreeElementBone::TreeElementBone(TreeElement &legacy_te, ID &armature_id, Bone &bone) - : AbstractTreeElement(legacy_te), armature_id_(armature_id), bone_(bone) +TreeElementBone::TreeElementBone(TreeElement &legacy_te, ID & /*armature_id*/, Bone &bone) + : AbstractTreeElement(legacy_te) /*, armature_id_(armature_id)*/, bone_(bone) { BLI_assert(legacy_te.store_elem->type == TSE_BONE); - legacy_te.name = bone.name; - legacy_te.directdata = &bone; + legacy_te.name = bone_.name; + legacy_te.directdata = &bone_; } } // namespace blender::ed::outliner diff --git a/source/blender/editors/space_outliner/tree/tree_element_bone.hh b/source/blender/editors/space_outliner/tree/tree_element_bone.hh index 755a82093f9..4c21e918fdf 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_bone.hh +++ b/source/blender/editors/space_outliner/tree/tree_element_bone.hh @@ -10,10 +10,14 @@ #include "tree_element.hh" +struct ID; +struct Bone; + namespace blender::ed::outliner { class TreeElementBone final : public AbstractTreeElement { - ID &armature_id_; + /* Not needed right now, avoid unused member variable warning. */ + // ID &armature_id_; Bone &bone_; public: diff --git a/source/blender/editors/space_outliner/tree/tree_element_edit_bone.cc b/source/blender/editors/space_outliner/tree/tree_element_edit_bone.cc index 28e8e200759..db3869edeb7 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_edit_bone.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_edit_bone.cc @@ -14,11 +14,13 @@ namespace blender::ed::outliner { -TreeElementEditBone::TreeElementEditBone(TreeElement &legacy_te, ID &armature_id, EditBone &ebone) - : AbstractTreeElement(legacy_te), armature_id_(armature_id), ebone_(ebone) +TreeElementEditBone::TreeElementEditBone(TreeElement &legacy_te, + ID & /*armature_id*/, + EditBone &ebone) + : AbstractTreeElement(legacy_te) /*, armature_id_(armature_id)*/, ebone_(ebone) { - legacy_te.directdata = &ebone; - legacy_te.name = ebone.name; + legacy_te.directdata = &ebone_; + legacy_te.name = ebone_.name; } } // namespace blender::ed::outliner diff --git a/source/blender/editors/space_outliner/tree/tree_element_edit_bone.hh b/source/blender/editors/space_outliner/tree/tree_element_edit_bone.hh index abf9f539824..562a551f749 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_edit_bone.hh +++ b/source/blender/editors/space_outliner/tree/tree_element_edit_bone.hh @@ -10,12 +10,14 @@ #include "tree_element.hh" +struct ID; struct EditBone; namespace blender::ed::outliner { class TreeElementEditBone final : public AbstractTreeElement { - ID &armature_id_; + /* Not needed right now, avoid unused member variable warning. */ + // ID &armature_id_; EditBone &ebone_; public: