From 03e65c78d1bc08bdaee86cf09a4dd8735b6a9fdd Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Sun, 12 Oct 2008 16:51:32 +0000
Subject: [FIX] Fleshing out Signet more [DEL] Unused top-level directories

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@275 6ecfd1a5-f3ed-3746-8530-beee90d26b22
---
 signet/Server.cpp | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

(limited to 'signet/Server.cpp')

diff --git a/signet/Server.cpp b/signet/Server.cpp
index a5d9aca4..332c305f 100644
--- a/signet/Server.cpp
+++ b/signet/Server.cpp
@@ -20,7 +20,6 @@
 
 // Signet includes
 #include "Room.h"
-#include "ServerConnectionHandler.h"
 
 // KDE includes
 #include <KConfig>
@@ -28,9 +27,9 @@
 #include <KGlobal>
 
 Signet::Server::Server(QObject* parent) :
-        QObject(parent)
+        ConnectionHandler(parent)
 {
-    m_handler->connectToMaster(KGlobal::config()->group("Master Server"));
+    connectToMaster(KGlobal::config()->group("Master Server"));
 }
 
 void Signet::Server::createRoom(const QString& room)
@@ -58,3 +57,35 @@ void Signet::Server::joinRoom(Client* client, const QString& roomName)
         // TODO: Let the client know about the error.
     }
 }
+
+void Signet::Server::connectToMaster(const KConfigGroup& group)
+{
+    // TODO: Get the information from the configuration
+    // TODO: Connect to the master
+//     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
+//     }
+}
-- 
cgit