aboutsummaryrefslogtreecommitdiff
path: root/src/libjin/Net
diff options
context:
space:
mode:
Diffstat (limited to 'src/libjin/Net')
-rw-r--r--src/libjin/Net/je_net.cpp (renamed from src/libjin/Net/Net.cpp)2
-rw-r--r--src/libjin/Net/je_net.h (renamed from src/libjin/Net/Net.h)7
-rw-r--r--src/libjin/Net/je_socket.cpp (renamed from src/libjin/Net/Socket.cpp)2
-rw-r--r--src/libjin/Net/je_socket.h (renamed from src/libjin/Net/Socket.h)2
-rw-r--r--src/libjin/Net/net.cpp24
-rw-r--r--src/libjin/Net/net.h31
6 files changed, 7 insertions, 61 deletions
diff --git a/src/libjin/Net/Net.cpp b/src/libjin/Net/je_net.cpp
index 940b239..c417108 100644
--- a/src/libjin/Net/Net.cpp
+++ b/src/libjin/Net/je_net.cpp
@@ -1,4 +1,4 @@
-#include "Net.h"
+#include "je_net.h"
namespace jin
{
diff --git a/src/libjin/Net/Net.h b/src/libjin/Net/je_net.h
index 3324d11..7718085 100644
--- a/src/libjin/Net/Net.h
+++ b/src/libjin/Net/je_net.h
@@ -1,10 +1,11 @@
#ifndef __LIBJIN_NET_H
#define __LIBJIN_NET_H
-#include "../configuration.h"
+#include "../core/je_configuration.h"
#if LIBJIN_MODULES_NET
-#include "../Common/Subsystem.hpp"
-#include "Socket.h"
+#include "../common/je_subsystem.hpp"
+
+#include "je_socket.h"
namespace jin
{
diff --git a/src/libjin/Net/Socket.cpp b/src/libjin/Net/je_socket.cpp
index 770b47d..3a8be7f 100644
--- a/src/libjin/Net/Socket.cpp
+++ b/src/libjin/Net/je_socket.cpp
@@ -1,4 +1,4 @@
-#include "Socket.h"
+#include "je_socket.h"
namespace jin
{
diff --git a/src/libjin/Net/Socket.h b/src/libjin/Net/je_socket.h
index 04d3ab0..ab6a561 100644
--- a/src/libjin/Net/Socket.h
+++ b/src/libjin/Net/je_socket.h
@@ -1,6 +1,6 @@
#ifndef __LIBJIN_NET_SOCKET_H
#define __LIBJIN_NET_SOCKET_H
-#include "../configuration.h"
+#include "../core/je_configuration.h"
#if LIBJIN_MODULES_NET
#include "../3rdparty/tekcos/tekcos.h"
diff --git a/src/libjin/Net/net.cpp b/src/libjin/Net/net.cpp
deleted file mode 100644
index 940b239..0000000
--- a/src/libjin/Net/net.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "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/net.h b/src/libjin/Net/net.h
deleted file mode 100644
index 3324d11..0000000
--- a/src/libjin/Net/net.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __LIBJIN_NET_H
-#define __LIBJIN_NET_H
-#include "../configuration.h"
-#if LIBJIN_MODULES_NET
-
-#include "../Common/Subsystem.hpp"
-#include "Socket.h"
-
-namespace jin
-{
- namespace net
- {
-
- class Net : public Subsystem<Net>
- {
- public:
-
- protected:
- singleton(Net);
- Net() {};
- ~Net() {};
- bool initSystem(const SettingBase* setting) override;
- void quitSystem() override;
-
- };
-
- } // namespace net
-} // namespace jin
-
-#endif // LIBJIN_MODULES_NET
-#endif // __LIBJIN_NET_H