Skip to content

Commit 8ccffea

Browse files
tygyhtygyh
committed
Make variables constant
1 parent 1897912 commit 8ccffea

File tree

6 files changed

+51
-51
lines changed

6 files changed

+51
-51
lines changed

‎Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
static QString GetPlayerNameFromPID(int pid)
2626
{
2727
QString player_name = QObject::tr("Invalid Player ID");
28-
auto client = Settings::Instance().GetNetPlayClient();
28+
const auto client = Settings::Instance().GetNetPlayClient();
2929
if (!client)
3030
return player_name;
3131

@@ -73,13 +73,13 @@ void ChunkedProgressDialog::show(const QString& title, const u64 data_size,
7373
m_progress_box->setTitle(title);
7474
m_data_size = data_size;
7575

76-
for (auto& pair : m_progress_bars)
76+
for (const auto& pair : m_progress_bars)
7777
{
7878
m_progress_layout->removeWidget(pair.second);
7979
pair.second->deleteLater();
8080
}
8181

82-
for (auto& pair : m_status_labels)
82+
for (const auto& pair : m_status_labels)
8383
{
8484
m_progress_layout->removeWidget(pair.second);
8585
pair.second->deleteLater();
@@ -88,7 +88,7 @@ void ChunkedProgressDialog::show(const QString& title, const u64 data_size,
8888
m_progress_bars.clear();
8989
m_status_labels.clear();
9090

91-
auto client = Settings::Instance().GetNetPlayClient();
91+
const auto client = Settings::Instance().GetNetPlayClient();
9292
if (!client)
9393
return;
9494

@@ -142,7 +142,7 @@ void ChunkedProgressDialog::SetProgress(const int pid, const u64 progress)
142142

143143
void ChunkedProgressDialog::reject()
144144
{
145-
auto server = Settings::Instance().GetNetPlayServer();
145+
const auto server = Settings::Instance().GetNetPlayServer();
146146

147147
if (server)
148148
server->AbortGameStart();

‎Source/Core/DolphinQt/NetPlay/GameDigestDialog.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
static QString GetPlayerNameFromPID(int pid)
2222
{
2323
QString player_name = QObject::tr("Invalid Player ID");
24-
auto client = Settings::Instance().GetNetPlayClient();
24+
const auto client = Settings::Instance().GetNetPlayClient();
2525
if (!client)
2626
return player_name;
2727

@@ -70,13 +70,13 @@ void GameDigestDialog::show(const QString& title)
7070
{
7171
m_progress_box->setTitle(title);
7272

73-
for (auto& pair : m_progress_bars)
73+
for (const auto& pair : m_progress_bars)
7474
{
7575
m_progress_layout->removeWidget(pair.second);
7676
pair.second->deleteLater();
7777
}
7878

79-
for (auto& pair : m_status_labels)
79+
for (const auto& pair : m_status_labels)
8080
{
8181
m_progress_layout->removeWidget(pair.second);
8282
pair.second->deleteLater();
@@ -87,7 +87,7 @@ void GameDigestDialog::show(const QString& title)
8787
m_results.clear();
8888
m_check_label->setText(QString::fromStdString(""));
8989

90-
auto client = Settings::Instance().GetNetPlayClient();
90+
const auto client = Settings::Instance().GetNetPlayClient();
9191
if (!client)
9292
return;
9393

@@ -142,7 +142,7 @@ void GameDigestDialog::SetResult(int pid, const std::string& result)
142142

143143
m_results.push_back(result);
144144

145-
auto client = Settings::Instance().GetNetPlayClient();
145+
const auto client = Settings::Instance().GetNetPlayClient();
146146
if (client && m_results.size() >= client->GetPlayers().size())
147147
{
148148
if (std::ranges::adjacent_find(m_results, std::ranges::not_equal_to{}) == m_results.end())
@@ -163,7 +163,7 @@ void GameDigestDialog::SetResult(int pid, const std::string& result)
163163

164164
void GameDigestDialog::reject()
165165
{
166-
auto server = Settings::Instance().GetNetPlayServer();
166+
const auto server = Settings::Instance().GetNetPlayServer();
167167

168168
if (server)
169169
server->AbortGameDigest();

‎Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ void NetPlayBrowser::accept()
289289

290290
const int index = m_table_widget->selectedItems()[0]->row();
291291

292-
NetPlaySession& session = m_sessions[index];
292+
const NetPlaySession& session = m_sessions[index];
293293

294294
std::string server_id = session.server_id;
295295

@@ -309,7 +309,7 @@ void NetPlayBrowser::accept()
309309

310310
const std::string password = dialog.textValue().toStdString();
311311

312-
auto decrypted_id = session.DecryptID(password);
312+
const auto decrypted_id = session.DecryptID(password);
313313

314314
if (!decrypted_id)
315315
{

‎Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp

+20-20
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ NetPlayDialog::NetPlayDialog(const GameListModel& game_list_model,
113113
LoadSettings();
114114
ConnectWidgets();
115115

116-
auto& settings = Settings::Instance().GetQSettings();
116+
const auto& settings = Settings::Instance().GetQSettings();
117117

118118
restoreGeometry(settings.value(QStringLiteral("netplaydialog/geometry")).toByteArray());
119119
m_splitter->restoreState(settings.value(QStringLiteral("netplaydialog/splitter")).toByteArray());
@@ -330,12 +330,12 @@ void NetPlayDialog::ConnectWidgets()
330330
QApplication::clipboard()->setText(m_hostcode_label->text());
331331
});
332332
connect(m_players_list, &QTableWidget::itemSelectionChanged, [this] {
333-
int row = m_players_list->currentRow();
333+
const int row = m_players_list->currentRow();
334334
m_kick_button->setEnabled(row > 0 &&
335335
!m_players_list->currentItem()->data(Qt::UserRole).isNull());
336336
});
337337
connect(m_kick_button, &QPushButton::clicked, [this] {
338-
auto id = m_players_list->currentItem()->data(Qt::UserRole).toInt();
338+
const auto id = m_players_list->currentItem()->data(Qt::UserRole).toInt();
339339
Settings::Instance().GetNetPlayServer()->KickPlayer(id);
340340
});
341341
connect(m_assign_ports_button, &QPushButton::clicked, [this] {
@@ -358,8 +358,8 @@ void NetPlayDialog::ConnectWidgets()
358358
if (value == m_buffer_size)
359359
return;
360360

361-
auto client = Settings::Instance().GetNetPlayClient();
362-
auto server = Settings::Instance().GetNetPlayServer();
361+
const auto client = Settings::Instance().GetNetPlayClient();
362+
const auto server = Settings::Instance().GetNetPlayServer();
363363
if (server && !m_host_input_authority)
364364
server->AdjustPadBufferSize(value);
365365
else
@@ -369,7 +369,7 @@ void NetPlayDialog::ConnectWidgets()
369369
const auto hia_function = [this](bool enable) {
370370
if (m_host_input_authority != enable)
371371
{
372-
auto server = Settings::Instance().GetNetPlayServer();
372+
const auto server = Settings::Instance().GetNetPlayServer();
373373
if (server)
374374
server->SetHostInputAuthority(enable);
375375
}
@@ -442,7 +442,7 @@ void NetPlayDialog::SendMessage(const std::string& msg)
442442
void NetPlayDialog::OnChat()
443443
{
444444
QueueOnObject(this, [this] {
445-
auto msg = m_chat_type_edit->text().toStdString();
445+
const auto msg = m_chat_type_edit->text().toStdString();
446446

447447
if (msg.empty())
448448
return;
@@ -516,7 +516,7 @@ void NetPlayDialog::show(std::string nickname, bool use_traversal)
516516
m_chat_edit->clear();
517517
m_chat_type_edit->clear();
518518

519-
bool is_hosting = Settings::Instance().GetNetPlayServer() != nullptr;
519+
const bool is_hosting = Settings::Instance().GetNetPlayServer() != nullptr;
520520

521521
if (is_hosting)
522522
{
@@ -616,8 +616,8 @@ void NetPlayDialog::UpdateDiscordPresence()
616616

617617
void NetPlayDialog::UpdateGUI()
618618
{
619-
auto client = Settings::Instance().GetNetPlayClient();
620-
auto server = Settings::Instance().GetNetPlayServer();
619+
const auto client = Settings::Instance().GetNetPlayClient();
620+
const auto server = Settings::Instance().GetNetPlayServer();
621621
if (!client)
622622
return;
623623

@@ -629,9 +629,9 @@ void NetPlayDialog::UpdateGUI()
629629

630630
m_player_count = static_cast<int>(players.size());
631631

632-
int selection_pid = m_players_list->currentItem() ?
633-
m_players_list->currentItem()->data(Qt::UserRole).toInt() :
634-
-1;
632+
const int selection_pid = m_players_list->currentItem() ?
633+
m_players_list->currentItem()->data(Qt::UserRole).toInt() :
634+
-1;
635635

636636
m_players_list->clear();
637637
m_players_list->setHorizontalHeaderLabels(
@@ -803,7 +803,7 @@ void NetPlayDialog::DisplayMessage(const QString& msg, const std::string& color,
803803
.arg(QString::fromStdString(color), msg.toHtmlEscaped()));
804804
});
805805

806-
QColor c(color.empty() ? QStringLiteral("white") : QString::fromStdString(color));
806+
const QColor c(color.empty() ? QStringLiteral("white") : QString::fromStdString(color));
807807

808808
if (Config::Get(Config::GFX_SHOW_NETPLAY_MESSAGES) &&
809809
Core::IsRunning(Core::System::GetInstance()))
@@ -886,11 +886,11 @@ void NetPlayDialog::OnMsgStartGame()
886886
}
887887

888888
QueueOnObject(this, [this] {
889-
auto client = Settings::Instance().GetNetPlayClient();
889+
const auto client = Settings::Instance().GetNetPlayClient();
890890

891891
if (client)
892892
{
893-
if (auto game = FindGameFile(m_current_game_identifier))
893+
if (const auto game = FindGameFile(m_current_game_identifier))
894894
client->StartGame(game->GetFilePath());
895895
else
896896
PanicAlertFmtT("Selected game doesn't exist in game list!");
@@ -1052,7 +1052,7 @@ void NetPlayDialog::OnTtlDetermined(u8 ttl)
10521052

10531053
bool NetPlayDialog::IsRecording()
10541054
{
1055-
std::optional<bool> is_recording = RunOnObject(m_record_input_action, &QAction::isChecked);
1055+
const std::optional<bool> is_recording = RunOnObject(m_record_input_action, &QAction::isChecked);
10561056
if (is_recording)
10571057
return *is_recording;
10581058
return false;
@@ -1068,7 +1068,7 @@ NetPlayDialog::FindGameFile(const NetPlay::SyncIdentifier& sync_identifier,
10681068

10691069
*found = NetPlay::SyncIdentifierComparison::DifferentGame;
10701070

1071-
std::optional<std::shared_ptr<const UICommon::GameFile>> game_file =
1071+
const std::optional<std::shared_ptr<const UICommon::GameFile>> game_file =
10721072
RunOnObject(this, [this, &sync_identifier, found] {
10731073
for (int i = 0; i < m_game_list_model.rowCount(QModelIndex()); i++)
10741074
{
@@ -1088,7 +1088,7 @@ std::string NetPlayDialog::FindGBARomPath(const std::array<u8, 20>& hash, std::s
10881088
int device_number)
10891089
{
10901090
#ifdef HAS_LIBMGBA
1091-
auto result = RunOnObject(this, [&, this] {
1091+
const auto result = RunOnObject(this, [&, this] {
10921092
std::string rom_path;
10931093
std::array<u8, 20> rom_hash;
10941094
std::string rom_title;
@@ -1279,7 +1279,7 @@ void NetPlayDialog::SetChunkedProgress(const int pid, const u64 progress)
12791279

12801280
void NetPlayDialog::SetHostWiiSyncData(std::vector<u64> titles, std::string redirect_folder)
12811281
{
1282-
auto client = Settings::Instance().GetNetPlayClient();
1282+
const auto client = Settings::Instance().GetNetPlayClient();
12831283
if (client)
12841284
client->SetWiiSyncData(nullptr, std::move(titles), std::move(redirect_folder));
12851285
}

‎Source/Core/DolphinQt/NetPlay/NetPlaySetupDialog.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ NetPlaySetupDialog::NetPlaySetupDialog(const GameListModel& game_list_model, QWi
3636

3737
CreateMainLayout();
3838

39-
bool use_index = Config::Get(Config::NETPLAY_USE_INDEX);
40-
std::string index_region = Config::Get(Config::NETPLAY_INDEX_REGION);
41-
std::string index_name = Config::Get(Config::NETPLAY_INDEX_NAME);
42-
std::string index_password = Config::Get(Config::NETPLAY_INDEX_PASSWORD);
43-
std::string nickname = Config::Get(Config::NETPLAY_NICKNAME);
44-
std::string traversal_choice = Config::Get(Config::NETPLAY_TRAVERSAL_CHOICE);
45-
int connect_port = Config::Get(Config::NETPLAY_CONNECT_PORT);
46-
int host_port = Config::Get(Config::NETPLAY_HOST_PORT);
47-
int host_listen_port = Config::Get(Config::NETPLAY_LISTEN_PORT);
48-
bool enable_chunked_upload_limit = Config::Get(Config::NETPLAY_ENABLE_CHUNKED_UPLOAD_LIMIT);
49-
u32 chunked_upload_limit = Config::Get(Config::NETPLAY_CHUNKED_UPLOAD_LIMIT);
39+
const bool use_index = Config::Get(Config::NETPLAY_USE_INDEX);
40+
const std::string index_region = Config::Get(Config::NETPLAY_INDEX_REGION);
41+
const std::string index_name = Config::Get(Config::NETPLAY_INDEX_NAME);
42+
const std::string index_password = Config::Get(Config::NETPLAY_INDEX_PASSWORD);
43+
const std::string nickname = Config::Get(Config::NETPLAY_NICKNAME);
44+
const std::string traversal_choice = Config::Get(Config::NETPLAY_TRAVERSAL_CHOICE);
45+
const int connect_port = Config::Get(Config::NETPLAY_CONNECT_PORT);
46+
const int host_port = Config::Get(Config::NETPLAY_HOST_PORT);
47+
const int host_listen_port = Config::Get(Config::NETPLAY_LISTEN_PORT);
48+
const bool enable_chunked_upload_limit = Config::Get(Config::NETPLAY_ENABLE_CHUNKED_UPLOAD_LIMIT);
49+
const u32 chunked_upload_limit = Config::Get(Config::NETPLAY_CHUNKED_UPLOAD_LIMIT);
5050
#ifdef USE_UPNP
51-
bool use_upnp = Config::Get(Config::NETPLAY_USE_UPNP);
51+
const bool use_upnp = Config::Get(Config::NETPLAY_USE_UPNP);
5252

5353
m_host_upnp->setChecked(use_upnp);
5454
#endif
@@ -305,7 +305,7 @@ void NetPlaySetupDialog::OnConnectionTypeChanged(int index)
305305

306306
m_reset_traversal_button->setHidden(index == 0);
307307

308-
std::string address =
308+
const std::string address =
309309
index == 0 ? Config::Get(Config::NETPLAY_ADDRESS) : Config::Get(Config::NETPLAY_HOST_CODE);
310310

311311
m_ip_label->setText(index == 0 ? tr("IP Address:") : tr("Host Code:"));

‎Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ void PadMappingDialog::ConnectWidgets()
6767

6868
int PadMappingDialog::exec()
6969
{
70-
auto client = Settings::Instance().GetNetPlayClient();
71-
auto server = Settings::Instance().GetNetPlayServer();
70+
const auto client = Settings::Instance().GetNetPlayClient();
71+
const auto server = Settings::Instance().GetNetPlayServer();
7272
// Load Settings
7373
m_players = client->GetPlayers();
7474
m_pad_mapping = server->GetPadMapping();
@@ -87,7 +87,7 @@ int PadMappingDialog::exec()
8787

8888
for (auto& combo_group : {m_gc_boxes, m_wii_boxes})
8989
{
90-
bool gc = combo_group == m_gc_boxes;
90+
const bool gc = combo_group == m_gc_boxes;
9191
for (size_t i = 0; i < combo_group.size(); i++)
9292
{
9393
auto& combo = combo_group[i];
@@ -131,8 +131,8 @@ void PadMappingDialog::OnMappingChanged()
131131
{
132132
for (unsigned int i = 0; i < m_wii_boxes.size(); i++)
133133
{
134-
int gc_id = m_gc_boxes[i]->currentIndex();
135-
int wii_id = m_wii_boxes[i]->currentIndex();
134+
const int gc_id = m_gc_boxes[i]->currentIndex();
135+
const int wii_id = m_wii_boxes[i]->currentIndex();
136136

137137
m_pad_mapping[i] = gc_id > 0 ? m_players[gc_id - 1]->pid : 0;
138138
m_gba_config[i].enabled = m_gba_boxes[i]->isChecked();

0 commit comments

Comments
 (0)