[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

1 files changed, 7 insertions, 4 deletions

diff --git a/signet/Server.h b/signet/Server.h
index 8cf22e07..58328188 100644
--- a/signet/Server.h
+++ b/signet/Server.h
@@ -19,25 +19,27 @@
 #define SIGNET_SERVER
 
 // Signet includes
+#include "ConnectionHandler.h"
 #include "Global.h"
 
 // Qt includes
 #include <QtCore/QMap>
 #include <QtCore/QObject>
 
+// Forward declarations
+class KConfigGroup;
+
 namespace Signet
 {
 class Client;
 class Room;
-class ServerConnectionHandler;
 
-class SIGNET_EXPORT Server : public QObject
+class SIGNET_EXPORT Server : public ConnectionHandler
 {
     Q_OBJECT
     
     public:
         Server(QObject* parent);
-    public slots:
     signals:
         void globalMessage(const QString& message);
     protected:
@@ -47,9 +49,10 @@ class SIGNET_EXPORT Server : public QObject
         bool verifyUser(Client* client);
     protected slots:
         void joinRoom(Client* client, const QString& roomName);
+        
+        void connectToMaster(const KConfigGroup& group);
     private:
         QMap<QString, Room*> m_rooms;
-        ServerConnectionHandler* m_handler;
 };
 }