C++ modernize: Pragma once (#6264)

* Migrate cpp headers to pragma once

src/activeobject.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef ACTIVEOBJECT_HEADER
+#pragma once
-#define ACTIVEOBJECT_HEADER
 
 #include "irr_aabb3d.h"
 #include <string>
@@ -102,6 +101,3 @@ public:
 protected:
 	u16 m_id; // 0 is invalid, "no id"
 };
-
-#endif
-

src/ban.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef BAN_HEADER
+#pragma once
-#define BAN_HEADER
 
 #include "util/string.h"
 #include "threading/thread.h"
@@ -48,5 +47,3 @@ private:
 	StringMap m_ips;
 	bool m_modified = false;
 };
-
-#endif

src/camera.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CAMERA_HEADER
+#pragma once
-#define CAMERA_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "inventory.h"
@@ -232,5 +231,3 @@ private:
 
 	std::list<Nametag *> m_nametags;
 };
-
-#endif

src/cavegen.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CAVEGEN_HEADER
+#pragma once
-#define CAVEGEN_HEADER
 
 #define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1
 
@@ -241,5 +240,3 @@ private:
 
 	inline s16 getSurfaceFromHeightmap(v3s16 p);
 };
-
-#endif

src/chat.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CHAT_HEADER
+#pragma once
-#define CHAT_HEADER
 
 #include <string>
 #include <vector>
@@ -287,6 +286,3 @@ private:
 	ChatBuffer m_recent_buffer;
 	ChatPrompt m_prompt;
 };
-
-#endif
-

src/chat_interface.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CHAT_INTERFACE_H
+#pragma once
-#define CHAT_INTERFACE_H
 
 #include "util/container.h"
 #include <string>
@@ -78,5 +77,3 @@ struct ChatInterface {
 	MutexedQueue<ChatEvent *> command_queue; // chat backend --> server
 	MutexedQueue<ChatEvent *> outgoing_queue; // server --> chat backend
 };
-
-#endif

src/chatmessage.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MT_CHATMESSAGE_H
+#pragma once
-#define MT_CHATMESSAGE_H
 
 #include <string>
 #include <ctime>
@@ -47,5 +46,3 @@ struct ChatMessage
 	std::wstring sender = L"";
 	std::time_t timestamp = std::time(0);
 };
-
-#endif

src/client.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLIENT_HEADER
+#pragma once
-#define CLIENT_HEADER
 
 #include "network/connection.h"
 #include "clientenvironment.h"
@@ -718,5 +717,3 @@ private:
 	u64 m_csm_flavour_limits = CSMFlavourLimit::CSM_FL_NONE;
 	u32 m_csm_noderange_limit = 8;
 };
-
-#endif // !CLIENT_HEADER

src/client/clientlauncher.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __CLIENT_LAUNCHER_H__
+#pragma once
-#define __CLIENT_LAUNCHER_H__
 
 #include "irrlichttypes_extrabloated.h"
 #include "client/inputhandler.h"
@@ -69,5 +68,3 @@ protected:
 	std::string current_address = "does-not-exist";
 	int current_port = 0;
 };
-
-#endif

src/client/inputhandler.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef INPUT_HANDLER_H
+#pragma once
-#define INPUT_HANDLER_H
 
 #include "irrlichttypes_extrabloated.h"
 #include "joystick_controller.h"
@@ -393,5 +392,3 @@ private:
 	bool leftreleased = false;
 	bool rightreleased = false;
 };
-
-#endif

src/client/joystick_controller.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef JOYSTICK_HEADER
+#pragma once
-#define JOYSTICK_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "keys.h"
@@ -168,5 +167,3 @@ private:
 	std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_pressed_keys;
 	std::bitset<KeyType::INTERNAL_ENUM_COUNT> m_past_released_keys;
 };
-
-#endif

src/client/keys.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef KEYS_HEADER
+#pragma once
-#define KEYS_HEADER
 
 #include <list>
 
@@ -114,5 +113,3 @@ public:
 };
 
 typedef KeyType::T GameKeyType;
-
-#endif

src/client/tile.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef TILE_HEADER
+#pragma once
-#define TILE_HEADER
 
 #include "irrlichttypes.h"
 #include "irr_v3d.h"
@@ -330,4 +329,3 @@ struct TileSpec
 	//! The first is base texture, the second is overlay.
 	TileLayer layers[MAX_TILE_LAYERS];
 };
-#endif

src/clientenvironment.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLIENT_ENVIRONMENT_HEADER
+#pragma once
-#define CLIENT_ENVIRONMENT_HEADER
 
 #include <ISceneManager.h>
 #include "environment.h"
@@ -158,5 +157,3 @@ private:
 	std::list<std::string> m_player_names;
 	v3s16 m_camera_offset;
 };
-
-#endif

src/clientiface.h

@@ -16,8 +16,8 @@ You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#ifndef _CLIENTIFACE_H_
+
-#define _CLIENTIFACE_H_
+#pragma once
 
 #include "irr_v3d.h"                   // for irrlicht datatypes
 
@@ -500,5 +500,3 @@ private:
 
 	static const char *statenames[];
 };
-
-#endif

src/clientmap.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLIENTMAP_HEADER
+#pragma once
-#define CLIENTMAP_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "map.h"
@@ -137,6 +136,3 @@ private:
 	bool m_cache_bilinear_filter;
 	bool m_cache_anistropic_filter;
 };
-
-#endif
-

src/clientmedia.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLIENTMEDIA_HEADER
+#pragma once
-#define CLIENTMEDIA_HEADER
 
 #include "irrlichttypes.h"
 #include "filecache.h"
@@ -147,5 +146,3 @@ private:
 	std::string m_name_bound = "";
 
 };
-
-#endif // !CLIENTMEDIA_HEADER

src/clientobject.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLIENTOBJECT_HEADER
+#pragma once
-#define CLIENTOBJECT_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "activeobject.h"
@@ -106,5 +105,3 @@ struct DistanceSortedActiveObject
 		return d < other.d;
 	}
 };
-
-#endif

src/clientsimpleobject.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLIENTSIMPLEOBJECT_HEADER
+#pragma once
-#define CLIENTSIMPLEOBJECT_HEADER
 
 #include "irrlichttypes_bloated.h"
 class ClientEnvironment;
@@ -34,5 +33,3 @@ public:
 
 	virtual void step(float dtime) {}
 };
-
-#endif

src/cloudparams.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLOUDPARAMS_HEADER
+#pragma once
-#define CLOUDPARAMS_HEADER
 
 struct CloudParams
 {
@@ -29,5 +28,3 @@ struct CloudParams
 	float height;
 	v2f speed;
 };
-
-#endif

src/clouds.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CLOUDS_HEADER
+#pragma once
-#define CLOUDS_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include <iostream>
@@ -143,7 +142,3 @@ private:
 	bool m_camera_inside_cloud = false;
 
 };
-
-
-
-#endif

src/cmake_config.h.in

@@ -1,7 +1,6 @@
 // Filled in by the build system
 
-#ifndef CMAKE_CONFIG_H
+#pragma once
-#define CMAKE_CONFIG_H
 
 #define PROJECT_NAME "@PROJECT_NAME@"
 #define PROJECT_NAME_C "@PROJECT_NAME_CAPITALIZED@"
@@ -34,6 +33,3 @@
 #cmakedefine01 CURSES_HAVE_NCURSES_CURSES_H
 #cmakedefine01 CURSES_HAVE_NCURSESW_NCURSES_H
 #cmakedefine01 CURSES_HAVE_NCURSESW_CURSES_H
-
-#endif
-

src/cmake_config_githash.h.in

@@ -1,10 +1,6 @@
 // Filled in by the build system
 // Separated from cmake_config.h to avoid excessive rebuilds on every commit
 
-#ifndef CMAKE_CONFIG_GITHASH_H
+#pragma once
-#define CMAKE_CONFIG_GITHASH_H
 
 #define VERSION_GITHASH "@VERSION_GITHASH@"
-
-#endif
-

src/collision.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef COLLISION_HEADER
+#pragma once
-#define COLLISION_HEADER
 
 #include "irrlichttypes_bloated.h"
 #include <vector>
@@ -76,7 +75,3 @@ bool wouldCollideWithCeiling(
 		const std::vector<aabb3f> &staticboxes,
 		const aabb3f &movingbox,
 		f32 y_increase, f32 d);
-
-
-#endif
-

src/config.h

@@ -3,8 +3,7 @@
 	Otherwise use default values
 */
 
-#ifndef CONFIG_H
+#pragma once
-#define CONFIG_H
 
 #define STRINGIFY(x) #x
 #define STR(x) STRINGIFY(x)
@@ -38,5 +37,3 @@
 		" USE_FREETYPE=" STR(USE_FREETYPE) \
 		" USE_LUAJIT=" STR(USE_LUAJIT) \
 		" STATIC_SHAREDIR=" STR(STATIC_SHAREDIR)
-
-#endif

src/constants.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CONSTANTS_HEADER
+#pragma once
-#define CONSTANTS_HEADER
 
 /*
 	All kinds of constants.
@@ -118,5 +117,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define TTF_DEFAULT_FONT_SIZE (16)
 #endif
 #define DEFAULT_FONT_SIZE (10)
-
-#endif

src/content_cao.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CONTENT_CAO_HEADER
+#pragma once
-#define CONTENT_CAO_HEADER
 
 #include <map>
 #include "irrlichttypes_extrabloated.h"
@@ -214,6 +213,3 @@ public:
 		return m_prop.infotext;
 	}
 };
-
-
-#endif

src/content_cso.h

@@ -17,14 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CONTENT_CSO_HEADER
+#pragma once
-#define CONTENT_CSO_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "clientsimpleobject.h"
 
 ClientSimpleObject* createSmokePuff(scene::ISceneManager *smgr,
 		ClientEnvironment *env, v3f pos, v2f size);
-
-#endif
-

src/content_mapblock.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CONTENT_MAPBLOCK_HEADER
+#pragma once
-#define CONTENT_MAPBLOCK_HEADER
 
 #include "nodedef.h"
 #include <IMeshManipulator.h>
@@ -146,5 +145,3 @@ public:
 	MapblockMeshGenerator(MeshMakeData *input, MeshCollector *output);
 	void generate();
 };
-
-#endif

src/content_mapnode.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CONTENT_MAPNODE_HEADER
+#pragma once
-#define CONTENT_MAPNODE_HEADER
 
 #include "mapnode.h"
 
@@ -33,5 +32,3 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 // Get legacy node name mapping for loading old blocks
 class NameIdMapping;
 void content_mapnode_get_name_id_mapping(NameIdMapping *nimap);
-
-#endif

src/content_nodemeta.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CONTENT_NODEMETA_HEADER
+#pragma once
-#define CONTENT_NODEMETA_HEADER
 
 #include <iostream>
 
@@ -33,6 +32,3 @@ class IItemDefManager;
 void content_nodemeta_deserialize_legacy(std::istream &is,
 		NodeMetadataList *meta, NodeTimerList *timers,
 		IItemDefManager *item_def_mgr);
-
-#endif
-

src/content_sao.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CONTENT_SAO_HEADER
+#pragma once
-#define CONTENT_SAO_HEADER
 
 #include <util/numeric.h>
 #include "serverobject.h"
@@ -412,5 +411,3 @@ public:
 	bool m_physics_override_new_move = true;
 	bool m_physics_override_sent = false;
 };
-
-#endif

src/convert_json.h

@@ -17,12 +17,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __CONVERT_JSON_H__
+#pragma once
-#define __CONVERT_JSON_H__
 
 #include <json/json.h>
 
 Json::Value fetchJsonValue(const std::string &url,
 		std::vector<std::string> *extra_headers);
-
-#endif

src/craftdef.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef CRAFTDEF_HEADER
+#pragma once
-#define CRAFTDEF_HEADER
 
 #include <string>
 #include <iostream>
@@ -446,6 +445,3 @@ public:
 };
 
 IWritableCraftDefManager* createCraftDefManager();
-
-#endif
-

src/database-dummy.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DATABASE_DUMMY_HEADER
+#pragma once
-#define DATABASE_DUMMY_HEADER
 
 #include <map>
 #include <string>
@@ -44,5 +43,3 @@ public:
 private:
 	std::map<s64, std::string> m_database;
 };
-
-#endif

src/database-files.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DATABASE_FILES_HEADER
+#pragma once
-#define DATABASE_FILES_HEADER
 
 // !!! WARNING !!!
 // This backend is intended to be used on Minetest 0.4.16 only for the transition backend
@@ -42,5 +41,3 @@ private:
 
 	std::string m_savedir;
 };
-
-#endif

src/database-leveldb.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DATABASE_LEVELDB_HEADER
+#pragma once
-#define DATABASE_LEVELDB_HEADER
 
 #include "config.h"
 
@@ -47,5 +46,3 @@ private:
 };
 
 #endif // USE_LEVELDB
-
-#endif

src/database-postgresql.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DATABASE_POSTGRESQL_HEADER
+#pragma once
-#define DATABASE_POSTGRESQL_HEADER
 
 #include <string>
 #include <libpq-fe.h>
@@ -145,6 +144,3 @@ protected:
 private:
 	bool playerDataExists(const std::string &playername);
 };
-
-#endif
-

src/database-redis.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DATABASE_REDIS_HEADER
+#pragma once
-#define DATABASE_REDIS_HEADER
 
 #include "config.h"
 
@@ -50,5 +49,3 @@ private:
 };
 
 #endif // USE_REDIS
-
-#endif

src/database-sqlite3.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DATABASE_SQLITE3_HEADER
+#pragma once
-#define DATABASE_SQLITE3_HEADER
 
 #include <cstring>
 #include <string>
@@ -192,5 +191,3 @@ private:
 	sqlite3_stmt *m_stmt_player_metadata_remove = nullptr;
 	sqlite3_stmt *m_stmt_player_metadata_add = nullptr;
 };
-
-#endif

src/database.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DATABASE_HEADER
+#pragma once
-#define DATABASE_HEADER
 
 #include <string>
 #include <vector>
@@ -61,5 +60,3 @@ public:
 	virtual bool removePlayer(const std::string &name) = 0;
 	virtual void listPlayers(std::vector<std::string> &res) = 0;
 };
-
-#endif

src/daynightratio.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DAYNIGHTRATIO_HEADER
+#pragma once
-#define DAYNIGHTRATIO_HEADER
 
 inline u32 time_to_daynight_ratio(float time_of_day, bool smooth)
 {
@@ -64,6 +63,3 @@ inline u32 time_to_daynight_ratio(float time_of_day, bool smooth)
 		return 1000;
 	}
 }
-
-#endif
-

src/debug.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DEBUG_HEADER
+#pragma once
-#define DEBUG_HEADER
 
 #include <iostream>
 #include <exception>
@@ -131,7 +130,3 @@ private:
 	#define BEGIN_DEBUG_EXCEPTION_HANDLER
 	#define END_DEBUG_EXCEPTION_HANDLER
 #endif
-
-#endif // DEBUG_HEADER
-
-

src/defaultsettings.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DEFAULTSETTINGS_HEADER
+#pragma once
-#define DEFAULTSETTINGS_HEADER
 
 class Settings;
 
@@ -34,5 +33,3 @@ void set_default_settings(Settings *settings);
  * @param from source settings pointer
  */
 void override_default_settings(Settings *settings, Settings *from);
-
-#endif

src/dungeongen.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef DUNGEONGEN_HEADER
+#pragma once
-#define DUNGEONGEN_HEADER
 
 #include "voxel.h"
 #include "noise.h"
@@ -109,5 +108,3 @@ public:
 
 extern NoiseParams nparams_dungeon_density;
 extern NoiseParams nparams_dungeon_alt_wall;
-
-#endif

src/emerge.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef EMERGE_HEADER
+#pragma once
-#define EMERGE_HEADER
 
 #include <map>
 #include <mutex>
@@ -174,5 +173,3 @@ private:
 
 	friend class EmergeThread;
 };
-
-#endif

src/environment.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef ENVIRONMENT_HEADER
+#pragma once
-#define ENVIRONMENT_HEADER
 
 /*
 	This class is the game's environment.
@@ -144,5 +143,3 @@ protected:
 private:
 	std::mutex m_time_lock;
 };
-
-#endif

src/event.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef EVENT_HEADER
+#pragma once
-#define EVENT_HEADER
 
 class MtEvent
 {
@@ -67,6 +66,3 @@ public:
 	virtual void reg(MtEventReceiver *r, const char *type) = 0;
 	virtual void dereg(MtEventReceiver *r, const char *type) = 0;
 };
-
-#endif
-

src/event_manager.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef EVENT_MANAGER_HEADER
+#pragma once
-#define EVENT_MANAGER_HEADER
 
 #include "event.h"
 #include <list>
@@ -110,6 +109,3 @@ public:
 		dereg(type, EventManager::receiverReceive, r);
 	}
 };
-
-#endif
-

src/exceptions.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef EXCEPTIONS_HEADER
+#pragma once
-#define EXCEPTIONS_HEADER
 
 #include <exception>
 #include <string>
@@ -129,6 +128,3 @@ public:
 		BaseException(s)
 	{}
 };
-
-#endif
-

src/face_position_cache.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef FACE_POSITION_CACHE_HEADER
+#pragma once
-#define FACE_POSITION_CACHE_HEADER
 
 #include "irr_v3d.h"
 
@@ -40,5 +39,3 @@ private:
 	static std::unordered_map<u16, std::vector<v3s16>> cache;
 	static std::mutex cache_mutex;
 };
-
-#endif

src/filecache.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 FILECACHE_HEADER
+#pragma once
-#define FILECACHE_HEADER
 
 #include <iostream>
 #include <string>
@@ -41,5 +40,3 @@ private:
 	bool loadByPath(const std::string &path, std::ostream &os);
 	bool updateByPath(const std::string &path, const std::string &data);
 };
-
-#endif

src/filesys.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef FILESYS_HEADER
+#pragma once
-#define FILESYS_HEADER
 
 #include <string>
 #include <vector>
@@ -118,6 +117,3 @@ bool safeWriteToFile(const std::string &path, const std::string &content);
 bool Rename(const std::string &from, const std::string &to);
 
 } // namespace fs
-
-#endif
-

src/fontengine.h

@@ -16,8 +16,8 @@ You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#ifndef __FONTENGINE_H__
+
-#define __FONTENGINE_H__
+#pragma once
 
 #include <map>
 #include <vector>
@@ -135,5 +135,3 @@ private:
 
 /** interface to access main font engine*/
 extern FontEngine* g_fontengine;
-
-#endif

src/game.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GAME_HEADER
+#pragma once
-#define GAME_HEADER
 
 #include "irrlichttypes.h"
 #include <string>
@@ -52,5 +51,3 @@ void the_game(bool *kill,
 		bool *reconnect_requested,
 		const SubgameSpec &gamespec, // Used for local game
 		bool simple_singleplayer_mode);
-
-#endif

src/gamedef.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GAMEDEF_HEADER
+#pragma once
-#define GAMEDEF_HEADER
 
 #include <string>
 #include <vector>
@@ -80,6 +79,3 @@ public:
 	virtual bool registerModStorage(ModMetadata *storage) = 0;
 	virtual void unregisterModStorage(const std::string &name) = 0;
 };
-
-#endif
-

src/gameparams.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GAME_PARAMS_H
+#pragma once
-#define GAME_PARAMS_H
 
 #include "irrlichttypes.h"
 
@@ -31,5 +30,3 @@ struct GameParams
 	SubgameSpec game_spec;
 	bool is_dedicated_server;
 };
-
-#endif

src/genericobject.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GENERICOBJECT_HEADER
+#pragma once
-#define GENERICOBJECT_HEADER
 
 #include <string>
 #include "irrlichttypes_bloated.h"
@@ -83,6 +82,3 @@ std::string gob_cmd_update_nametag_attributes(video::SColor color);
 
 std::string gob_cmd_update_infant(u16 id, u8 type,
 		const std::string &client_initialization_data);
-
-#endif
-

src/gettext.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GETTEXT_HEADER
+#pragma once
-#define GETTEXT_HEADER
 
 #include "config.h" // for USE_GETTEXT
 #include <string>
@@ -59,5 +58,3 @@ inline std::string strgettext(const std::string &text)
 {
 	return gettext(text.c_str());
 }
-
-#endif

src/gettime.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GETTIME_HEADER
+#pragma once
-#define GETTIME_HEADER
 
 #include "irrlichttypes.h"
 #include <time.h>
@@ -42,5 +41,3 @@ inline std::string getTimestamp()
 	strftime(cs, 20, "%Y-%m-%d %H:%M:%S", tm);
 	return cs;
 }
-
-#endif

src/guiChatConsole.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GUICHATCONSOLE_HEADER
+#pragma once
-#define GUICHATCONSOLE_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
@@ -132,7 +131,3 @@ private:
 	gui::IGUIFont *m_font = nullptr;
 	v2u32 m_fontsize;
 };
-
-
-#endif
-

src/guiEngine.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GUI_ENGINE_H_
+#pragma once
-#define GUI_ENGINE_H_
 
 /******************************************************************************/
 /* Includes                                                                   */
@@ -303,5 +302,3 @@ private:
 
 
 };
-
-#endif /* GUI_ENGINE_H_ */

src/guiFormSpecMenu.h

@@ -17,9 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-
+#pragma once
-#ifndef GUIINVENTORYMENU_HEADER
-#define GUIINVENTORYMENU_HEADER
 
 #include <utility>
 #include <stack>
@@ -567,5 +565,3 @@ public:
 
 	std::string m_formspec;
 };
-
-#endif

src/guiKeyChangeMenu.h

@@ -19,8 +19,7 @@
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef GUIKEYCHANGEMENU_HEADER
+#pragma once
-#define GUIKEYCHANGEMENU_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
@@ -73,5 +72,3 @@ private:
 	gui::IGUIStaticText *key_used_text = nullptr;
 	std::vector<key_setting *> key_settings;
 };
-
-#endif

src/guiMainMenu.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GUIMAINMENU_HEADER
+#pragma once
-#define GUIMAINMENU_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
@@ -54,6 +53,3 @@ struct MainMenuData {
 
 	MainMenuData() {}
 };
-
-#endif
-

src/guiPasswordChange.h

@@ -16,8 +16,7 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef GUIPASSWORDCHANGE_HEADER
+#pragma once
-#define GUIPASSWORDCHANGE_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
@@ -52,5 +51,3 @@ private:
 	std::wstring m_newpass = L"";
 	std::wstring m_newpass_confirm = L"";
 };
-
-#endif

src/guiPathSelectMenu.h

@@ -17,8 +17,7 @@
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef GUIFILESELECTMENU_H_
+#pragma once
-#define GUIFILESELECTMENU_H_
 
 #include <string>
 
@@ -58,5 +57,3 @@ private:
 	std::string m_formname;
 	bool m_file_select_dialog;
 };
-
-#endif /* GUIFILESELECTMENU_H_ */

src/guiTable.h

@@ -17,9 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-
+#pragma once
-#ifndef GUITABLE_HEADER
-#define GUITABLE_HEADER
 
 #include <map>
 #include <set>
@@ -256,6 +254,3 @@ protected:
 	static void alignContent(Cell *cell, s32 xmax, s32 content_width,
 			s32 align);
 };
-
-#endif
-

src/guiVolumeChange.h

@@ -17,8 +17,7 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#ifndef GUIVOLUMECHANGE_HEADER
+#pragma once
-#define GUIVOLUMECHANGE_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "modalMenu.h"
@@ -44,6 +43,3 @@ public:
 
 	bool pausesGame() { return true; }
 };
-
-#endif
-

src/guiscalingfilter.h

@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#ifndef _GUI_SCALING_FILTER_H_
+
-#define _GUI_SCALING_FILTER_H_
+#pragma once
 
 #include "irrlichttypes_extrabloated.h"
 
@@ -48,5 +48,3 @@ void draw2DImageFilterScaled(video::IVideoDriver *driver, video::ITexture *txr,
 		const core::rect<s32> &destrect, const core::rect<s32> &srcrect,
 		const core::rect<s32> *cliprect = 0, const video::SColor *const colors = 0,
 		bool usealpha = false);
-
-#endif

src/httpfetch.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef HTTPFETCH_HEADER
+#pragma once
-#define HTTPFETCH_HEADER
 
 #include <vector>
 #include "util/string.h"
@@ -113,5 +112,3 @@ void httpfetch_caller_free(unsigned long caller);
 // Performs a synchronous HTTP request. This blocks and therefore should
 // only be used from background threads.
 void httpfetch_sync(const HTTPFetchRequest &fetch_request, HTTPFetchResult &fetch_result);
-
-#endif // !HTTPFETCH_HEADER

src/hud.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef HUD_HEADER
+#pragma once
-#define HUD_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include <string>
@@ -197,5 +196,3 @@ void drawItemStack(video::IVideoDriver *driver,
 		ItemRotationKind rotation_kind);
 
 #endif
-
-#endif

src/imagefilters.h

@@ -16,8 +16,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef _IMAGE_FILTERS_H_
+#pragma once
-#define _IMAGE_FILTERS_H_
 
 #include "irrlichttypes_extrabloated.h"
 
@@ -42,5 +41,3 @@ void imageCleanTransparent(video::IImage *src, u32 threshold);
  * and downscaling.
  */
 void imageScaleNNAA(video::IImage *src, const core::rect<s32> &srcrect, video::IImage *dest);
-
-#endif

src/intlGUIEditBox.h

@@ -2,8 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_INTL_GUI_EDIT_BOX_H_INCLUDED__
+#pragma once
-#define __C_INTL_GUI_EDIT_BOX_H_INCLUDED__
 
 #include "IrrCompileConfig.h"
 //#ifdef _IRR_COMPILE_WITH_GUI_
@@ -182,4 +181,3 @@ namespace gui
 } // end namespace irr
 
 //#endif // _IRR_COMPILE_WITH_GUI_
-#endif // __C_GUI_EDIT_BOX_H_INCLUDED__

src/inventory.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef INVENTORY_HEADER
+#pragma once
-#define INVENTORY_HEADER
 
 #include "debug.h"
 #include "itemdef.h"
@@ -310,5 +309,3 @@ private:
 	IItemDefManager *m_itemdef;
 	bool m_dirty = false;
 };
-
-#endif

src/inventorymanager.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef INVENTORYMANAGER_HEADER
+#pragma once
-#define INVENTORYMANAGER_HEADER
 
 #include "inventory.h"
 #include <iostream>
@@ -244,6 +243,3 @@ struct ICraftAction : public InventoryAction
 bool getCraftingResult(Inventory *inv, ItemStack &result,
 		std::vector<ItemStack> &output_replacements,
 		bool decrementInput, IGameDef *gamedef);
-
-#endif
-

src/irr_aabb3d.h

@@ -17,13 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef IRR_AABB3D_HEADER
+#pragma once
-#define IRR_AABB3D_HEADER
 
 #include "irrlichttypes.h"
 
 #include <aabbox3d.h>
 
 typedef core::aabbox3d<f32> aabb3f;
-
-#endif

src/irr_v2d.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef IRR_V2D_HEADER
+#pragma once
-#define IRR_V2D_HEADER
 
 #include "irrlichttypes.h"
 
@@ -29,5 +28,3 @@ typedef core::vector2d<s16> v2s16;
 typedef core::vector2d<s32> v2s32;
 typedef core::vector2d<u32> v2u32;
 typedef core::vector2d<f32> v2f32;
-
-#endif

src/irr_v3d.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef IRR_V3D_HEADER
+#pragma once
-#define IRR_V3D_HEADER
 
 #include "irrlichttypes.h"
 
@@ -28,5 +27,3 @@ typedef core::vector3df v3f;
 typedef core::vector3d<s16> v3s16;
 typedef core::vector3d<u16> v3u16;
 typedef core::vector3d<s32> v3s32;
-
-#endif

src/irrlicht_changes/CGUITTFont.h

@@ -29,8 +29,7 @@
    john@suckerfreegames.com
 */
 
-#ifndef __C_GUI_TTFONT_H_INCLUDED__
+#pragma once
-#define __C_GUI_TTFONT_H_INCLUDED__
 
 #include <irrlicht.h>
 #include <ft2build.h>
@@ -390,5 +389,3 @@ namespace gui
 
 } // end namespace gui
 } // end namespace irr
-
-#endif // __C_GUI_TTFONT_H_INCLUDED__

src/irrlicht_changes/irrUString.h

@@ -28,8 +28,7 @@
    john@suckerfreegames.com
 */
 
-#ifndef __IRR_USTRING_H_INCLUDED__
+#pragma once
-#define __IRR_USTRING_H_INCLUDED__
 
 #if (__cplusplus > 199711L) || (_MSC_VER >= 1600) || defined(__GXX_EXPERIMENTAL_CXX0X__)
 #	define USTRING_CPP0X
@@ -3890,5 +3889,3 @@ class hash : public std::unary_function<core::ustring, size_t>
 
 } // end namespace core
 } // end namespace irr
-
-#endif

src/irrlicht_changes/static_text.h

@@ -4,8 +4,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_STATIC_TEXT_H_INCLUDED__
+#pragma once
-#define __C_GUI_STATIC_TEXT_H_INCLUDED__
 
 #include "IrrCompileConfig.h"
 #ifdef _IRR_COMPILE_WITH_GUI_
@@ -264,5 +263,3 @@ inline void setStaticText(irr::gui::IGUIStaticText *static_text, const wchar_t *
 }
 
 #endif // _IRR_COMPILE_WITH_GUI_
-
-#endif // C_GUI_STATIC_TEXT_H_INCLUDED

src/irrlichttypes.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef IRRLICHTTYPES_HEADER
+#pragma once
-#define IRRLICHTTYPES_HEADER
 
 /* Ensure that <stdint.h> is included before <irrTypes.h>, unless building on
  * MSVC, to address an irrlicht issue: https://sourceforge.net/p/irrlicht/bugs/433/
@@ -62,5 +61,3 @@ using namespace irr;
 #define U16_MAX 0xFFFF
 #define U32_MAX 0xFFFFFFFF
 #define U64_MAX 0xFFFFFFFFFFFFFFFF
-
-#endif

src/irrlichttypes_bloated.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef IRRLICHTTYPES_BLOATED_HEADER
+#pragma once
-#define IRRLICHTTYPES_BLOATED_HEADER
 
 #include "irrlichttypes.h"
 
@@ -27,5 +26,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irr_aabb3d.h"
 
 #include <SColor.h>
-
-#endif

src/irrlichttypes_extrabloated.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef IRRLICHTTYPES_EXTRABLOATED_HEADER
+#pragma once
-#define IRRLICHTTYPES_EXTRABLOATED_HEADER
 
 #include "irrlichttypes_bloated.h"
 
@@ -34,5 +33,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IGUIElement.h>
 #include <IGUIEnvironment.h>
 #endif
-
-#endif

src/itemdef.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 ITEMDEF_HEADER
+#pragma once
-#define ITEMDEF_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include <string>
@@ -174,5 +173,3 @@ public:
 };
 
 IWritableItemDefManager* createItemDefManager();
-
-#endif

src/itemgroup.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef ITEMGROUP_HEADER
+#pragma once
-#define ITEMGROUP_HEADER
 
 #include <string>
 #include <unordered_map>
@@ -32,5 +31,3 @@ static inline int itemgroup_get(const ItemGroupList &groups, const std::string &
 		return 0;
 	return i->second;
 }
-
-#endif

src/itemstackmetadata.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef ITEMSTACKMETADATA_HEADER
+#pragma once
-#define ITEMSTACKMETADATA_HEADER
 
 #include "metadata.h"
 
@@ -31,5 +30,3 @@ public:
 	void serialize(std::ostream &os) const;
 	void deSerialize(std::istream &is);
 };
-
-#endif

src/keycode.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef KEYCODE_HEADER
+#pragma once
-#define KEYCODE_HEADER
 
 #include "irrlichttypes.h"
 #include "Keycodes.h"
@@ -65,5 +64,3 @@ KeyPress getKeySetting(const char *settingname);
 void clearKeyCache();
 
 irr::EKEY_CODE keyname_to_keycode(const char *name);
-
-#endif

src/light.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef LIGHT_HEADER
+#pragma once
-#define LIGHT_HEADER
 
 #include "irrlichttypes.h"
 
@@ -124,5 +123,3 @@ inline u8 blend_light(u32 daylight_factor, u8 lightday, u8 lightnight)
 		l = LIGHT_SUN;
 	return l;
 }
-
-#endif

src/localplayer.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef LOCALPLAYER_HEADER
+#pragma once
-#define LOCALPLAYER_HEADER
 
 #include "player.h"
 #include "environment.h"
@@ -183,5 +182,3 @@ private:
 	GenericCAO *m_cao = nullptr;
 	Client *m_client;
 };
-
-#endif

src/log.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef LOG_HEADER
+#pragma once
-#define LOG_HEADER
 
 #include <map>
 #include <queue>
@@ -212,6 +211,3 @@ extern std::ostream dstream;
 	#define dout_client (*dout_client_ptr)
 	#define derr_client (*derr_client_ptr)
 #endif
-
-
-#endif

src/mainmenumanager.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAINMENUMANAGER_HEADER
+#pragma once
-#define MAINMENUMANAGER_HEADER
 
 /*
 	All kinds of stuff that needs to be exposed from main.cpp
@@ -168,6 +167,3 @@ public:
 };
 
 extern MainGameCallback *g_gamecallback;
-
-#endif
-

src/map.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAP_HEADER
+#pragma once
-#define MAP_HEADER
 
 #include <iostream>
 #include <sstream>
@@ -525,5 +524,3 @@ protected:
 	*/
 	std::map<v3s16, u8> m_loaded_blocks;
 };
-
-#endif

src/map_settings_manager.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAP_SETTINGS_MANAGER_HEADER
+#pragma once
-#define MAP_SETTINGS_MANAGER_HEADER
 
 #include <string>
 
@@ -75,5 +74,3 @@ private:
 	Settings *m_map_settings;
 	Settings *m_user_settings;
 };
-
-#endif

src/mapblock.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAPBLOCK_HEADER
+#pragma once
-#define MAPBLOCK_HEADER
 
 #include <set>
 #include "debug.h"
@@ -671,5 +670,3 @@ inline void getNodeSectorPosWithOffset(const v2s16 &p, v2s16 &block, v2s16 &offs
 	Get a quick string to describe what a block actually contains
 */
 std::string analyze_block(MapBlock *block);
-
-#endif

src/mapblock_mesh.h

@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAPBLOCK_MESH_HEADER
+#pragma once
-#define MAPBLOCK_MESH_HEADER
 
 #include "irrlichttypes_extrabloated.h"
 #include "client/tile.h"
@@ -267,6 +266,3 @@ void final_color_blend(video::SColor *result,
 // TileFrame vector copy cost very much to client
 void getNodeTileN(MapNode mn, v3s16 p, u8 tileindex, MeshMakeData *data, TileSpec &tile);
 void getNodeTile(MapNode mn, v3s16 p, v3s16 dir, MeshMakeData *data, TileSpec &tile);
-
-#endif
-

src/mapgen.h

@@ -19,8 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAPGEN_HEADER
+#pragma once
-#define MAPGEN_HEADER
 
 #include "noise.h"
 #include "nodedef.h"
@@ -299,5 +298,3 @@ protected:
 	float cavern_threshold;
 	int lava_depth;
 };
-
-#endif

src/mapgen_carpathian.h

@@ -19,8 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MAPGEN_CARPATHIAN_HEADER
+#pragma once
-#define MAPGEN_CARPATHIAN_HEADER
 
 #include "mapgen.h"
 
@@ -101,5 +100,3 @@ private:
 	float terrainLevelAtPoint(s16 x, s16 z);
 	int generateTerrain();
 };
-
-#endif

src/mapgen_flat.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 MAPGEN_FLAT_HEADER
+#pragma once
-#define MAPGEN_FLAT_HEADER
 
 #include "mapgen.h"
 
@@ -75,5 +74,3 @@ private:
 	float hill_steepness;
 	Noise *noise_terrain;
 };
-
-#endif