#5746: Rename textool::NodeBase to textool::Node

codereader · Sep 26, 2021 · e1f9877 · e1f9877
1 parent 3989eb7
commit e1f9877
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/radiantcore/selection/textool/FaceNode.h b/radiantcore/selection/textool/FaceNode.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "math/AABB.h"
-#include "NodeBase.h"
+#include "Node.h"
 
 class Matrix3;
 class IFace;
@@ -13,7 +13,7 @@ namespace textool
  * Represents a single face in the Texture Tool scene.
  */
 class FaceNode final :
-    public NodeBase,
+    public Node,
     public IFaceNode
 {
 private:

diff --git a/radiantcore/selection/textool/NodeBase.h → radiantcore/selection/textool/Node.h b/radiantcore/selection/textool/NodeBase.h → radiantcore/selection/textool/Node.h
@@ -10,10 +10,9 @@
 namespace textool
 {
 
-class NodeBase :
+class Node :
     public virtual INode,
-    public virtual IComponentSelectable,
-    public std::enable_shared_from_this<NodeBase>
+    public virtual IComponentSelectable
 {
 private:
     selection::ObservedSelectable _selectable;
@@ -22,8 +21,8 @@ class NodeBase :
     std::vector<SelectableVertex> _vertices;
 
 public:
-    NodeBase() :
-        _selectable(sigc::mem_fun(*this, &NodeBase::onSelectionStatusChanged))
+    Node() :
+        _selectable(sigc::mem_fun(*this, &Node::onSelectionStatusChanged))
     {}
 
     virtual void setSelected(bool select) override

diff --git a/radiantcore/selection/textool/PatchNode.h b/radiantcore/selection/textool/PatchNode.h
@@ -2,15 +2,15 @@
 
 #include <functional>
 #include "math/AABB.h"
-#include "NodeBase.h"
+#include "Node.h"
 
 class IPatch;
 
 namespace textool
 {
 
 class PatchNode :
-    public NodeBase,
+    public Node,
     public IPatchNode
 {
 private:

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -1031,7 +1031,7 @@
     <ClInclude Include="..\..\radiantcore\selection\shaderclipboard\ShaderClipboard.h" />
     <ClInclude Include="..\..\radiantcore\selection\shaderclipboard\Texturable.h" />
     <ClInclude Include="..\..\radiantcore\selection\textool\FaceNode.h" />
-    <ClInclude Include="..\..\radiantcore\selection\textool\NodeBase.h" />
+    <ClInclude Include="..\..\radiantcore\selection\textool\Node.h" />
     <ClInclude Include="..\..\radiantcore\selection\textool\PatchNode.h" />
     <ClInclude Include="..\..\radiantcore\selection\textool\SelectableVertex.h" />
     <ClInclude Include="..\..\radiantcore\selection\textool\TextureToolDragManipulator.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -2223,7 +2223,7 @@
     <ClInclude Include="..\..\radiantcore\selection\textool\FaceNode.h">
       <Filter>src\selection\textool</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\selection\textool\NodeBase.h">
+    <ClInclude Include="..\..\radiantcore\selection\textool\Node.h">
       <Filter>src\selection\textool</Filter>
     </ClInclude>
     <ClInclude Include="..\..\radiantcore\selection\textool\PatchNode.h">