From 0bdaa773a4ee5a678c400a1b097190e3856ee5a6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 3 Jun 2015 17:23:55 +0300
Subject: Convert UpdateType enum into strong typed enum.

---
 src/net/logindata.h             |  4 ++--
 src/net/updatetypeoperators.cpp | 38 ++++++++++++++++++++++++++++++++++++++
 src/net/updatetypeoperators.h   | 30 ++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 src/net/updatetypeoperators.cpp
 create mode 100644 src/net/updatetypeoperators.h

(limited to 'src/net')

diff --git a/src/net/logindata.h b/src/net/logindata.h
index acca562fd..1d6e6fd97 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -41,7 +41,7 @@ class LoginData final
             updateHost(),
             updateHosts(),
             lastLogin(),
-            updateType(0),
+            updateType(UpdateType::Normal),
             email(),
             captchaResponse(),
             registerUrl(),
@@ -60,7 +60,7 @@ class LoginData final
         std::string updateHost;
         StringVect updateHosts;
         std::string lastLogin;
-        int updateType;
+        UpdateTypeT updateType;
 
         std::string email;
         std::string captchaResponse;
diff --git a/src/net/updatetypeoperators.cpp b/src/net/updatetypeoperators.cpp
new file mode 100644
index 000000000..7ce32dc92
--- /dev/null
+++ b/src/net/updatetypeoperators.cpp
@@ -0,0 +1,38 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/updatetypeoperators.h"
+
+#include "debug.h"
+
+int operator&(const UpdateTypeT &a, const UpdateTypeT &b)
+{
+    return static_cast<int>(a) & static_cast<int>(b);
+}
+
+int operator|(const UpdateTypeT &a, const UpdateTypeT &b)
+{
+    return static_cast<int>(a) | static_cast<int>(b);
+}
+
+int operator|(const int &a, const UpdateTypeT &b)
+{
+    return a | static_cast<int>(b);
+}
diff --git a/src/net/updatetypeoperators.h b/src/net/updatetypeoperators.h
new file mode 100644
index 000000000..afc8ca185
--- /dev/null
+++ b/src/net/updatetypeoperators.h
@@ -0,0 +1,30 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_UPDATETYPEOPERATORS_H
+#define NET_UPDATETYPEOPERATORS_H
+
+#include "enums/net/updatetype.h"
+
+int operator&(const UpdateTypeT &a, const UpdateTypeT &b);
+int operator|(const UpdateTypeT &a, const UpdateTypeT &b);
+int operator|(const int &a, const UpdateTypeT &b);
+
+#endif  // NET_UPDATETYPEOPERATORS_H
-- 
cgit v1.2.3-60-g2f50