Skip to content

Fix or suppress compiler warnings (Qt 5.15 w/MinGW) #818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonedDiscord merged 13 commits into from
Jul 29, 2022
Merged

Fix or suppress compiler warnings (Qt 5.15 w/MinGW) #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
adb5437
Major cleanup of screenshake code
in1tiate Jul 18, 2022
c306a25
Add pre-5.10 support for screenshake math
in1tiate Jul 18, 2022
0e78b2b
more compat, uglier too
in1tiate Jul 18, 2022
ea4e9c9
add surprise tool
in1tiate Jul 18, 2022
cbee9cd
we don't need inline functions
in1tiate Jul 19, 2022
e673c06
only run qsrand on old versions
in1tiate Jul 19, 2022
c1ca74d
Squash compiler warnings
in1tiate Jul 19, 2022
2455a0b
>= not > please
in1tiate Jul 19, 2022
2a78950
Merge branch 'master' into compiler-warnings-begone
stonedDiscord Jul 24, 2022
f278203
only run qsrand on old versions
in1tiate Jul 19, 2022
0b0fedd
Squash compiler warnings
in1tiate Jul 19, 2022
b46f8c9
>= not > please
in1tiate Jul 19, 2022
c0c1a8b
Merge branch 'compiler-warnings-begone' of https://github.com/Attorne…
Salanto Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/courtroom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include <QMessageBox>
#include <QParallelAnimationGroup>
#include <QPropertyAnimation>
#if QT_VERSION > QT_VERSION_CHECK(5, 10, 0)
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
#include <QRandomGenerator> //added in Qt 5.10
#endif
#include <QRegExp>
Expand Down
12 changes: 11 additions & 1 deletion src/courtroom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
~Qt::WindowMaximizeButtonHint);

ao_app->initBASS();

#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) // Needed for pre-5.10 RNG stuff
qsrand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch() / 1000));
#endif

keepalive_timer = new QTimer(this);
keepalive_timer->start(45000);
Expand Down Expand Up @@ -4142,6 +4143,11 @@ void Courtroom::mod_called(QString p_ip)
void Courtroom::case_called(QString msg, bool def, bool pro, bool jud, bool jur,
bool steno)
{
Q_UNUSED(def);
Q_UNUSED(pro);
Q_UNUSED(jud);
Q_UNUSED(jur);
Q_UNUSED(steno);
if (ui_casing->isChecked()) {
ui_server_chatlog->append(msg);
modcall_player->play(ao_app->get_court_sfx("case_call"));
Expand Down Expand Up @@ -4961,7 +4967,11 @@ void Courtroom::music_random()
}
if (clist.length() == 0)
return;
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
on_music_list_double_clicked(clist.at(qrand() % clist.length()), 1);
#else
on_music_list_double_clicked(clist.at(QRandomGenerator::global()->bounded(0, clist.length())), 1);
#endif
}

void Courtroom::music_list_expand_all() { ui_music_list->expandAll(); }
Expand Down
4 changes: 4 additions & 0 deletions src/demoserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ void DemoServer::recv_data()
}

QStringList packet_list =
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
in_data.split("%", QString::SplitBehavior(QString::SkipEmptyParts));
#else
in_data.split("%", Qt::SkipEmptyParts);
#endif

for (const QString &packet : packet_list) {
AOPacket ao_packet(packet);
Expand Down
3 changes: 3 additions & 0 deletions src/discord_rich_presence.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,14 @@ void Discord::state_lobby() {}

void Discord::state_server(std::string name, std::string server_id)
{
Q_UNUSED(name);
Q_UNUSED(server_id);
qDebug() << "Discord RPC: Setting server state";
}

void Discord::state_character(std::string name)
{
Q_UNUSED(name);
qDebug() << "Discord RPC: Setting character state";
}

Expand Down
5 changes: 4 additions & 1 deletion src/networkmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,11 @@ void NetworkManager::handle_server_packet(const QString& p_data)
partial_packet = false;
}
}

#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
const QStringList packet_list = in_data.split("%", QString::SkipEmptyParts);
#else
const QStringList packet_list = in_data.split("%", Qt::SkipEmptyParts);
#endif

for (const QString &packet : packet_list) {
AOPacket *f_packet = new AOPacket(packet);
Expand Down