From 07cf20b698bba9b5800ecbda3788ef441b9c49c2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 3 Jun 2015 12:31:45 +0300 Subject: Rename packettypes.h into packettype.h --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/actormanager.cpp | 2 +- src/being/being.cpp | 2 +- src/being/crazymoves.cpp | 2 +- src/being/localplayer.cpp | 2 +- src/dropshortcut.cpp | 2 +- src/enums/net/packettype.h | 47 +++++++++++++++++++++++++++++++++++++++++ src/enums/net/packettypes.h | 47 ----------------------------------------- src/gui/windows/npcdialog.cpp | 2 +- src/gui/windows/whoisonline.cpp | 2 +- src/net/packetlimiter.cpp | 2 +- src/net/tmwa/guildmanager.cpp | 2 +- 13 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 src/enums/net/packettype.h delete mode 100644 src/enums/net/packettypes.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bcd345a2d..ea6e551ab 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -532,7 +532,7 @@ SET(SRCS enums/net/auctionsearchtype.h enums/net/battlegroundtype.h enums/net/downloadstatus.h - enums/net/packettypes.h + enums/net/packettype.h net/gamehandler.h net/generalhandler.h net/guildhandler.h diff --git a/src/Makefile.am b/src/Makefile.am index 8a42a48d1..aace933c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -676,7 +676,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/net/auctionsearchtype.h \ enums/net/battlegroundtype.h \ enums/net/downloadstatus.h \ - enums/net/packettypes.h \ + enums/net/packettype.h \ net/gamehandler.h \ net/generalhandler.h \ net/guildhandler.h \ diff --git a/src/actormanager.cpp b/src/actormanager.cpp index e2a0619bd..629c504ef 100644 --- a/src/actormanager.cpp +++ b/src/actormanager.cpp @@ -30,7 +30,7 @@ #include "enums/being/attributes.h" -#include "enums/net/packettypes.h" +#include "enums/net/packettype.h" #include "gui/viewport.h" diff --git a/src/being/being.cpp b/src/being/being.cpp index 38ac02c0f..59ceb04d7 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -42,7 +42,7 @@ #include "enums/being/attributes.h" #include "enums/being/beingdirection.h" -#include "enums/net/packettypes.h" +#include "enums/net/packettype.h" #include "particle/particleinfo.h" diff --git a/src/being/crazymoves.cpp b/src/being/crazymoves.cpp index d33c0a91b..83eed7bd9 100644 --- a/src/being/crazymoves.cpp +++ b/src/being/crazymoves.cpp @@ -28,7 +28,7 @@ #include "enums/being/beingdirection.h" -#include "enums/net/packettypes.h" +#include "enums/net/packettype.h" #include "gui/windows/outfitwindow.h" diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 6c590e82c..23d3422f7 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -44,7 +44,7 @@ #include "enums/being/beingdirection.h" #include "enums/being/reachable.h" -#include "enums/net/packettypes.h" +#include "enums/net/packettype.h" #include "particle/particle.h" diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp index 0424ef7e8..90cd921f5 100644 --- a/src/dropshortcut.cpp +++ b/src/dropshortcut.cpp @@ -29,7 +29,7 @@ #include "being/localplayer.h" #include "being/playerinfo.h" -#include "enums/net/packettypes.h" +#include "enums/net/packettype.h" #include "net/packetlimiter.h" diff --git a/src/enums/net/packettype.h b/src/enums/net/packettype.h new file mode 100644 index 000000000..9298a9a8e --- /dev/null +++ b/src/enums/net/packettype.h @@ -0,0 +1,47 @@ +/* + * The ManaPlus Client + * 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 . + */ + +#ifndef ENUMS_NET_PACKETTYPE_H +#define ENUMS_NET_PACKETTYPE_H + +namespace PacketType +{ + enum T + { + PACKET_CHAT = 0, + PACKET_PICKUP = 1, + PACKET_DROP = 2, + PACKET_NPC_NEXT = 3, + PACKET_NPC_TALK = 4, + PACKET_NPC_INPUT = 5, + PACKET_EMOTE = 6, + PACKET_SIT = 7, + PACKET_DIRECTION = 8, + PACKET_ATTACK = 9, + PACKET_STOPATTACK = 10, + PACKET_ONLINELIST = 11, + PACKET_WHISPER = 12, + PACKET_SIZE + }; +} + +typedef PacketType::T PacketTypeT; + +#endif // ENUMS_NET_PACKETTYPE_H diff --git a/src/enums/net/packettypes.h b/src/enums/net/packettypes.h deleted file mode 100644 index 280b75ce5..000000000 --- a/src/enums/net/packettypes.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * The ManaPlus Client - * 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 . - */ - -#ifndef ENUMS_NET_PACKETTYPES_H -#define ENUMS_NET_PACKETTYPES_H - -namespace PacketType -{ - enum T - { - PACKET_CHAT = 0, - PACKET_PICKUP = 1, - PACKET_DROP = 2, - PACKET_NPC_NEXT = 3, - PACKET_NPC_TALK = 4, - PACKET_NPC_INPUT = 5, - PACKET_EMOTE = 6, - PACKET_SIT = 7, - PACKET_DIRECTION = 8, - PACKET_ATTACK = 9, - PACKET_STOPATTACK = 10, - PACKET_ONLINELIST = 11, - PACKET_WHISPER = 12, - PACKET_SIZE - }; -} - -typedef PacketType::T PacketTypeT; - -#endif // ENUMS_NET_PACKETTYPES_H diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index adb59e09f..4f38dd66b 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -31,7 +31,7 @@ #include "being/being.h" -#include "enums/net/packettypes.h" +#include "enums/net/packettype.h" #include "gui/gui.h" #include "gui/viewport.h" diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index e285c2dd8..db6e2ab4e 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -48,7 +48,7 @@ #include "being/localplayer.h" #include "being/playerrelations.h" -#include "enums/net/packettypes.h" +#include "enums/net/packettype.h" #ifdef TMWA_SUPPORT #include "net/download.h" diff --git a/src/net/packetlimiter.cpp b/src/net/packetlimiter.cpp index 38122d845..8652690d9 100644 --- a/src/net/packetlimiter.cpp +++ b/src/net/packetlimiter.cpp @@ -23,7 +23,7 @@ #include "configuration.h" #include "settings.h" -#include "enums/net/packettypes.h" +#include "enums/net/packettype.h" #include "utils/timer.h" diff --git a/src/net/tmwa/guildmanager.cpp b/src/net/tmwa/guildmanager.cpp index 1b5582717..bd96ba0f0 100644 --- a/src/net/tmwa/guildmanager.cpp +++ b/src/net/tmwa/guildmanager.cpp @@ -28,7 +28,7 @@ #include "being/localplayer.h" -#include "enums/net/packettypes.h" +#include "enums/net/packettype.h" #include "gui/windows/chatwindow.h" #include "gui/windows/socialwindow.h" -- cgit v1.2.3-60-g2f50