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

miscellaneous refactors (#4521)

Browse source
This commit is contained in:
ebbit1q 2022-01-16 23:58:53 +01:00 • committed by GitHub
parent 994704d353
commit ae9b8b8f34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 32 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
servatrice/src/main.cpp
View file

@ -171,8 +171,6 @@ int main(int argc, char *argv[])
std::cerr << "Servatrice " << VERSION_STRING << " starting." << std::endl;
std::cerr << "-------------------------" << std::endl;
PasswordHasher::initialize();
if (testRandom) {
testRNG();
}

3
servatrice/src/servatrice.cpp
View file

@ -206,8 +206,9 @@ Servatrice::~Servatrice()
// clients live in other threads, we need to lock them
clientsLock.lockForRead();
for (auto client : clients)
for (auto *client : clients) {
QMetaObject::invokeMethod(client, "prepareDestroy", Qt::QueuedConnection);
}
clientsLock.unlock();
// client destruction is asynchronous, wait for all clients to be gone

6
servatrice/src/serversocketinterface.cpp
View file

@ -893,8 +893,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdWarnUser(const Command_
delete se;
}
QListIterator<QString> modIterator(moderatorList);
foreach (QString moderator, moderatorList) {
for (QString &moderator : moderatorList) {
QString notificationMessage = sendingModerator + " has sent a warning with the following information";
notificationMessage.append("\n Username: " + userName);
notificationMessage.append("\n Reason: " + warningReason);
@ -987,8 +986,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com
}
}
QListIterator<QString> modIterator(moderatorList);
foreach (QString moderator, moderatorList) {
for (QString &moderator : moderatorList) {
QString notificationMessage =
QString::fromStdString(userInfo->name()).simplified() + " has placed a ban with the following information";
if (!userName.isEmpty())