From 82d251b71be3091575a86e507fa4f587af4d4330 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Thu, 20 Aug 2020 21:34:46 +0100 Subject: Made cProtocol::Version, EntityMetadata enums less verbose --- src/Protocol/ProtocolRecognizer.cpp | 60 ++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'src/Protocol/ProtocolRecognizer.cpp') diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp index 81570ccd4..e78ed6d6c 100644 --- a/src/Protocol/ProtocolRecognizer.cpp +++ b/src/Protocol/ProtocolRecognizer.cpp @@ -63,21 +63,21 @@ AString cMultiVersionProtocol::GetVersionTextFromInt(cProtocol::Version a_Protoc { switch (a_ProtocolVersion) { - case cProtocol::Version::Version_1_8_0: return "1.8"; - case cProtocol::Version::Version_1_9_0: return "1.9"; - case cProtocol::Version::Version_1_9_1: return "1.9.1"; - case cProtocol::Version::Version_1_9_2: return "1.9.2"; - case cProtocol::Version::Version_1_9_4: return "1.9.4"; - case cProtocol::Version::Version_1_10_0: return "1.10"; - case cProtocol::Version::Version_1_11_0: return "1.11"; - case cProtocol::Version::Version_1_11_1: return "1.11.1"; - case cProtocol::Version::Version_1_12: return "1.12"; - case cProtocol::Version::Version_1_12_1: return "1.12.1"; - case cProtocol::Version::Version_1_12_2: return "1.12.2"; - case cProtocol::Version::Version_1_13: return "1.13"; - case cProtocol::Version::Version_1_13_1: return "1.13.1"; - case cProtocol::Version::Version_1_13_2: return "1.13.2"; - case cProtocol::Version::Version_1_14: return "1.14"; + case cProtocol::Version::v1_8_0: return "1.8"; + case cProtocol::Version::v1_9_0: return "1.9"; + case cProtocol::Version::v1_9_1: return "1.9.1"; + case cProtocol::Version::v1_9_2: return "1.9.2"; + case cProtocol::Version::v1_9_4: return "1.9.4"; + case cProtocol::Version::v1_10_0: return "1.10"; + case cProtocol::Version::v1_11_0: return "1.11"; + case cProtocol::Version::v1_11_1: return "1.11.1"; + case cProtocol::Version::v1_12: return "1.12"; + case cProtocol::Version::v1_12_1: return "1.12.1"; + case cProtocol::Version::v1_12_2: return "1.12.2"; + case cProtocol::Version::v1_13: return "1.13"; + case cProtocol::Version::v1_13_1: return "1.13.1"; + case cProtocol::Version::v1_13_2: return "1.13.2"; + case cProtocol::Version::v1_14: return "1.14"; } ASSERT(!"Unknown protocol version"); @@ -287,21 +287,21 @@ std::unique_ptr cMultiVersionProtocol::TryRecognizeLengthedProtocol(c switch (static_cast(ProtocolVersion)) { - case cProtocol::Version::Version_1_8_0: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_9_0: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_9_1: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_9_2: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_9_4: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_10_0: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_11_0: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_11_1: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_12: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_12_1: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_12_2: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_13: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_13_1: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_13_2: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); - case cProtocol::Version::Version_1_14: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_8_0: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_9_0: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_9_1: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_9_2: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_9_4: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_10_0: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_11_0: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_11_1: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_12: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_12_1: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_12_2: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_13: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_13_1: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_13_2: return std::make_unique(&a_Client, ServerAddress, ServerPort, NextState); + case cProtocol::Version::v1_14: return std::make_unique (&a_Client, ServerAddress, ServerPort, NextState); default: { LOGD("Client \"%s\" uses an unsupported protocol (lengthed, version %u (0x%x))", -- cgit v1.2.3