jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 17:14:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Server List from JSON (#3165)

Browse source
This commit is contained in:
Zach H 2018-04-09 22:38:21 -04:00 • committed by GitHub
parent 0c10b66a2d
commit 61e509585f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 376 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cockatrice/src/userconnection_information.cpp
View file

@ -1,10 +1,9 @@
#include "userconnection_information.h"
#include "settingscache.h"
#include <QDebug>
#include <utility>
UserConnection_Information::UserConnection_Information()
{
}
UserConnection_Information::UserConnection_Information() = default;
UserConnection_Information::UserConnection_Information(QString _saveName,
QString _serverName,
@ -12,14 +11,14 @@ UserConnection_Information::UserConnection_Information(QString _saveName,
QString _userName,
QString _pass,
bool _savePass)
: saveName(_saveName), server(_serverName), port(_portNum), username(_userName), password(_pass),
savePassword(_savePass)
: saveName(std::move(_saveName)), server(std::move(_serverName)), port(std::move(_portNum)),
username(std::move(_userName)), password(std::move(_pass)), savePassword(_savePass)
{
}
QMap<QString, UserConnection_Information> UserConnection_Information::getServerInfo()
QMap<QString, std::pair<QString, UserConnection_Information>> UserConnection_Information::getServerInfo()
{
QMap<QString, UserConnection_Information> serverList;
QMap<QString, std::pair<QString, UserConnection_Information>> serverList;
int size = settingsCache->servers().getValue("totalServers", "server", "server_details").toInt() + 1;
@ -38,7 +37,7 @@ QMap<QString, UserConnection_Information> UserConnection_Information::getServerI
settingsCache->servers().getValue(QString("savePassword%1").arg(i), "server", "server_details").toBool();
UserConnection_Information userInfo(saveName, serverName, portNum, userName, pass, savePass);
serverList.insert(saveName, userInfo);
serverList.insert(saveName, std::make_pair(serverName, userInfo));
}
return serverList;
@ -76,7 +75,7 @@ QStringList UserConnection_Information::getServerInfo(const QString &find)
break;
}
if (!server.size())
if (server.empty())
qDebug() << "There was a problem!";
return server;