jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix release tests (#4063)

Browse source
This commit is contained in:
olegshtch 2020-08-13 17:18:01 +03:00 • committed by GitHub
parent 80f613a77a
commit 44297dcd1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 1114 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

50
cockatrice/src/userconnection_information.cpp
View file

@ -23,23 +23,18 @@ QMap<QString, std::pair<QString, UserConnection_Information>> UserConnection_Inf
{
QMap<QString, std::pair<QString, UserConnection_Information>> serverList;
int size = settingsCache->servers().getValue("totalServers", "server", "server_details").toInt() + 1;
ServersSettings &servers = SettingsCache::instance().servers();
int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1;
for (int i = 0; i < size; i++) {
QString saveName =
settingsCache->servers().getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
QString serverName =
settingsCache->servers().getValue(QString("server%1").arg(i), "server", "server_details").toString();
QString portNum =
settingsCache->servers().getValue(QString("port%1").arg(i), "server", "server_details").toString();
QString userName =
settingsCache->servers().getValue(QString("username%1").arg(i), "server", "server_details").toString();
QString pass =
settingsCache->servers().getValue(QString("password%1").arg(i), "server", "server_details").toString();
bool savePass =
settingsCache->servers().getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
QString site =
settingsCache->servers().getValue(QString("site%1").arg(i), "server", "server_details").toString();
QString saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString();
QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString();
QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString();
QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString();
bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
QString site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString();
UserConnection_Information userInfo(saveName, serverName, portNum, userName, pass, savePass, site);
serverList.insert(saveName, std::make_pair(serverName, userInfo));
@ -52,26 +47,21 @@ QStringList UserConnection_Information::getServerInfo(const QString &find)
{
QStringList server;
int size = settingsCache->servers().getValue("totalServers", "server", "server_details").toInt() + 1;
ServersSettings &servers = SettingsCache::instance().servers();
int size = servers.getValue("totalServers", "server", "server_details").toInt() + 1;
for (int i = 0; i < size; i++) {
QString saveName =
settingsCache->servers().getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
QString saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
if (find != saveName)
continue;
QString serverName =
settingsCache->servers().getValue(QString("server%1").arg(i), "server", "server_details").toString();
QString portNum =
settingsCache->servers().getValue(QString("port%1").arg(i), "server", "server_details").toString();
QString userName =
settingsCache->servers().getValue(QString("username%1").arg(i), "server", "server_details").toString();
QString pass =
settingsCache->servers().getValue(QString("password%1").arg(i), "server", "server_details").toString();
bool savePass =
settingsCache->servers().getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
QString site =
settingsCache->servers().getValue(QString("site%1").arg(i), "server", "server_details").toString();
QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString();
QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString();
QString userName = servers.getValue(QString("username%1").arg(i), "server", "server_details").toString();
QString pass = servers.getValue(QString("password%1").arg(i), "server", "server_details").toString();
bool savePass = servers.getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
QString site = servers.getValue(QString("site%1").arg(i), "server", "server_details").toString();
server.append(saveName);
server.append(serverName);