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

Merge branch 'master' into tooomm-qt5

Browse source
This commit is contained in:
tooomm 2026-05-30 14:49:55 +02:00 • committed by GitHub
commit 9d4cf57c70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
593 changed files with 12518 additions and 6581 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libcockatrice_settings/libcockatrice/settings/card_database_settings.h
View file

@ -2,8 +2,8 @@
* @file card_database_settings.h
* @ingroup CardDatabase
* @ingroup CardSettings
* @brief TODO: Document this.
*/
//! \todo Document this file.
#ifndef CARDDATABASESETTINGS_H
#define CARDDATABASESETTINGS_H

2
libcockatrice_settings/libcockatrice/settings/card_override_settings.h
View file

@ -1,8 +1,8 @@
/**
* @file card_override_settings.h
* @ingroup CardSettings
* @brief TODO: Document this.
*/
//! \todo Document this file.
#ifndef COCKATRICE_CARD_OVERRIDE_SETTINGS_H
#define COCKATRICE_CARD_OVERRIDE_SETTINGS_H

2
libcockatrice_settings/libcockatrice/settings/debug_settings.h
View file

@ -1,8 +1,8 @@
/**
* @file debug_settings.h
* @ingroup CoreSettings
* @brief TODO: Document this.
*/
//! \todo Document this file.
#ifndef DEBUG_SETTINGS_H
#define DEBUG_SETTINGS_H

2
libcockatrice_settings/libcockatrice/settings/download_settings.h
View file

@ -1,8 +1,8 @@
/**
* @file download_settings.h
* @ingroup NetworkSettings
* @brief TODO: Document this.
*/
//! \todo Document this file.
#ifndef COCKATRICE_DOWNLOADSETTINGS_H
#define COCKATRICE_DOWNLOADSETTINGS_H

2
libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
View file

@ -2,8 +2,8 @@
* @file game_filters_settings.h
* @ingroup Lobby
* @ingroup GameSettings
* @brief TODO: Document this.
*/
//! \todo Document this file.
#ifndef GAMEFILTERSSETTINGS_H
#define GAMEFILTERSSETTINGS_H

2
libcockatrice_settings/libcockatrice/settings/layouts_settings.h
View file

@ -1,8 +1,8 @@
/**
* @file layouts_settings.h
* @ingroup CoreSettings
* @brief TODO: Document this.
*/
//! \todo Document this file.
#ifndef LAYOUTSSETTINGS_H
#define LAYOUTSSETTINGS_H

2
libcockatrice_settings/libcockatrice/settings/message_settings.h
View file

@ -1,8 +1,8 @@
/**
* @file message_settings.h
* @ingroup NetworkSettings
* @brief TODO: Document this.
*/
//! \todo Document this file.
#ifndef MESSAGESETTINGS_H
#define MESSAGESETTINGS_H

2
libcockatrice_settings/libcockatrice/settings/recents_settings.h
View file

@ -1,8 +1,8 @@
/**
* @file recents_settings.h
* @ingroup DeckSettings
* @brief TODO: Document this.
*/
//! \todo Document this file.
#ifndef RECENTS_SETTINGS_H
#define RECENTS_SETTINGS_H

12
libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
View file

@ -58,9 +58,11 @@ int ServersSettings::getPrevioushostindex(const QString &saveName) const
{
int size = getValue("totalServers", "server", "server_details").toInt();
for (int i = 0; i <= size; ++i)
if (saveName == getValue(QString("saveName%1").arg(i), "server", "server_details").toString())
for (int i = 0; i <= size; ++i) {
if (saveName == getValue(QString("saveName%1").arg(i), "server", "server_details").toString()) {
return i;
}
}
return -1;
}
@ -92,8 +94,9 @@ QString ServersSettings::getPassword()
{
int index = getPrevioushostindex(getPrevioushostName());
if (getSavePassword())
if (getSavePassword()) {
return getValue(QString("password%1").arg(index), "server", "server_details").toString();
}
return QString();
}
@ -168,8 +171,9 @@ void ServersSettings::addNewServer(const QString &saveName,
bool savePassword,
const QString &site)
{
if (updateExistingServer(saveName, serv, port, username, password, savePassword, site))
if (updateExistingServer(saveName, serv, port, username, password, savePassword, site)) {
return;
}
int index = getValue("totalServers", "server", "server_details").toInt() + 1;

2
libcockatrice_settings/libcockatrice/settings/servers_settings.h
View file

@ -1,8 +1,8 @@
/**
* @file servers_settings.h
* @ingroup NetworkSettings
* @brief TODO: Document this.
*/
//! \todo Document this file.
#ifndef SERVERSSETTINGS_H
#define SERVERSSETTINGS_H

2
libcockatrice_settings/libcockatrice/settings/settings_manager.h
View file

@ -1,8 +1,8 @@
/**
* @file settings_manager.h
* @ingroup Settings
* @brief TODO: Document this.
*/
//! \todo Document this file.
#ifndef SETTINGSMANAGER_H
#define SETTINGSMANAGER_H