Use a consistent naming style for enum class values

Sometimes I've used CamelCase and sometimes SNAKE_CASE for these values.
Since "enum class" values are always prefixed with the enum name, which
uses CamelCase, I find it more fitting to use it for the values as well.

Also fixes compilation on Windows where 'ERROR' was conflicting with a
define.

12 files changed, 49 insertions, 49 deletions

diff --git a/src/net/download.cpp b/src/net/download.cpp
index 92656ac8..7aab3b2f 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -116,7 +116,7 @@ bool Download::start()
     {
         logger->log("%s", DOWNLOAD_ERROR_MESSAGE_THREAD);
         strncpy(mError, DOWNLOAD_ERROR_MESSAGE_THREAD, CURL_ERROR_SIZE - 1);
-        mState.lock()->status = DownloadStatus::ERROR;
+        mState.lock()->status = DownloadStatus::Error;
         return false;
     }
 
@@ -145,7 +145,7 @@ int Download::downloadProgress(void *clientp,
     auto *d = reinterpret_cast<Download*>(clientp);
 
     auto state = d->mState.lock();
-    state->status = DownloadStatus::IN_PROGRESS;
+    state->status = DownloadStatus::InProgress;
     state->progress = 0.0f;
     if (dltotal > 0)
         state->progress = static_cast<float>(dlnow) / dltotal;
@@ -300,11 +300,11 @@ int Download::downloadThread(void *ptr)
 
     auto state = d->mState.lock();
     if (d->mCancel)
-        state->status = DownloadStatus::CANCELED;
+        state->status = DownloadStatus::Canceled;
     else if (complete)
-        state->status = DownloadStatus::COMPLETE;
+        state->status = DownloadStatus::Complete;
     else
-        state->status = DownloadStatus::ERROR;
+        state->status = DownloadStatus::Error;
 
     return 0;
 }
diff --git a/src/net/download.h b/src/net/download.h
index 20a7fc74..e9483fa5 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -30,10 +30,10 @@
 
 enum class DownloadStatus
 {
-    IN_PROGRESS,
-    CANCELED,
-    ERROR,
-    COMPLETE
+    InProgress,
+    Canceled,
+    Error,
+    Complete
 };
 
 struct SDL_Thread;
@@ -45,7 +45,7 @@ class Download
     public:
         struct State
         {
-            DownloadStatus status = DownloadStatus::IN_PROGRESS;
+            DownloadStatus status = DownloadStatus::InProgress;
             float progress = 0.0f;
         };
 
diff --git a/src/net/logindata.h b/src/net/logindata.h
index 3f2015f4..4af402ec 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -39,7 +39,7 @@ public:
     std::string email;
     std::string captchaResponse;
 
-    Gender gender = Gender::UNSPECIFIED;
+    Gender gender = Gender::Unspecified;
 
     bool remember;            /**< Whether to store the username. */
     bool registerLogin;       /**< Whether an account is being registered. */
@@ -63,7 +63,7 @@ public:
         updateHost.clear();
         email.clear();
         captchaResponse.clear();
-        gender = Gender::UNSPECIFIED;
+        gender = Gender::Unspecified;
         resetCharacterSlots();
     }
 };
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index d1eb67aa..9bb52ac1 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -153,13 +153,13 @@ void BeingHandler::handleBeingEnterMessage(MessageIn &msg)
     int py = msg.readInt16();
     auto direction = (BeingDirection)msg.readInt8();
 
-    Gender gender = Gender::UNSPECIFIED;
+    Gender gender = Gender::Unspecified;
     switch (getGender(msg.readInt8())) {
     case GENDER_MALE:
-        gender = Gender::MALE;
+        gender = Gender::Male;
         break;
     case GENDER_FEMALE:
-        gender = Gender::FEMALE;
+        gender = Gender::Female;
         break;
     case GENDER_UNSPECIFIED:
         break;
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index 8afbb90b..98591669 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -108,13 +108,13 @@ void CharHandler::handleCharacterInfo(MessageIn &msg)
         info.name = msg.readString();
         switch (getGender(msg.readInt8())) {
         case GENDER_MALE:
-            info.gender = Gender::MALE;
+            info.gender = Gender::Male;
             break;
         case GENDER_FEMALE:
-            info.gender = Gender::FEMALE;
+            info.gender = Gender::Female;
             break;
         case GENDER_UNSPECIFIED:
-            info.gender = Gender::UNSPECIFIED;
+            info.gender = Gender::Unspecified;
             break;
         }
         info.hairStyle = msg.readInt8();
diff --git a/src/net/net.cpp b/src/net/net.cpp
index a2771244..1d157b3d 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -125,18 +125,18 @@ Net::TradeHandler *Net::getTradeHandler()
 namespace Net
 {
 
-static ServerType networkType = ServerType::UNKNOWN;
+static ServerType networkType = ServerType::Unknown;
 
 void connectToServer(ServerInfo &server)
 {
-    if (server.type == ServerType::UNKNOWN)
+    if (server.type == ServerType::Unknown)
     {
         // TODO: Query the server about itself and choose the netcode based on
         // that
         if (server.port == 6901)
-            server.type = ServerType::TMWATHENA;
+            server.type = ServerType::TmwAthena;
         else if (server.port == 9601)
-            server.type = ServerType::MANASERV;
+            server.type = ServerType::ManaServ;
         else
             logger->error(_("Unknown Server Type! Exiting."));
     }
@@ -152,11 +152,11 @@ void connectToServer(ServerInfo &server)
         switch (server.type)
         {
 #ifdef MANASERV_SUPPORT
-            case ServerType::MANASERV:
+            case ServerType::ManaServ:
                 generalHandler = new ManaServ::GeneralHandler;
                 break;
 #endif
-            case ServerType::TMWATHENA:
+            case ServerType::TmwAthena:
                 generalHandler = new TmwAthena::GeneralHandler;
                 break;
             default:
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index a9dc785c..ad862427 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -27,9 +27,9 @@
 
 enum class ServerType
 {
-    UNKNOWN,
-    MANASERV,
-    TMWATHENA
+    Unknown,
+    ManaServ,
+    TmwAthena
 };
 
 class ServerInfo
@@ -37,7 +37,7 @@ class ServerInfo
 public:
     using VersionString = std::pair<int, std::string>;
 
-    ServerType type = ServerType::UNKNOWN;
+    ServerType type = ServerType::Unknown;
     std::string name;
     std::string hostname;
     uint16_t port = 0;
@@ -50,7 +50,7 @@ public:
 
     bool isValid() const
     {
-        return !hostname.empty() && port != 0 && type != ServerType::UNKNOWN;
+        return !hostname.empty() && port != 0 && type != ServerType::Unknown;
     }
 
     void clear()
@@ -73,13 +73,13 @@ public:
     static ServerType parseType(const std::string &type)
     {
         if (type == "tmwathena")
-            return ServerType::TMWATHENA;
+            return ServerType::TmwAthena;
         // Used for backward compatibility
         if (type == "eathena")
-            return ServerType::TMWATHENA;
+            return ServerType::TmwAthena;
         if (type == "manaserv")
-            return ServerType::MANASERV;
-        return ServerType::UNKNOWN;
+            return ServerType::ManaServ;
+        return ServerType::Unknown;
     }
 
     static uint16_t defaultPortForServerType(ServerType type)
@@ -87,11 +87,11 @@ public:
         switch (type)
         {
         default:
-        case ServerType::UNKNOWN:
+        case ServerType::Unknown:
             return 0;
-        case ServerType::TMWATHENA:
+        case ServerType::TmwAthena:
             return 6901;
-        case ServerType::MANASERV:
+        case ServerType::ManaServ:
             return 9601;
         }
     }
@@ -99,10 +99,10 @@ public:
     static ServerType defaultServerTypeForPort(uint16_t port)
     {
         if (port == 6901)
-            return ServerType::TMWATHENA;
+            return ServerType::TmwAthena;
         if (port == 9601)
-            return ServerType::MANASERV;
-        return ServerType::UNKNOWN;
+            return ServerType::ManaServ;
+        return ServerType::Unknown;
     }
 };
 
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 78685dfd..c5979e9f 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -303,8 +303,8 @@ void BeingHandler::handleMessage(MessageIn &msg)
 
             if (dstBeing->getType() == ActorSprite::PLAYER)
             {
-                dstBeing->setGender(gender == 0 ? Gender::FEMALE
-                                                : Gender::MALE);
+                dstBeing->setGender(gender == 0 ? Gender::Female
+                                                : Gender::Male);
                 // Set these after the gender, as the sprites may be gender-specific
                 dstBeing->setSprite(SPRITE_HAIR, hairStyle * -1,
                                     hairDB.getHairColor(hairColor));
@@ -614,8 +614,8 @@ void BeingHandler::handleMessage(MessageIn &msg)
             msg.readInt16();  // manner
             opt3 = msg.readInt16();
             msg.readInt8();   // karma
-            dstBeing->setGender(msg.readInt8() == 0 ? Gender::FEMALE
-                                                    : Gender::MALE);
+            dstBeing->setGender(msg.readInt8() == 0 ? Gender::Female
+                                                    : Gender::Male);
             // Set these after the gender, as the sprites may be gender-specific
             dstBeing->setSprite(SPRITE_WEAPON, weapon, "", true);
             dstBeing->setSprite(SPRITE_SHIELD, shield);
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 39155201..0ecbb135 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -268,7 +268,7 @@ void CharServerHandler::readPlayerData(MessageIn &msg, Net::Character *character
 
     character->slot = msg.readInt8(); // character slot
     const uint8_t sex = msg.readInt8();
-    tempPlayer->setGender(sex ? Gender::MALE : Gender::FEMALE);
+    tempPlayer->setGender(sex ? Gender::Male : Gender::Female);
 }
 
 void CharServerHandler::setCharSelectDialog(CharSelectDialog *window)
@@ -400,7 +400,7 @@ void CharServerHandler::connect()
     // [Fate] The next word is unused by the old char server, so we squeeze in
     //        mana client version information
     outMsg.writeInt16(CLIENT_PROTOCOL_VERSION);
-    outMsg.writeInt8(token.sex == Gender::MALE ? 1 : 0);
+    outMsg.writeInt8(token.sex == Gender::Male ? 1 : 0);
 
     // We get 4 useless bytes before the real answer comes in (what are these?)
     mNetwork->skip(4);
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index abc9c73c..0a3bb9d9 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -140,7 +140,7 @@ void GameHandler::connect()
     outMsg.writeInt32(mCharID);
     outMsg.writeInt32(token.session_ID1);
     outMsg.writeInt32(token.session_ID2);
-    outMsg.writeInt8(token.sex == Gender::MALE ? 1 : 0);
+    outMsg.writeInt8(token.sex == Gender::Male ? 1 : 0);
 
     // We get 4 useless bytes before the real answer comes in (what are these?)
     mNetwork->skip(4);
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 069f9336..a7162ee6 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -124,7 +124,7 @@ void LoginHandler::handleMessage(MessageIn &msg)
             mToken.account_ID = msg.readInt32();
             mToken.session_ID2 = msg.readInt32();
             msg.skip(30);                           // unused
-            mToken.sex = msg.readInt8() ? Gender::MALE : Gender::FEMALE;
+            mToken.sex = msg.readInt8() ? Gender::Male : Gender::Female;
 
             for (int i = 0; i < worldCount; i++)
             {
@@ -304,7 +304,7 @@ void LoginHandler::chooseServer(unsigned int server)
 void LoginHandler::registerAccount(LoginData *loginData)
 {
     std::string username = loginData->username;
-    username.append(loginData->gender == Gender::FEMALE ? "_F" : "_M");
+    username.append(loginData->gender == Gender::Female ? "_F" : "_M");
 
     sendLoginRegister(username, loginData->password);
 }
diff --git a/src/net/tmwa/token.h b/src/net/tmwa/token.h
index 8c078c6c..b563bf65 100644
--- a/src/net/tmwa/token.h
+++ b/src/net/tmwa/token.h
@@ -35,6 +35,6 @@ struct Token
         account_ID = 0;
         session_ID1 = 0;
         session_ID2 = 0;
-        sex = Gender::UNSPECIFIED;
+        sex = Gender::Unspecified;
     }
 };