Move various implementations from .h to .cpp files

DDuarte · Jul 8, 2012 · e4ce395 · e4ce395
1 parent 743da90
commit e4ce395
Show file tree

Hide file tree

Showing 12 changed files with 251 additions and 209 deletions.
diff --git a/src/LeClient/LeClient.vcxproj b/src/LeClient/LeClient.vcxproj
@@ -13,7 +13,9 @@
   <ItemGroup>
     <ClCompile Include="Application.cpp" />
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="NetworkTask.cpp" />
     <ClCompile Include="OpenGLTest.cpp" />
+    <ClCompile Include="TcpClient.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Application.h" />

diff --git a/src/LeClient/LeClient.vcxproj.filters b/src/LeClient/LeClient.vcxproj.filters
@@ -24,6 +24,12 @@
     <ClCompile Include="OpenGLTest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="NetworkTask.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TcpClient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Application.h">

diff --git a/src/LeClient/NetworkTask.cpp b/src/LeClient/NetworkTask.cpp
@@ -0,0 +1,29 @@
+#include "NetworkTask.h"
+#include "SettingsManager.h"
+
+NetworkTask::NetworkTask()
+{
+    _hive = new Hive();
+}
+
+bool NetworkTask::Start()
+{
+    _connection = new TcpConnection(_hive);
+    _connection->Connect(GetConfig("connection.host", std::string), GetConfig("connection.port", int));
+    return true;
+}
+
+void NetworkTask::Update()
+{
+    _hive->Poll();
+    Sleep(1);
+}
+
+void NetworkTask::Stop()
+{
+    _hive->Stop();
+    _connection->Disconnect();
+
+    delete _hive;
+    delete _connection;
+}
diff --git a/src/LeClient/NetworkTask.h b/src/LeClient/NetworkTask.h
@@ -3,7 +3,6 @@
 
 #include "ITask.h"
 #include "TcpClient.h"
-#include "SettingsManager.h"
 
 class NetworkTask : public ITask
 {
@@ -12,32 +11,10 @@ class NetworkTask : public ITask
     TcpConnection* _connection;
 
 public:
-    NetworkTask()
-    {
-        _hive = new Hive();
-    }
-
-    bool Start() 
-    {
-        _connection = new TcpConnection(_hive);
-        _connection->Connect(GetConfig("connection.host", std::string), GetConfig("connection.port", int));
-        return true;
-    }
-
-    void Update() 
-    {
-        _hive->Poll();
-        Sleep(1);
-    }
-
-    void Stop() 
-    {
-        _hive->Stop();
-        _connection->Disconnect();
-
-        delete _hive;
-        delete _connection;
-    }
+    NetworkTask();
+    bool Start();
+    void Update();
+    void Stop();
 };
 
 #endif // NETWORKTASK_H
diff --git a/src/LeClient/TcpClient.cpp b/src/LeClient/TcpClient.cpp
@@ -0,0 +1,65 @@
+#include "TcpClient.h"
+
+
+void TcpConnection::OnAccept(const std::string& host, uint16 port)
+{
+    std::cout << "[" << __FUNCTION__ << "] " << host << ":" << port << std::endl;
+
+    // Start the next receive
+    Recv();
+}
+
+void TcpConnection::OnConnect(const std::string& host, uint16 port)
+{
+    std::cout << "[" << __FUNCTION__ << "] " << host << ":" << port << std::endl;
+
+    // Start the next receive
+    Recv();
+
+    std::string str = "TEST";
+
+    std::vector<uint8> request;
+    std::copy(str.begin(), str.end(), std::back_inserter(request));
+    Send(request);
+}
+
+void TcpConnection::OnSend(const std::vector<uint8>& buffer)
+{
+    std::cout << "[" << __FUNCTION__ << "] " << buffer.size() << " bytes" << std::endl;
+    for(size_t x = 0; x < buffer.size(); ++x)
+    {
+        std::cout << std::hex << std::setfill('0') << 
+            std::setw(2) << (int)buffer[x] << " ";
+        if((x + 1) % 16 == 0)
+            std::cout << std::endl;
+    }
+    std::cout << std::endl;
+}
+
+void TcpConnection::OnRecv(std::vector<uint8>& buffer)
+{
+    std::cout << "[" << __FUNCTION__ << "] " << buffer.size() << " bytes" << std::endl;
+    for(size_t x = 0; x < buffer.size(); ++x)
+    {
+        std::cout << std::hex << std::setfill('0') << 
+            std::setw(2) << (int)buffer[x] << " ";
+        if((x + 1) % 16 == 0)
+        {
+            std::cout << std::endl;
+        }
+    }
+    std::cout << std::endl;
+
+    // Start the next receive
+    Recv();
+}
+
+void TcpConnection::OnTimer(const boost::posix_time::time_duration& delta)
+{
+    std::cout << "[" << __FUNCTION__ << "] " << delta << std::endl;
+}
+
+void TcpConnection::OnError(const boost::system::error_code& error)
+{
+    std::cout << "[" << __FUNCTION__ << "] " << error << std::endl;
+}
diff --git a/src/LeClient/TcpClient.h b/src/LeClient/TcpClient.h
@@ -6,74 +6,15 @@
 class TcpConnection : public Connection
 {
 private:
-
-private:
-    void OnAccept(const std::string& host, uint16 port)
-    {
-        std::cout << "[" << __FUNCTION__ << "] " << host << ":" << port << std::endl;
-
-        // Start the next receive
-        Recv();
-    }
-
-    void OnConnect(const std::string& host, uint16 port)
-    {
-        std::cout << "[" << __FUNCTION__ << "] " << host << ":" << port << std::endl;
-
-        // Start the next receive
-        Recv();
-
-        std::string str = "TEST";
-
-        std::vector<uint8> request;
-        std::copy(str.begin(), str.end(), std::back_inserter(request));
-        Send(request);
-    }
-
-    void OnSend(const std::vector<uint8>& buffer)
-    {
-        std::cout << "[" << __FUNCTION__ << "] " << buffer.size() << " bytes" << std::endl;
-        for(size_t x = 0; x < buffer.size(); ++x)
-        {
-            std::cout << std::hex << std::setfill('0') << 
-                std::setw(2) << (int)buffer[x] << " ";
-            if((x + 1) % 16 == 0)
-                std::cout << std::endl;
-        }
-        std::cout << std::endl;
-    }
-
-    void OnRecv(std::vector<uint8>& buffer)
-    {
-        std::cout << "[" << __FUNCTION__ << "] " << buffer.size() << " bytes" << std::endl;
-        for(size_t x = 0; x < buffer.size(); ++x)
-        {
-            std::cout << std::hex << std::setfill('0') << 
-                std::setw(2) << (int)buffer[x] << " ";
-            if((x + 1) % 16 == 0)
-            {
-                std::cout << std::endl;
-            }
-        }
-        std::cout << std::endl;
-
-        // Start the next receive
-        Recv();
-    }
-
-    void OnTimer(const boost::posix_time::time_duration& delta)
-    {
-        std::cout << "[" << __FUNCTION__ << "] " << delta << std::endl;
-    }
-
-    void OnError(const boost::system::error_code& error)
-    {
-        std::cout << "[" << __FUNCTION__ << "] " << error << std::endl;
-    }
+    void OnAccept(const std::string& host, uint16 port);
+    void OnConnect(const std::string& host, uint16 port);
+    void OnSend(const std::vector<uint8>& buffer);
+    void OnRecv(std::vector<uint8>& buffer);
+    void OnTimer(const boost::posix_time::time_duration& delta);
+    void OnError(const boost::system::error_code& error);
 
 public:
     TcpConnection(Hive* hive) : Connection(hive) {}
-
     ~TcpConnection() {}
 };
 

diff --git a/src/LeServer/LeServer.vcxproj b/src/LeServer/LeServer.vcxproj
@@ -79,7 +79,9 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="NetworkTask.cpp" />
     <ClCompile Include="ServerApplication.cpp" />
+    <ClCompile Include="TcpServer.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="NetworkTask.h" />

diff --git a/src/LeServer/LeServer.vcxproj.filters b/src/LeServer/LeServer.vcxproj.filters
@@ -21,6 +21,12 @@
     <ClCompile Include="ServerApplication.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="TcpServer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NetworkTask.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="TcpServer.h">

diff --git a/src/LeServer/NetworkTask.cpp b/src/LeServer/NetworkTask.cpp
@@ -0,0 +1,30 @@
+#include "NetworkTask.h"
+
+NetworkTask::NetworkTask()
+{
+    _hive = new Hive();
+    _acceptor = new TcpAcceptor(_hive);
+}
+
+bool NetworkTask::Start()
+{
+    // accept one connection; next one will be accepted in TcpAcceptor::OnAccept
+    TcpConnection* connection = new TcpConnection(_hive);
+    _acceptor->Accept(connection);
+    return true;
+}
+
+void NetworkTask::Update()
+{
+    _hive->Poll();
+    Sleep(1);
+}
+
+void NetworkTask::Stop()
+{
+    _hive->Stop();
+    _acceptor->Stop();
+
+    delete _acceptor;
+    delete _hive;
+}
diff --git a/src/LeServer/NetworkTask.h b/src/LeServer/NetworkTask.h
@@ -11,34 +11,10 @@ class NetworkTask : public ITask
     TcpAcceptor* _acceptor;
 
 public:
-    NetworkTask()
-    {
-        _hive = new Hive();
-        _acceptor = new TcpAcceptor(_hive);
-    }
-
-    bool Start() 
-    {
-        // accept one connection; next one will be accepted in TcpAcceptor::OnAccept
-        TcpConnection* connection = new TcpConnection(_hive);
-        _acceptor->Accept(connection);
-        return true;
-    }
-
-    void Update() 
-    {
-        _hive->Poll();
-        Sleep(1);
-    }
-
-    void Stop() 
-    {
-        _hive->Stop();
-        _acceptor->Stop();
-
-        delete _acceptor;
-        delete _hive;
-    }
+    NetworkTask();
+    bool Start();
+    void Update();
+    void Stop();
 };
 
 #endif // NETWORKTASK_H