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

Address /W4 compiler warnings for Windows (#4910)

Browse source
This commit is contained in:
Zach H 2023-10-15 20:31:13 -04:00 • committed by GitHub
parent cb90a8356b
commit 186f4289e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 279 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

26
servatrice/src/servatrice.cpp
View file

@ -722,16 +722,16 @@ void Servatrice::shutdownTimeout()
shutdownMinutes--;
}
bool Servatrice::islConnectionExists(int serverId) const
bool Servatrice::islConnectionExists(int _serverId) const
{
// Only call with islLock locked at least for reading
return islInterfaces.contains(serverId);
return islInterfaces.contains(_serverId);
}
void Servatrice::addIslInterface(int serverId, IslInterface *interface)
void Servatrice::addIslInterface(int _serverId, IslInterface *interface)
{
// Only call with islLock locked for writing
islInterfaces.insert(serverId, interface);
islInterfaces.insert(_serverId, interface);
connect(interface, SIGNAL(externalUserJoined(ServerInfo_User)), this, SLOT(externalUserJoined(ServerInfo_User)));
connect(interface, SIGNAL(externalUserLeft(QString)), this, SLOT(externalUserLeft(QString)));
connect(interface, SIGNAL(externalRoomUserJoined(int, ServerInfo_User)), this,
@ -753,24 +753,24 @@ void Servatrice::addIslInterface(int serverId, IslInterface *interface)
SLOT(externalGameEventContainerReceived(GameEventContainer, qint64)));
}
void Servatrice::removeIslInterface(int serverId)
void Servatrice::removeIslInterface(int _serverId)
{
// Only call with islLock locked for writing
// XXX we probably need to delete everything that belonged to it... <-- THIS SHOULD BE FIXED FOR ISL FUNCTIONALITY
// TO WORK COMPLETLY!
islInterfaces.remove(serverId);
islInterfaces.remove(_serverId);
}
void Servatrice::doSendIslMessage(const IslMessage &msg, int serverId)
void Servatrice::doSendIslMessage(const IslMessage &msg, int _serverId)
{
QReadLocker locker(&islLock);
if (serverId == -1) {
if (_serverId == -1) {
QMapIterator<int, IslInterface *> islIterator(islInterfaces);
while (islIterator.hasNext())
islIterator.next().value()->transmitMessage(msg);
} else {
IslInterface *interface = islInterfaces.value(serverId);
IslInterface *interface = islInterfaces.value(_serverId);
if (interface)
interface->transmitMessage(msg);
}
@ -811,7 +811,7 @@ bool Servatrice::getRegOnlyServerEnabled() const
QString Servatrice::getAuthenticationMethodString() const
{
if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
return QString("sql");
return {"sql"};
}
return settingsCache->value("authentication/method").toString();
}
@ -854,7 +854,7 @@ QString Servatrice::getRequiredFeatures() const
QString Servatrice::getDBTypeString() const
{
if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
return QString("mysql");
return {"mysql"};
}
return settingsCache->value("database/type").toString();
}
@ -862,7 +862,7 @@ QString Servatrice::getDBTypeString() const
QString Servatrice::getDBPrefixString() const
{
if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
return QString("cockatrice");
return {"cockatrice"};
}
return settingsCache->value("database/prefix").toString();
}
@ -903,7 +903,7 @@ QString Servatrice::getDBPasswordString() const
QString Servatrice::getRoomsMethodString() const
{
if (QProcessEnvironment::systemEnvironment().contains("DATABASE_URL")) {
return QString("sql");
return {"sql"};
}
return settingsCache->value("rooms/method").toString();
}