Object properties: Fix loss of custom selectionbox

[oweals/minetest.git] / src / shader.h

diff --git a/src/shader.h b/src/shader.h
index 1db4cba83ea08357933151dcff109c9495b8b70b..583c776f4fdfbca62746d98210bc4f93c6955f10 100644 (file)
--- a/src/shader.h
+++ b/src/shader.h
@@ -18,8 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef SHADER_HEADER
-#define SHADER_HEADER
+#pragma once
 
 #include <IMaterialRendererServices.h>
 #include "irrlichttypes_bloated.h"
@@ -50,8 +49,8 @@ struct ShaderInfo {
        u8 drawtype = 0;
        u8 material_type = 0;
 
-       ShaderInfo() {}
-       virtual ~ShaderInfo() {}
+       ShaderInfo() = default;
+       virtual ~ShaderInfo() = default;
 };
 
 /*
@@ -65,7 +64,7 @@ namespace irr { namespace video {
 
 class IShaderConstantSetter {
 public:
-       virtual ~IShaderConstantSetter(){};
+       virtual ~IShaderConstantSetter() = default;
        virtual void onSetConstants(video::IMaterialRendererServices *services,
                        bool is_highlevel) = 0;
 };
@@ -73,7 +72,7 @@ public:
 
 class IShaderConstantSetterFactory {
 public:
-       virtual ~IShaderConstantSetterFactory() {};
+       virtual ~IShaderConstantSetterFactory() = default;
        virtual IShaderConstantSetter* create() = 0;
 };
 
@@ -123,8 +122,9 @@ public:
 
 class IShaderSource {
 public:
-       IShaderSource(){}
-       virtual ~IShaderSource(){}
+       IShaderSource() = default;
+       virtual ~IShaderSource() = default;
+
        virtual u32 getShaderIdDirect(const std::string &name,
                const u8 material_type, const u8 drawtype){return 0;}
        virtual ShaderInfo getShaderInfo(u32 id){return ShaderInfo();}
@@ -134,8 +134,9 @@ public:
 
 class IWritableShaderSource : public IShaderSource {
 public:
-       IWritableShaderSource(){}
-       virtual ~IWritableShaderSource(){}
+       IWritableShaderSource() = default;
+       virtual ~IWritableShaderSource() = default;
+
        virtual u32 getShaderIdDirect(const std::string &name,
                const u8 material_type, const u8 drawtype){return 0;}
        virtual ShaderInfo getShaderInfo(u32 id){return ShaderInfo();}
@@ -153,5 +154,3 @@ IWritableShaderSource *createShaderSource();
 
 void dumpShaderProgram(std::ostream &output_stream,
        const std::string &program_type, const std::string &program);
-
-#endif