#5977: Remove unneeded typedefs

codereader · Jul 17, 2022 · 8225f1f · 8225f1f
1 parent aa91f53
commit 8225f1f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/radiantcore/shaders/CShader.cpp b/radiantcore/shaders/CShader.cpp
@@ -625,7 +625,7 @@ void CShader::commitModifications()
     _originalTemplate = _template;
 }
 
-const ShaderTemplatePtr& CShader::getTemplate()
+const ShaderTemplate::Ptr& CShader::getTemplate()
 {
     return _template;
 }

diff --git a/radiantcore/shaders/CShader.h b/radiantcore/shaders/CShader.h
@@ -154,7 +154,7 @@ class CShader final :
     void refreshImageMaps() override;
 
     // Returns the current template (including any modifications) of this material
-    const ShaderTemplatePtr& getTemplate();
+    const ShaderTemplate::Ptr& getTemplate();
 
     void saveDeclaration();
 

diff --git a/radiantcore/shaders/ShaderTemplate.h b/radiantcore/shaders/ShaderTemplate.h
@@ -5,10 +5,9 @@
 
 #include "ishaders.h"
 #include "parser/DefTokeniser.h"
-#include "math/Vector3.h"
+#include "math/Vector4.h"
 #include "decl/EditableDeclaration.h"
 
-#include <map>
 #include <memory>
 
 namespace shaders { class MapExpression; }
@@ -555,12 +554,4 @@ class ShaderTemplate final :
     void determineCoverage();
 };
 
-/* TYPEDEFS */
-
-// Pointer to ShaderTemplate
-typedef std::shared_ptr<ShaderTemplate> ShaderTemplatePtr;
-
-// Map of named ShaderTemplates
-typedef std::map<std::string, ShaderTemplatePtr> ShaderTemplateMap;
-
 }