From 8ddd6f5e0c04b142c4afbcc4e702f16557b0b4ac Mon Sep 17 00:00:00 2001
From: codereader <greebo@angua.at>
Date: Tue, 28 Sep 2021 19:57:32 +0200
Subject: [PATCH] #5746: Remove empty interface type, use the IOrthoViewBase
 type for the Texture Tool.

---
 include/itexturetoolview.h                    | 17 -----------------
 radiant/textool/TexTool.h                     |  4 ++--
 radiant/textool/tools/TextureToolMouseEvent.h | 10 +++++-----
 tools/msvc/include.vcxproj                    |  1 -
 4 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 include/itexturetoolview.h

diff --git a/include/itexturetoolview.h b/include/itexturetoolview.h
deleted file mode 100644
index 6d1e1bc529..0000000000
--- a/include/itexturetoolview.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "iorthoview.h"
-
-class SelectionTest;
-
-namespace ui
-{
-
-class ITextureToolView :
-    public IOrthoViewBase
-{
-public:
-    virtual ~ITextureToolView() {}
-};
-
-}
diff --git a/radiant/textool/TexTool.h b/radiant/textool/TexTool.h
index b03f86e339..20d9b9dd13 100644
--- 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
index c115928d2b..e8aaa44565 100644
--- 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
index 234e730a39..f92d8496fc 100644
--- 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" />