summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 17:53:28 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 17:53:28 +0300
commit0ca80e1e00996eb0ad8cb431d5de2b816a134182 (patch)
tree4681163dfc3b09cdf6e11dba04f18dace070851b /src/net
parent953101de6e60cf849c73e1109268b88c34062833 (diff)
downloadmv-0ca80e1e00996eb0ad8cb431d5de2b816a134182.tar.gz
mv-0ca80e1e00996eb0ad8cb431d5de2b816a134182.tar.bz2
mv-0ca80e1e00996eb0ad8cb431d5de2b816a134182.tar.xz
mv-0ca80e1e00996eb0ad8cb431d5de2b816a134182.zip
Move updatetype.h into enums namespace.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/logindata.h4
-rw-r--r--src/net/updatetype.h37
2 files changed, 2 insertions, 39 deletions
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