diff options
| author | in1tiate <32779090+in1tiate@users.noreply.github.com> | 2025-01-14 02:31:36 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-14 02:31:36 -0600 |
| commit | 764b2f8944ef4d40a3829c1e55112b0cb4ff32fe (patch) | |
| tree | 76db40f16c2e290ca8df7aff27597b6509f28e4f /src/packet_distribution.cpp | |
| parent | ed8bc457351005b8590de5a70f8004edcf1635c1 (diff) | |
| parent | a9e2ea19508ceb120fbe8a570d35e651c15f819a (diff) | |
Merge pull request #1067 from AttorneyOnline/cleanup
Very cool and professional cleanup of clazy warnings
Diffstat (limited to 'src/packet_distribution.cpp')
| -rw-r--r-- | src/packet_distribution.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index babdae2d..40266757 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -66,7 +66,7 @@ void AOApplication::server_packet_received(AOPacket packet) client_id = content.at(0).toInt(); m_serverdata.set_server_software(content.at(1)); - net_manager->server_connected(true); + emit net_manager->server_connected(true); QStringList f_contents = {"AO2", get_version_string()}; send_server_packet(AOPacket("ID", f_contents)); @@ -160,10 +160,12 @@ void AOApplication::server_packet_received(AOPacket packet) // Remove any characters not accepted in folder names for the server_name // here + QString server_name_stripped = server_name; + static QRegularExpression illegal_filename_chars("[\\\\/:*?\"<>|\']"); if (Options::getInstance().logToDemoFileEnabled() && server_name != "Demo playback") { - this->log_filename = QDateTime::currentDateTime().toUTC().toString("'logs/" + server_name_stripped.remove(QRegularExpression("[\\\\/:*?\"<>|\']")) + "/'yyyy-MM-dd hh-mm-ss t'.log'"); + this->log_filename = QDateTime::currentDateTime().toUTC().toString("'logs/" + server_name_stripped.remove(illegal_filename_chars) + "/'yyyy-MM-dd hh-mm-ss t'.log'"); this->write_to_file("Joined server " + server_name_stripped + " hosted on address " + server_address + " on " + QDateTime::currentDateTime().toUTC().toString(), log_filename, true); } else @@ -426,7 +428,7 @@ void AOApplication::server_packet_received(AOPacket packet) { QVector<EvidenceItem> f_evi_list; - for (QString f_string : packet.content()) + for (const QString &f_string : packet.content()) { QStringList sub_contents = f_string.split("&"); if (sub_contents.size() < 3) @@ -714,7 +716,6 @@ void AOApplication::server_packet_received(AOPacket packet) void AOApplication::send_server_packet(AOPacket p_packet) { - QString f_packet = p_packet.toString(); #ifdef DEBUG_NETWORK qDebug() << "S:" << p_packet.to_string(); #endif |