From 0ca80e1e00996eb0ad8cb431d5de2b816a134182 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 6 Jan 2015 17:53:28 +0300
Subject: Move updatetype.h into enums namespace.

---
 src/CMakeLists.txt                |  2 +-
 src/Makefile.am                   |  2 +-
 src/enums/net/updatetype.h        | 37 +++++++++++++++++++++++++++++++++++++
 src/gui/windows/updaterwindow.cpp |  3 ++-
 src/net/logindata.h               |  4 ++--
 src/net/updatetype.h              | 37 -------------------------------------
 6 files changed, 43 insertions(+), 42 deletions(-)
 create mode 100644 src/enums/net/updatetype.h
 delete mode 100644 src/net/updatetype.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a234347aa..b8f7a2bfb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -572,7 +572,7 @@ SET(SRCS
     net/serverinfo.h
     net/skillhandler.h
     net/tradehandler.h
-    net/updatetype.h
+    enums/net/updatetype.h
     net/uploadcharinfo.h
     net/worldinfo.h
     net/packetcounters.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 21fe8b12e..1baa9a521 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -703,7 +703,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      net/serverinfo.h \
 	      net/skillhandler.h \
 	      net/tradehandler.h \
-	      net/updatetype.h \
+	      enums/net/updatetype.h \
 	      net/uploadcharinfo.h \
 	      net/worldinfo.h \
 	      net/packetcounters.cpp \
diff --git a/src/enums/net/updatetype.h b/src/enums/net/updatetype.h
new file mode 100644
index 000000000..2245cec28
--- /dev/null
+++ b/src/enums/net/updatetype.h
@@ -0,0 +1,37 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-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 ENUMS_NET_UPDATETYPE_H
+#define ENUMS_NET_UPDATETYPE_H
+
+namespace UpdateType
+{
+    enum Type
+    {
+        Normal = 0,
+        Close = 1,
+        Skip = 2,
+        Custom = 4
+    };
+}  // namespace UpdateType
+
+#endif  // ENUMS_NET_UPDATETYPE_H
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 6e994821e..37f0f283f 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -26,6 +26,8 @@
 #include "configuration.h"
 #include "settings.h"
 
+#include "enums/net/updatetype.h"
+
 #include "input/inputaction.h"
 
 #include "gui/widgets/browserbox.h"
@@ -38,7 +40,6 @@
 #include "gui/widgets/scrollarea.h"
 
 #include "net/download.h"
-#include "net/updatetype.h"
 
 #include "resources/resourcemanager.h"
 
diff --git a/src/net/logindata.h b/src/net/logindata.h
index 06c1d440d..9806d69d0 100644
--- a/src/net/logindata.h
+++ b/src/net/logindata.h
@@ -25,9 +25,9 @@
 
 #include "being/gender.h"
 
-#include "utils/stringvector.h"
+#include "enums/net/updatetype.h"
 
-#include "net/updatetype.h"
+#include "utils/stringvector.h"
 
 #include <string>
 
diff --git a/src/net/updatetype.h b/src/net/updatetype.h
deleted file mode 100644
index babe66d4f..000000000
--- a/src/net/updatetype.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-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_UPDATETYPE_H
-#define NET_UPDATETYPE_H
-
-namespace UpdateType
-{
-    enum Type
-    {
-        Normal = 0,
-        Close = 1,
-        Skip = 2,
-        Custom = 4
-    };
-}  // namespace UpdateType
-
-#endif  // NET_UPDATETYPE_H
-- 
cgit v1.2.3-70-g09d2