From e9410bd371fc68169c57d2c52382948a0b083da4 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 20 Oct 2018 15:50:06 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Net/je_net.cpp | 24 ------------------------ src/libjin/Net/je_net.h | 32 -------------------------------- src/libjin/Net/je_net_manager.cpp | 24 ++++++++++++++++++++++++ src/libjin/Net/je_net_manager.h | 32 ++++++++++++++++++++++++++++++++ src/libjin/Net/je_socket.cpp | 8 ++++---- src/libjin/Net/je_socket.h | 8 ++++---- 6 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 src/libjin/Net/je_net.cpp delete mode 100644 src/libjin/Net/je_net.h create mode 100644 src/libjin/Net/je_net_manager.cpp create mode 100644 src/libjin/Net/je_net_manager.h (limited to 'src/libjin/Net') diff --git a/src/libjin/Net/je_net.cpp b/src/libjin/Net/je_net.cpp deleted file mode 100644 index c417108..0000000 --- a/src/libjin/Net/je_net.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "je_net.h" - -namespace jin -{ - namespace net - { - - bool Net::initSystem(const SettingBase* setting) - { - #ifdef _WIN32 - #if LIBJIN_NET_TEKCOS - tk_init(); - #endif - #endif - return true; - } - - void Net::quitSystem() - { - - } - - } // namespace net -} // namespace jin \ No newline at end of file diff --git a/src/libjin/Net/je_net.h b/src/libjin/Net/je_net.h deleted file mode 100644 index 6ed018a..0000000 --- a/src/libjin/Net/je_net.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef __JE_NET_H -#define __JE_NET_H -#include "../core/je_configuration.h" -#if LIBJIN_MODULES_NET - -#include "../common/je_subsystem.hpp" - -#include "je_socket.h" - -namespace jin -{ - namespace net - { - - class Net : public Subsystem - { - public: - - protected: - singleton(Net); - Net() {}; - ~Net() {}; - bool initSystem(const SettingBase* setting) override; - void quitSystem() override; - - }; - - } // namespace net -} // namespace jin - -#endif // LIBJIN_MODULES_NET -#endif // __JE_NET_H diff --git a/src/libjin/Net/je_net_manager.cpp b/src/libjin/Net/je_net_manager.cpp new file mode 100644 index 0000000..36021f1 --- /dev/null +++ b/src/libjin/Net/je_net_manager.cpp @@ -0,0 +1,24 @@ +#include "je_net_manager.h" + +namespace JinEngine +{ + namespace Net + { + + bool NetManager::initSystem(const SettingBase* setting) + { + #ifdef _WIN32 + #if LIBJIN_NET_TEKCOS + tk_init(); + #endif + #endif + return true; + } + + void NetManager::quitSystem() + { + + } + + } // namespace Net +} // namespace JinEngine \ No newline at end of file diff --git a/src/libjin/Net/je_net_manager.h b/src/libjin/Net/je_net_manager.h new file mode 100644 index 0000000..31c4d04 --- /dev/null +++ b/src/libjin/Net/je_net_manager.h @@ -0,0 +1,32 @@ +#ifndef __JE_NET_H +#define __JE_NET_H +#include "../core/je_configuration.h" +#if LIBJIN_MODULES_NET + +#include "../common/je_subsystem.hpp" + +#include "je_socket.h" + +namespace JinEngine +{ + namespace Net + { + + class NetManager : public Subsystem + { + public: + + protected: + singleton(NetManager); + NetManager() {}; + ~NetManager() {}; + bool initSystem(const SettingBase* setting) override; + void quitSystem() override; + + }; + + } // namespace Net +} // namespace JinEngine + +#endif // LIBJIN_MODULES_NET +#endif // __JE_NET_H diff --git a/src/libjin/Net/je_socket.cpp b/src/libjin/Net/je_socket.cpp index 3a8be7f..0137df2 100644 --- a/src/libjin/Net/je_socket.cpp +++ b/src/libjin/Net/je_socket.cpp @@ -1,8 +1,8 @@ #include "je_socket.h" -namespace jin +namespace JinEngine { - namespace net + namespace Net { Socket::Socket(const Socket& socket) : handle(socket.handle) @@ -186,5 +186,5 @@ namespace jin } } - } // namespace net -} // namespace jin \ No newline at end of file + } // namespace Net +} // namespace JinEngine \ No newline at end of file diff --git a/src/libjin/Net/je_socket.h b/src/libjin/Net/je_socket.h index e360d72..5a31683 100644 --- a/src/libjin/Net/je_socket.h +++ b/src/libjin/Net/je_socket.h @@ -5,9 +5,9 @@ #include "../3rdparty/tekcos/tekcos.h" -namespace jin +namespace JinEngine { - namespace net + namespace Net { enum SocketType @@ -55,8 +55,8 @@ namespace jin }; - } // namespace net -} // namespace jin + } // namespace Net +} // namespace JinEngine #endif // LIBJIN_MODULES_NET #endif // __JE_NET_SOCKET_H -- cgit v1.1-26-g67d0