From bd54cb71e56d4950470f19ff70954cc5888a419f Mon Sep 17 00:00:00 2001
From: peterbell10 <peterbell10@live.co.uk>
Date: Sat, 9 May 2020 02:38:17 +0100
Subject: Fix clang-tidy errors (#4730)

---
 src/BlockTypeRegistry.h | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/BlockTypeRegistry.h')

diff --git a/src/BlockTypeRegistry.h b/src/BlockTypeRegistry.h
index 529e13eb2..bddfcf845 100644
--- a/src/BlockTypeRegistry.h
+++ b/src/BlockTypeRegistry.h
@@ -50,9 +50,9 @@ public:
 	);
 
 	// Simple getters:
-	const AString & pluginName() const { return mPluginName; }
-	const AString & blockTypeName() const { return mBlockTypeName; }
-	std::shared_ptr<cBlockHandler> handler() const { return mHandler; }
+	const AString & pluginName() const { return m_PluginName; }
+	const AString & blockTypeName() const { return m_BlockTypeName; }
+	std::shared_ptr<cBlockHandler> handler() const { return m_Handler; }
 
 	/** Sets (creates or updates) a static hint.
 	Hints provided by callbacks are unaffected by this - callbacks are "higher priority", they overwrite anything set here.
@@ -67,21 +67,21 @@ public:
 private:
 
 	/** The name of the plugin that registered the block. */
-	AString mPluginName;
+	AString m_PluginName;
 
 	/** The name of the block type, such as "minecraft:redstone_lamp" */
-	AString mBlockTypeName;
+	AString m_BlockTypeName;
 
 	/** The callbacks to call for various interaction. */
-	std::shared_ptr<cBlockHandler> mHandler;
+	std::shared_ptr<cBlockHandler> m_Handler;
 
 	/** Optional static hints for any subsystem to use, such as "IsSnowable" -> "1".
-	Hint callbacks are of higher priority than mHints - if a hint is provided by a mHintCallback, its value in mHints is ignored. */
-	std::map<AString, AString> mHints;
+	Hint callbacks are of higher priority than m_Hints - if a hint is provided by a m_HintCallback, its value in m_Hints is ignored. */
+	std::map<AString, AString> m_Hints;
 
 	/** The callbacks for dynamic evaluation of hints, such as "LightValue" -> function(BlockTypeName, BlockState).
-	Hint callbacks are of higher priority than mHints - if a hint is provided by a mHintCallback, its value in mHints is ignored. */
-	std::map<AString, HintCallback> mHintCallbacks;
+	Hint callbacks are of higher priority than m_Hints - if a hint is provided by a m_HintCallback, its value in m_Hints is ignored. */
+	std::map<AString, HintCallback> m_HintCallbacks;
 };
 
 
@@ -144,10 +144,10 @@ private:
 
 	/** The actual block type registry.
 	Maps the BlockTypeName to the BlockInfo instance. */
-	std::map<AString, std::shared_ptr<BlockInfo>> mRegistry;
+	std::map<AString, std::shared_ptr<BlockInfo>> m_Registry;
 
-	/** The CS that protects mRegistry against multithreaded access. */
-	cCriticalSection mCSRegistry;
+	/** The CS that protects m_Registry against multithreaded access. */
+	cCriticalSection m_CSRegistry;
 };
 
 
@@ -169,14 +169,14 @@ public:
 	);
 
 	// Simple getters:
-	std::shared_ptr<BlockInfo> previousRegistration() const { return mPreviousRegistration; }
-	std::shared_ptr<BlockInfo> newRegistration()      const { return mNewRegistration; }
+	std::shared_ptr<BlockInfo> previousRegistration() const { return m_PreviousRegistration; }
+	std::shared_ptr<BlockInfo> newRegistration()      const { return m_NewRegistration; }
 
 
 private:
 
-	std::shared_ptr<BlockInfo> mPreviousRegistration;
-	std::shared_ptr<BlockInfo> mNewRegistration;
+	std::shared_ptr<BlockInfo> m_PreviousRegistration;
+	std::shared_ptr<BlockInfo> m_NewRegistration;
 
 
 	/** Returns the general exception message formatted by the two registrations.
@@ -207,10 +207,10 @@ public:
 	);
 
 	// Simple getters:
-	const AString & blockTypeName() const { return mBlockTypeName; }
+	const AString & blockTypeName() const { return m_BlockTypeName; }
 
 
 private:
 
-	const AString mBlockTypeName;
+	const AString m_BlockTypeName;
 };
-- 
cgit v1.2.3