From 1c1860cf83ba5d504b69c0ebd737139c8ab1bd46 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 28 Jul 2014 20:06:31 +0300 Subject: Fix formatting in net files. --- src/net/ipc.h | 48 +++++------ src/net/packetcounters.h | 48 +++++------ src/net/serverinfo.h | 218 +++++++++++++++++++++++------------------------ 3 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/net/ipc.h b/src/net/ipc.h index 6d7f88ecc..eb2e92c9b 100644 --- a/src/net/ipc.h +++ b/src/net/ipc.h @@ -27,39 +27,39 @@ class IPC final { -public: - /** - * Constructor. - */ - IPC(); + public: + /** + * Constructor. + */ + IPC(); - A_DELETE_COPY(IPC) + A_DELETE_COPY(IPC) - /** - * Destructor. - */ - ~IPC(); + /** + * Destructor. + */ + ~IPC(); - bool init(); + bool init(); - unsigned short getPort() const A_WARN_UNUSED - { return mPort; } + unsigned short getPort() const A_WARN_UNUSED + { return mPort; } - static int acceptLoop(void *ptr); + static int acceptLoop(void *ptr); - static void start(); + static void start(); - static void stop(); + static void stop(); -private: - void setPort(const unsigned short port) - { mPort = port; } + private: + void setPort(const unsigned short port) + { mPort = port; } - unsigned int mNumReqs; - TcpNet::Socket mSocket; - SDL_Thread *mThread; - unsigned short mPort; - bool mListen; + unsigned int mNumReqs; + TcpNet::Socket mSocket; + SDL_Thread *mThread; + unsigned short mPort; + bool mListen; }; extern IPC *ipc; diff --git a/src/net/packetcounters.h b/src/net/packetcounters.h index 40e104794..12d9db09f 100644 --- a/src/net/packetcounters.h +++ b/src/net/packetcounters.h @@ -27,40 +27,40 @@ class PacketCounters final { -public: - static void incInBytes(const int cnt); + public: + static void incInBytes(const int cnt); - static void incInPackets(); + static void incInPackets(); - static int getInBytes() A_WARN_UNUSED; + static int getInBytes() A_WARN_UNUSED; - static int getInPackets() A_WARN_UNUSED; + static int getInPackets() A_WARN_UNUSED; - static void incOutBytes(const int cnt); + static void incOutBytes(const int cnt); - static void incOutPackets(); + static void incOutPackets(); - static int getOutBytes() A_WARN_UNUSED; + static int getOutBytes() A_WARN_UNUSED; - static int getOutPackets() A_WARN_UNUSED; + static int getOutPackets() A_WARN_UNUSED; - static void update(); + static void update(); - static int mInCurrentSec; - static int mInBytes; - static int mInBytesCalc; - static int mInPackets; - static int mInPacketsCalc; - static int mOutCurrentSec; - static int mOutBytes; - static int mOutBytesCalc; - static int mOutPackets; - static int mOutPacketsCalc; + static int mInCurrentSec; + static int mInBytes; + static int mInBytesCalc; + static int mInPackets; + static int mInPacketsCalc; + static int mOutCurrentSec; + static int mOutBytes; + static int mOutBytesCalc; + static int mOutPackets; + static int mOutPacketsCalc; -private: - static void updateCounter(int &restrict currentSec, - int &restrict calc, - int &restrict counter); + private: + static void updateCounter(int &restrict currentSec, + int &restrict calc, + int &restrict counter); }; #endif // NET_PACKETCOUNTERS_H diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index 49497d736..c523ecce7 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -34,118 +34,118 @@ class ServerInfo final { -public: - enum Type - { - UNKNOWN = 0, - TMWATHENA, - EVOL, - EATHENA - }; - - typedef std::pair VersionString; - - Type type; - std::string name; - std::string hostname; - std::string althostname; - std::string description; - std::string registerUrl; - std::string onlineListUrl; - std::string supportUrl; - std::vector updateMirrors; - uint16_t port; - VersionString version; - bool save; - bool persistentIp; - - ServerInfo() : - type(TMWATHENA), - name(), - hostname(), - althostname(), - description(), - registerUrl(), - onlineListUrl(), - supportUrl(), - updateMirrors(), - port(6901), - version(), - save(false), - persistentIp(true) - { - version.first = 0; - } - - ServerInfo(const ServerInfo &info) : - type(info.type), - name(info.name), - hostname(info.hostname), - althostname(info.althostname), - description(info.description), - registerUrl(info.registerUrl), - onlineListUrl(info.onlineListUrl), - supportUrl(info.supportUrl), - updateMirrors(info.updateMirrors), - port(info.port), - version(), - save(info.save), - persistentIp(info.persistentIp) - { - version.first = info.version.first; - version.second = info.version.second; - } - - bool isValid() const A_WARN_UNUSED - { - return !(hostname.empty() || port == 0 || type == UNKNOWN); - } - - void clear() - { - type = UNKNOWN; - name.clear(); - hostname.clear(); - althostname.clear(); - port = 0; - description.clear(); - registerUrl.clear(); - onlineListUrl.clear(); - supportUrl.clear(); - updateMirrors.clear(); - version.first = 0; - version.second.clear(); - save = false; - persistentIp = true; - } - - bool operator==(const ServerInfo &other) const - { - return (type == other.type && hostname == other.hostname && - port == other.port); - } - - bool operator!=(const ServerInfo &other) const - { - return (type != other.type || hostname != other.hostname || - port != other.port); - } - - static Type parseType(const std::string &serverType) A_WARN_UNUSED - { - if (compareStrI(serverType, "tmwathena") == 0) - return TMWATHENA; - if (compareStrI(serverType, "evol") == 0) - return EVOL; + public: + enum Type + { + UNKNOWN = 0, + TMWATHENA, + EVOL, + EATHENA + }; + + typedef std::pair VersionString; + + Type type; + std::string name; + std::string hostname; + std::string althostname; + std::string description; + std::string registerUrl; + std::string onlineListUrl; + std::string supportUrl; + std::vector updateMirrors; + uint16_t port; + VersionString version; + bool save; + bool persistentIp; + + ServerInfo() : + type(TMWATHENA), + name(), + hostname(), + althostname(), + description(), + registerUrl(), + onlineListUrl(), + supportUrl(), + updateMirrors(), + port(6901), + version(), + save(false), + persistentIp(true) + { + version.first = 0; + } + + ServerInfo(const ServerInfo &info) : + type(info.type), + name(info.name), + hostname(info.hostname), + althostname(info.althostname), + description(info.description), + registerUrl(info.registerUrl), + onlineListUrl(info.onlineListUrl), + supportUrl(info.supportUrl), + updateMirrors(info.updateMirrors), + port(info.port), + version(), + save(info.save), + persistentIp(info.persistentIp) + { + version.first = info.version.first; + version.second = info.version.second; + } + + bool isValid() const A_WARN_UNUSED + { + return !(hostname.empty() || port == 0 || type == UNKNOWN); + } + + void clear() + { + type = UNKNOWN; + name.clear(); + hostname.clear(); + althostname.clear(); + port = 0; + description.clear(); + registerUrl.clear(); + onlineListUrl.clear(); + supportUrl.clear(); + updateMirrors.clear(); + version.first = 0; + version.second.clear(); + save = false; + persistentIp = true; + } + + bool operator==(const ServerInfo &other) const + { + return (type == other.type && hostname == other.hostname && + port == other.port); + } + + bool operator!=(const ServerInfo &other) const + { + return (type != other.type || hostname != other.hostname || + port != other.port); + } + + static Type parseType(const std::string &serverType) A_WARN_UNUSED + { + if (compareStrI(serverType, "tmwathena") == 0) + return TMWATHENA; + if (compareStrI(serverType, "evol") == 0) + return EVOL; #ifdef EATHENA_SUPPORT - else if (compareStrI(serverType, "eathena") == 0) - return EATHENA; + else if (compareStrI(serverType, "eathena") == 0) + return EATHENA; #else - else if (compareStrI(serverType, "eathena") == 0) - return TMWATHENA; + else if (compareStrI(serverType, "eathena") == 0) + return TMWATHENA; #endif - return UNKNOWN; - } + return UNKNOWN; + } }; typedef std::vector ServerInfos; -- cgit v1.2.3-70-g09d2