OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-15 07:50:07 +00:00
Code Issues Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
James Rowe 2019-11-28 20:47:33 -07:00
parent ea40eb0994
commit de17fe31fb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/citra_qt/configuration/configure_hotkeys.cpp
View File

@ -105,10 +105,10 @@ void ConfigureHotkeys::ApplyConfiguration(HotkeyRegistry& registry) {
for (int key_column_id = 0; key_column_id < parent->rowCount(); key_column_id++) { for (int key_column_id = 0; key_column_id < parent->rowCount(); key_column_id++) {
QStandardItem* action = parent->child(key_column_id, 0); QStandardItem* action = parent->child(key_column_id, 0);
QStandardItem* keyseq = parent->child(key_column_id, 1); QStandardItem* keyseq = parent->child(key_column_id, 1);
for (auto & [group, sub_actions] : registry.hotkey_groups) { for (auto& [group, sub_actions] : registry.hotkey_groups) {
if (group != parent->text()) if (group != parent->text())
continue; continue;
for (auto & [action_name, hotkey] : sub_actions) { for (auto& [action_name, hotkey] : sub_actions) {
if (action_name != action->text()) if (action_name != action->text())
continue; continue;
hotkey.keyseq = QKeySequence(keyseq->text()); hotkey.keyseq = QKeySequence(keyseq->text());

9
src/citra_qt/configuration/configure_web.cpp
View File

@ -127,10 +127,11 @@ void ConfigureWeb::OnLoginChanged() {
void ConfigureWeb::VerifyLogin() { void ConfigureWeb::VerifyLogin() {
ui->button_verify_login->setDisabled(true); ui->button_verify_login->setDisabled(true);
ui->button_verify_login->setText(tr("Verifying...")); ui->button_verify_login->setText(tr("Verifying..."));
verify_watcher.setFuture(QtConcurrent::run([ verify_watcher.setFuture(QtConcurrent::run(
username = UsernameFromDisplayToken(ui->edit_token->text().toStdString()), [username = UsernameFromDisplayToken(ui->edit_token->text().toStdString()),
token = TokenFromDisplayToken(ui->edit_token->text().toStdString()) token = TokenFromDisplayToken(ui->edit_token->text().toStdString())] {
] { return Core::VerifyLogin(username, token); })); return Core::VerifyLogin(username, token);
}));
} }
void ConfigureWeb::OnLoginVerified() { void ConfigureWeb::OnLoginVerified() {