12 files changed, 49 insertions, 36 deletions

diff --git a/src/Protocol/Authenticator.cpp b/src/Protocol/Authenticator.cpp
index 56ef9998c..85c5c920a 100644
--- a/src/Protocol/Authenticator.cpp
+++ b/src/Protocol/Authenticator.cpp
@@ -25,7 +25,7 @@
 
 
 cAuthenticator::cAuthenticator(void) :
-	super("cAuthenticator"),
+	Super("cAuthenticator"),
 	m_Server(DEFAULT_AUTH_SERVER),
 	m_Address(DEFAULT_AUTH_ADDRESS),
 	m_ShouldAuthenticate(true)
@@ -77,7 +77,7 @@ void cAuthenticator::Authenticate(int a_ClientID, const AString & a_UserName, co
 void cAuthenticator::Start(cSettingsRepositoryInterface & a_Settings)
 {
 	ReadSettings(a_Settings);
-	super::Start();
+	Super::Start();
 }
 
 
@@ -88,7 +88,7 @@ void cAuthenticator::Stop(void)
 {
 	m_ShouldTerminate = true;
 	m_QueueNonempty.Set();
-	super::Stop();
+	Super::Stop();
 }
 
 
diff --git a/src/Protocol/Authenticator.h b/src/Protocol/Authenticator.h
index 98bf17512..5fd8e5434 100644
--- a/src/Protocol/Authenticator.h
+++ b/src/Protocol/Authenticator.h
@@ -27,13 +27,14 @@ namespace Json
 
 
 
-class cAuthenticator :
+class cAuthenticator:
 	public cIsThread
 {
-	typedef cIsThread super;
+	using Super = cIsThread;
 
 public:
-	cAuthenticator(void);
+
+	cAuthenticator();
 	virtual ~cAuthenticator() override;
 
 	/** (Re-)read server and address from INI: */
diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp
index 49e34b66c..be6ee35e2 100644
--- a/src/Protocol/MojangAPI.cpp
+++ b/src/Protocol/MojangAPI.cpp
@@ -228,13 +228,15 @@ cMojangAPI::sProfile::sProfile(
 ////////////////////////////////////////////////////////////////////////////////
 // cMojangAPI::cUpdateThread:
 
-class cMojangAPI::cUpdateThread :
+class cMojangAPI::cUpdateThread:
 	public cIsThread
 {
-	typedef cIsThread super;
+	using Super = cIsThread;
+
 public:
-	cUpdateThread(cMojangAPI & a_MojangAPI) :
-		super("cMojangAPI::cUpdateThread"),
+
+	cUpdateThread(cMojangAPI & a_MojangAPI):
+		Super("cMojangAPI::cUpdateThread"),
 		m_MojangAPI(a_MojangAPI)
 	{
 	}
diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp
index 49bab8dfd..1bc6f687a 100644
--- a/src/Protocol/ProtocolRecognizer.cpp
+++ b/src/Protocol/ProtocolRecognizer.cpp
@@ -26,7 +26,7 @@
 
 
 cProtocolRecognizer::cProtocolRecognizer(cClientHandle * a_Client) :
-	super(a_Client),
+	Super(a_Client),
 	m_Buffer(8192),  // We need a larger buffer to support BungeeCord - it sends one huge packet at the start
 	m_InPingForUnrecognizedVersion(false)
 {
diff --git a/src/Protocol/ProtocolRecognizer.h b/src/Protocol/ProtocolRecognizer.h
index f1fe59367..e3d0481ae 100644
--- a/src/Protocol/ProtocolRecognizer.h
+++ b/src/Protocol/ProtocolRecognizer.h
@@ -21,7 +21,7 @@ protocol version instance and redirects everything to it. */
 class cProtocolRecognizer:
 	public cProtocol
 {
-	typedef cProtocol super;
+	using Super = cProtocol;
 
 public:
 	enum
diff --git a/src/Protocol/Protocol_1_10.h b/src/Protocol/Protocol_1_10.h
index 8b1f58364..9e2849d6f 100644
--- a/src/Protocol/Protocol_1_10.h
+++ b/src/Protocol/Protocol_1_10.h
@@ -19,12 +19,13 @@ Declares the 1.10 protocol classes:
 
 
 
-class cProtocol_1_10_0 :
+class cProtocol_1_10_0:
 	public cProtocol_1_9_4
 {
-	typedef cProtocol_1_9_4 Super;
+	using Super = cProtocol_1_9_4;
 
 public:
+
 	cProtocol_1_10_0(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 
 	virtual void SendSoundEffect(const AString & a_SoundName, double a_X, double a_Y, double a_Z, float a_Volume, float a_Pitch) override;
diff --git a/src/Protocol/Protocol_1_11.h b/src/Protocol/Protocol_1_11.h
index 71d0be827..b5c0bbeb8 100644
--- a/src/Protocol/Protocol_1_11.h
+++ b/src/Protocol/Protocol_1_11.h
@@ -21,12 +21,13 @@ Declares the 1.11 protocol classes:
 
 
 
-class cProtocol_1_11_0 :
+class cProtocol_1_11_0:
 	public cProtocol_1_10_0
 {
-	typedef cProtocol_1_10_0 Super;
+	using Super = cProtocol_1_10_0;
 
 public:
+
 	cProtocol_1_11_0(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 
 	virtual void SendCollectEntity(const cEntity & a_Entity, const cPlayer & a_Player, int a_Count) override;
@@ -52,12 +53,13 @@ protected:
 
 
 
-class cProtocol_1_11_1 :
+class cProtocol_1_11_1:
 	public cProtocol_1_11_0
 {
-	typedef cProtocol_1_11_0 Super;
+	using Super = cProtocol_1_11_0;
 
 public:
+
 	cProtocol_1_11_1(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 
 	virtual void HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) override;
diff --git a/src/Protocol/Protocol_1_12.h b/src/Protocol/Protocol_1_12.h
index 56a7b5341..38c025e9e 100644
--- a/src/Protocol/Protocol_1_12.h
+++ b/src/Protocol/Protocol_1_12.h
@@ -24,12 +24,13 @@ Declares the 1.12 protocol classes:
 
 
 
-class cProtocol_1_12 :
+class cProtocol_1_12:
 	public cProtocol_1_11_1
 {
-	typedef cProtocol_1_11_1 Super;
+	using Super = cProtocol_1_11_1;
 
 public:
+
 	cProtocol_1_12(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 
 protected:
@@ -49,12 +50,13 @@ protected:
 
 
 
-class cProtocol_1_12_1 :
+class cProtocol_1_12_1:
 	public cProtocol_1_12
 {
-	typedef cProtocol_1_12 Super;
+	using Super = cProtocol_1_12;
 
 public:
+
 	cProtocol_1_12_1(cClientHandle * a_Client, const AString &a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 
 protected:
@@ -71,9 +73,10 @@ protected:
 class cProtocol_1_12_2:
 	public cProtocol_1_12_1
 {
-	typedef cProtocol_1_12_1 Super;
+	using Super = cProtocol_1_12_1;
 
 public:
+
 	cProtocol_1_12_2(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State):
 		Super(a_Client, a_ServerAddress, a_ServerPort, a_State)
 	{
diff --git a/src/Protocol/Protocol_1_13.h b/src/Protocol/Protocol_1_13.h
index baafd3fd5..3d70f74d7 100644
--- a/src/Protocol/Protocol_1_13.h
+++ b/src/Protocol/Protocol_1_13.h
@@ -28,12 +28,13 @@ class BlockTypePalette;
 
 
 
-class cProtocol_1_13 :
+class cProtocol_1_13:
 	public cProtocol_1_12_2
 {
-	typedef cProtocol_1_12_2 Super;
+	using Super = cProtocol_1_12_2;
 
 public:
+
 	cProtocol_1_13(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 
 	virtual void Initialize(cClientHandle & a_Client) override;
diff --git a/src/Protocol/Protocol_1_8.cpp b/src/Protocol/Protocol_1_8.cpp
index c8883544d..d4d25d507 100644
--- a/src/Protocol/Protocol_1_8.cpp
+++ b/src/Protocol/Protocol_1_8.cpp
@@ -108,7 +108,7 @@ extern bool g_ShouldLogCommIn, g_ShouldLogCommOut;
 // cProtocol_1_8_0:
 
 cProtocol_1_8_0::cProtocol_1_8_0(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State) :
-	super(a_Client),
+	Super(a_Client),
 	m_ServerAddress(a_ServerAddress),
 	m_ServerPort(a_ServerPort),
 	m_State(a_State),
diff --git a/src/Protocol/Protocol_1_8.h b/src/Protocol/Protocol_1_8.h
index e8e0f01e1..b8a94e8b0 100644
--- a/src/Protocol/Protocol_1_8.h
+++ b/src/Protocol/Protocol_1_8.h
@@ -24,10 +24,10 @@ Declares the 1.8 protocol classes:
 
 
 
-class cProtocol_1_8_0 :
+class cProtocol_1_8_0:
 	public cProtocol
 {
-	typedef cProtocol super;
+	using Super = cProtocol;
 
 public:
 
diff --git a/src/Protocol/Protocol_1_9.h b/src/Protocol/Protocol_1_9.h
index 64619ab11..49ae8202a 100644
--- a/src/Protocol/Protocol_1_9.h
+++ b/src/Protocol/Protocol_1_9.h
@@ -30,10 +30,10 @@ Declares the 1.9 protocol classes:
 
 
 
-class cProtocol_1_9_0 :
+class cProtocol_1_9_0:
 	public cProtocol
 {
-	typedef cProtocol Super;
+	using Super = cProtocol;
 
 public:
 
@@ -292,12 +292,13 @@ protected:
 
 
 /** The version 108 protocol, used by 1.9.1.  Uses an int rather than a byte for dimension in join game. */
-class cProtocol_1_9_1 :
+class cProtocol_1_9_1:
 	public cProtocol_1_9_0
 {
-	typedef cProtocol_1_9_0 Super;
+	using Super = cProtocol_1_9_0;
 
 public:
+
 	cProtocol_1_9_1(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 
 	// cProtocol_1_9_0 overrides:
@@ -311,12 +312,13 @@ public:
 
 
 /** The version 109 protocol, used by 1.9.2.  Same as 1.9.1, except the server list ping version number changed with the protocol number. */
-class cProtocol_1_9_2 :
+class cProtocol_1_9_2:
 	public cProtocol_1_9_1
 {
-	typedef cProtocol_1_9_1 Super;
+	using Super = cProtocol_1_9_1;
 
 public:
+
 	cProtocol_1_9_2(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 
 	// cProtocol_1_9_1 overrides:
@@ -329,12 +331,13 @@ public:
 
 
 /** The version 110 protocol, used by 1.9.3 and 1.9.4. */
-class cProtocol_1_9_4 :
+class cProtocol_1_9_4:
 	public cProtocol_1_9_2
 {
-	typedef cProtocol_1_9_2 Super;
+	using Super = cProtocol_1_9_2;
 
 public:
+
 	cProtocol_1_9_4(cClientHandle * a_Client, const AString & a_ServerAddress, UInt16 a_ServerPort, UInt32 a_State);
 
 	// cProtocol_1_9_2 overrides: