diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-06 17:53:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-06 17:53:28 +0300 |
| commit | 0ca80e1e00996eb0ad8cb431d5de2b816a134182 (patch) | |
| tree | 4681163dfc3b09cdf6e11dba04f18dace070851b | |
| parent | 953101de6e60cf849c73e1109268b88c34062833 (diff) | |
| download | mv-0ca80e1e00996eb0ad8cb431d5de2b816a134182.tar.gz mv-0ca80e1e00996eb0ad8cb431d5de2b816a134182.tar.bz2 mv-0ca80e1e00996eb0ad8cb431d5de2b816a134182.tar.xz mv-0ca80e1e00996eb0ad8cb431d5de2b816a134182.zip | |
Move updatetype.h into enums namespace.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/enums/net/updatetype.h (renamed from src/net/updatetype.h) | 6 | ||||
| -rw-r--r-- | src/gui/windows/updaterwindow.cpp | 3 | ||||
| -rw-r--r-- | src/net/logindata.h | 4 |
5 files changed, 9 insertions, 8 deletions
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/net/updatetype.h b/src/enums/net/updatetype.h index babe66d4f..2245cec28 100644 --- a/src/net/updatetype.h +++ b/src/enums/net/updatetype.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NET_UPDATETYPE_H -#define NET_UPDATETYPE_H +#ifndef ENUMS_NET_UPDATETYPE_H +#define ENUMS_NET_UPDATETYPE_H namespace UpdateType { @@ -34,4 +34,4 @@ namespace UpdateType }; } // namespace UpdateType -#endif // NET_UPDATETYPE_H +#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> |