[FIX] Still figuring out things for signet

[ADD] Files for signet

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@274 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 6 insertions, 36 deletions

diff --git a/signet/Server.cpp b/signet/Server.cpp
index 7c7b44d5..a5d9aca4 100644
--- a/signet/Server.cpp
+++ b/signet/Server.cpp
@@ -24,42 +24,13 @@
 
 // KDE includes
 #include <KConfig>
+#include <KConfigGroup>
 #include <KGlobal>
 
-// Qt includes
-#include <QtNetwork/QHostAddress>
-#include <QtNetwork/QTcpSocket>
-
 Signet::Server::Server(QObject* parent) :
         QObject(parent)
 {
     m_handler->connectToMaster(KGlobal::config()->group("Master Server"));
-//     QHostAddress masterAddress;
-//     int port;
-//     QString key;
-//     int timeout;
-//     if (config->hasGroup("Master Server"))
-//     {
-//         const KConfigGroup& group = config->group("Master Server");
-//         QString address = group.readEntry("Address", "");
-//         if (!masterAddress.setAddress(address))
-//             qFatal(QString("Invalid address for the master server: %1").arg(address));
-//         port = group.readEntry("Port", -1);
-//         if (port < 0)
-//             qFatal(QString("Invalid port for the master server: %1").arg(port));
-//         key = group.readEntry("Key", "");
-//         timeout = group.readEntry("Timeout", 30000);
-//     }
-//     else
-//     {
-//         // TODO: Configuration not complete
-//     }
-//     // TODO: Proxy support?
-//     m_masterServer->connectToHost(masterAddress, port);
-//     if (!m_masterServer->waitForConnect(timeout))
-//     {
-//         // TODO: Connect failed
-//     }
 }
 
 void Signet::Server::createRoom(const QString& room)
@@ -78,13 +49,12 @@ void Signet::Server::closeRoom(const QString& room)
     }
 }
 
-bool Signet::Server::joinRoom(Client* client, const QString& roomName)
+void Signet::Server::joinRoom(Client* client, const QString& roomName)
 {
     if (!m_rooms.contains(roomName))
         createRoom(roomName);
-    m_rooms[room]->addClient(client);
-}
-
-void Signet::Server::receiveData(const QByteArray& data)
-{
+    if (!m_rooms[roomName]->addClient(client))
+    {
+        // TODO: Let the client know about the error.
+    }
 }