[FIX] Renamed from "master server" to "metaserver"

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

3 files changed, 33 insertions, 33 deletions

diff --git a/signet/Client.h b/signet/Client.h
index d729c0f6..4065cea8 100644
--- a/signet/Client.h
+++ b/signet/Client.h
@@ -59,12 +59,12 @@ class SIGNET_EXPORT Client : public QObject
         ~Client();
     protected slots:
     private:
-        QTcpSocket* m_masterSocket;
+        QTcpSocket* m_metaserver;
         QMap<QString, QTcpSocket*> m_serverSockets;
         QMap<QString, QTcpSocket*> m_rooms;
         QMap<QString, QTcpSocket*> m_tables;
         
-        ConnectionInfo m_master;
+        ConnectionInfo m_metaserverInfo;
     private slots:
         void disconnectFromServer();
         void disconnectFromAllRooms();
diff --git a/signet/Server.cpp b/signet/Server.cpp
index df61f47f..77992cb7 100644
--- a/signet/Server.cpp
+++ b/signet/Server.cpp
@@ -38,8 +38,8 @@ Signet::Server::Server(QObject* parent) :
         ClientHandler(parent)
 {
     loadConfiguration();
-    if (m_masterInfo.isValid())
-        connectToMaster();
+    if (m_metaserverInfo.isValid())
+        connectToMetaserver();
 }
 
 void Signet::Server::packetReceived(QTcpSocket* client, Protocol::Packet* packet)
@@ -72,18 +72,18 @@ void Signet::Server::closeRoom(const QString& room)
     }
 }
 
-void Signet::Server::masterFound()
+void Signet::Server::metaserverFound()
 {
-    qDebug("Master server found");
+    qDebug("Metaserver found");
 }
 
-void Signet::Server::masterConnected()
+void Signet::Server::metaserverConnected()
 {
-    qDebug("Master server connected");
-    switch (m_masterInfo.authenticate(QString("server-").arg(m_name).toUtf8()))
+    qDebug("Metaserver connected");
+    switch (m_metaserverInfo.authenticate(QString("server-").arg(m_name).toUtf8()))
     {
         case Protocol::ChallengeMediator::NoError:
-            qDebug("Authenticated with master server");
+            qDebug("Authenticated with metaserver");
             break;
         case Protocol::ChallengeMediator::UnknownUser:
             qWarning("Server is not registered");
@@ -92,7 +92,7 @@ void Signet::Server::masterConnected()
             qWarning("Could not authenticate server");
             break;
         case Protocol::ChallengeMediator::ServerFailed:
-            qWarning("Master Server failed authentication");
+            qWarning("Metaserver failed authentication");
             break;
         case Protocol::ChallengeMediator::SocketError:
             qWarning("Socket error");
@@ -106,33 +106,33 @@ void Signet::Server::masterConnected()
     }
 }
 
-void Signet::Server::masterDisconnected()
+void Signet::Server::metaserverDisconnected()
 {
-    QTimer::singleShot(60000, this, SLOT(connectToMaster()));
-    qWarning("Master server disconnected; will retry in 60 seconds");
+    QTimer::singleShot(60000, this, SLOT(connectToMetaserver()));
+    qWarning("Metaserver disconnected; will retry in 60 seconds");
 }
 
-void Signet::Server::masterError()
+void Signet::Server::metaserverError()
 {
-    qWarning("Master server socket error: %s", m_master->errorString().toUtf8().constData());
+    qWarning("Metaserver socket error: %s", m_metaserver->errorString().toUtf8().constData());
 }
 
 void Signet::Server::loadConfiguration()
 {
-    if (KGlobal::config()->hasGroup("Master Server"))
-        m_masterInfo.load(KGlobal::config()->group("Master Server"));
+    if (KGlobal::config()->hasGroup("Metaserver"))
+        m_metaserverInfo.load(KGlobal::config()->group("Metaserver"));
     m_name = KGlobal::config()->group("Server Info").readEntry("Name", "");
 }
 
-void Signet::Server::connectToMaster()
+void Signet::Server::connectToMetaserver()
 {
-    if (!m_master)
+    if (!m_metaserver)
     {
-        m_master = new QTcpSocket(this);
-        connect(m_master, SIGNAL(hostFound()), this, SLOT(masterFound()));
-        connect(m_master, SIGNAL(connected()), this, SLOT(masterConnected()));
-        connect(m_master, SIGNAL(disconnected()), this, SLOT(masterDisconnected()));
-        connect(m_master, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(masterError()));
+        m_metaserver = new QTcpSocket(this);
+        connect(m_metaserver, SIGNAL(hostFound()), this, SLOT(metaserverFound()));
+        connect(m_metaserver, SIGNAL(connected()), this, SLOT(metaserverConnected()));
+        connect(m_metaserver, SIGNAL(disconnected()), this, SLOT(metaserverDisconnected()));
+        connect(m_metaserver, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(metaserverError()));
     }
-    m_masterInfo.connectToHost(m_master);
+    m_metaserverInfo.connectToHost(m_metaserver);
 }
diff --git a/signet/Server.h b/signet/Server.h
index 0f6314ca..0a52e4b3 100644
--- a/signet/Server.h
+++ b/signet/Server.h
@@ -51,18 +51,18 @@ class SIGNET_EXPORT Server : public ClientHandler
         void createRoom(const QString& room);
         void closeRoom(const QString& room);
     protected slots:
-        void masterFound();
-        void masterConnected();
-        void masterDisconnected();
-        void masterError();
+        void metaserverFound();
+        void metaserverConnected();
+        void metaserverDisconnected();
+        void metaserverError();
         
         void loadConfiguration();
         
-        void connectToMaster();
+        void connectToMetaserver();
     private:
-        QTcpSocket* m_master;
+        QTcpSocket* m_metaserver;
         
-        ConnectionInfo m_masterInfo;
+        ConnectionInfo m_metaserverInfo;
         QString m_name;
         
         QMap<QString, Room*> m_rooms;