#5746: Remove empty interface type, use the IOrthoViewBase type for t…

…he Texture Tool.
codereader · Sep 28, 2021 · 8ddd6f5 · 8ddd6f5
1 parent eb8ed2d
commit 8ddd6f5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 25 deletions.
diff --git a/include/itexturetoolview.h b/include/itexturetoolview.h
diff --git a/radiant/textool/TexTool.h b/radiant/textool/TexTool.h
@@ -8,8 +8,8 @@
 #include "math/AABB.h"
 #include "ishaders.h"
 #include "imanipulator.h"
-#include "itexturetoolview.h"
 #include "iradiant.h"
+#include "iorthoview.h"
 #include "imousetool.h"
 #include "iselection.h"
 #include "iregistry.h"
@@ -37,7 +37,7 @@ typedef std::shared_ptr<TexTool> TexToolPtr;
 
 class TexTool : 
 	public wxutil::TransientWindow,
-    public ITextureToolView,
+    public IOrthoViewBase,
 	public sigc::trackable,
     protected wxutil::MouseToolHandler
 {

diff --git a/radiant/textool/tools/TextureToolMouseEvent.h b/radiant/textool/tools/TextureToolMouseEvent.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "itexturetoolview.h"
+#include "iorthoview.h"
 #include "imousetoolevent.h"
 
 namespace ui
@@ -11,20 +11,20 @@ class TextureToolMouseEvent :
     public OrthoViewMouseToolEvent
 {
 private:
-    ITextureToolView& _view;
+    IOrthoViewBase& _view;
 
 public:
-    TextureToolMouseEvent(ITextureToolView& view, const Vector2& devicePosition) :
+    TextureToolMouseEvent(IOrthoViewBase& view, const Vector2& devicePosition) :
         OrthoViewMouseToolEvent(view, devicePosition),
         _view(view)
     {}
 
-    TextureToolMouseEvent(ITextureToolView& view, const Vector2& devicePosition, const Vector2& delta) :
+    TextureToolMouseEvent(IOrthoViewBase& view, const Vector2& devicePosition, const Vector2& delta) :
         OrthoViewMouseToolEvent(view, devicePosition, delta),
         _view(view)
     {}
 
-    ITextureToolView& getView()
+    IOrthoViewBase& getView()
     {
         return _view;
     }

diff --git a/tools/msvc/include.vcxproj b/tools/msvc/include.vcxproj
@@ -200,7 +200,6 @@
     <ClInclude Include="..\..\include\itexturetoolcolours.h" />
     <ClInclude Include="..\..\include\itextstream.h" />
     <ClInclude Include="..\..\include\itexturetoolmodel.h" />
-    <ClInclude Include="..\..\include\itexturetoolview.h" />
     <ClInclude Include="..\..\include\itoolbarmanager.h" />
     <ClInclude Include="..\..\include\itraceable.h" />
     <ClInclude Include="..\..\include\itransformable.h" />