This commit is contained in:
Max-Wilhelm Bruker
2009-11-03 17:26:03 +01:00
parent 29bf3d3774
commit 8b3723b871
16 changed files with 274 additions and 77 deletions

View File

@@ -46,13 +46,13 @@ Servatrice::Servatrice(QObject *parent)
settings->value("name").toString(),
settings->value("description").toString(),
settings->value("autojoin").toBool(),
settings->value("joinmessage").toStringList()
settings->value("joinmessage").toString()
);
addChatChannel(newChannel);
}
settings->endArray();
loginMessage = settings->value("messages/login").toStringList();
loginMessage = settings->value("messages/login").toString();
}
Servatrice::~Servatrice()
@@ -121,4 +121,4 @@ AuthenticationResult Servatrice::checkUserPassword(const QString &user, const QS
return UnknownUser;
}
const QString Servatrice::versionString = "Servatrice 0.20091030";
const QString Servatrice::versionString = "Servatrice 0.20091103";

View File

@@ -37,10 +37,10 @@ public:
~Servatrice();
bool openDatabase();
AuthenticationResult checkUserPassword(const QString &user, const QString &password);
QStringList getLoginMessage() const { return loginMessage; }
QString getLoginMessage() const { return loginMessage; }
private:
QTcpServer *tcpServer;
QStringList loginMessage;
QString loginMessage;
QSettings *settings;
};

View File

@@ -42,7 +42,7 @@ ServerSocketInterface::ServerSocketInterface(Server *_server, QTcpSocket *_socke
xmlWriter->writeStartElement("cockatrice_server_stream");
xmlWriter->writeAttribute("version", QString::number(ProtocolItem::protocolVersion));
sendProtocolItem(new Event_Welcome(Servatrice::versionString));
sendProtocolItem(new Event_ChatServerMessage(QString(), Servatrice::versionString));
}
ServerSocketInterface::~ServerSocketInterface()
@@ -104,8 +104,9 @@ void ServerSocketInterface::catchSocketError(QAbstractSocket::SocketError socket
deleteLater();
}
void ServerSocketInterface::sendProtocolItem(ProtocolItem *item)
void ServerSocketInterface::sendProtocolItem(ProtocolItem *item, bool deleteItem)
{
item->write(xmlWriter);
delete item;
if (deleteItem)
delete item;
}

View File

@@ -43,7 +43,7 @@ public:
ServerSocketInterface(Server *_server, QTcpSocket *_socket, QObject *parent = 0);
~ServerSocketInterface();
void sendProtocolItem(ProtocolItem *item);
void sendProtocolItem(ProtocolItem *item, bool deleteItem = true);
};
#endif