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

Clang-format (#3028)

Browse source 
* 1/3 Add .clang-format file and travis compilation check

* 2/3 Run clang-format

* 3/3 Fix compilation problems due to include reordering

* 3bis/3 AfterControlStatement: false
This commit is contained in:
ctrlaltca 2018-01-27 10:41:32 +01:00 • committed by GitHub
parent 8dbdd24c8e
commit b29bd9e070
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
272 changed files with 13378 additions and 9535 deletions
Download patch file Download diff file Expand all files Collapse all files

63
cockatrice/src/userconnection_information.cpp
View file

@ -6,29 +6,39 @@ UserConnection_Information::UserConnection_Information()
{
}
UserConnection_Information::UserConnection_Information(QString _saveName, QString _serverName, QString _portNum, QString _userName, QString _pass, bool _savePass)
: saveName(_saveName), server(_serverName), port(_portNum), username(_userName), password(_pass), savePassword(_savePass)
UserConnection_Information::UserConnection_Information(QString _saveName,
QString _serverName,
QString _portNum,
QString _userName,
QString _pass,
bool _savePass)
: saveName(_saveName), server(_serverName), port(_portNum), username(_userName), password(_pass),
savePassword(_savePass)
{
}
QMap<QString, UserConnection_Information> UserConnection_Information::getServerInfo()
{
QMap<QString, UserConnection_Information> serverList;
int size = settingsCache->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();
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();
UserConnection_Information userInfo(saveName, serverName, portNum, userName, pass, savePass);
serverList.insert(saveName, userInfo);
serverList.insert(saveName, userInfo);
}
return serverList;
@ -37,21 +47,26 @@ QMap<QString, UserConnection_Information> UserConnection_Information::getServerI
QStringList UserConnection_Information::getServerInfo(const QString &find)
{
QStringList server;
int size = settingsCache->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();
for (int i = 0; i < size; i++) {
QString saveName =
settingsCache->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 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();
server.append(saveName);
server.append(serverName);
server.append(portNum);
@ -60,7 +75,7 @@ QStringList UserConnection_Information::getServerInfo(const QString &find)
server.append(savePass ? "1" : "0");
break;
}
if (!server.size())
qDebug() << "There was a problem!";