Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port yuzu commit: "yuzu/CMakeLists: Disable implicit QString co… (#5074)

Browse source 
* yuzu/CMakeLists: Disable implicit QString conversions

Now that all of our code is compilable with implicit QString
conversions, we can enforce it at compile-time by disabling them.

Co-Authored-By: Mat M. <lioncash@users.noreply.github.com>

* citra_qt: Remove lots of implicit QString conversions

Co-authored-by: Mat M. <mathew1800@gmail.com>
This commit is contained in:
Tobias 2020-02-11 13:12:09 +01:00 • committed by GitHub
parent b53b4bfb17
commit f106e76132
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 55 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/citra_qt/cheats.cpp
View file

@ -54,7 +54,7 @@ void CheatDialog::LoadCheats() {
for (size_t i = 0; i < cheats.size(); i++) {
QCheckBox* enabled = new QCheckBox();
enabled->setChecked(cheats[i]->IsEnabled());
enabled->setStyleSheet("margin-left:7px;");
enabled->setStyleSheet(QStringLiteral("margin-left:7px;"));
ui->tableCheats->setItem(i, 0, new QTableWidgetItem());
ui->tableCheats->setCellWidget(i, 0, enabled);
ui->tableCheats->setItem(
@ -90,7 +90,7 @@ bool CheatDialog::SaveCheat(int row) {
}
// Check if the cheat lines are valid
auto code_lines = ui->textCode->toPlainText().split("\n", QString::SkipEmptyParts);
auto code_lines = ui->textCode->toPlainText().split(QLatin1Char{'\n'}, QString::SkipEmptyParts);
for (int i = 0; i < code_lines.size(); ++i) {
Cheats::GatewayCheat::CheatLine cheat_line(code_lines[i].toStdString());
if (cheat_line.valid)
@ -195,9 +195,9 @@ void CheatDialog::OnDeleteCheat() {
LoadCheats();
if (cheats.empty()) {
ui->lineName->setText("");
ui->textCode->setPlainText("");
ui->textNotes->setPlainText("");
ui->lineName->clear();
ui->textCode->clear();
ui->textNotes->clear();
ui->lineName->setEnabled(false);
ui->textCode->setEnabled(false);
ui->textNotes->setEnabled(false);
@ -231,11 +231,11 @@ void CheatDialog::OnAddCheat() {
// create a dummy item
ui->tableCheats->setItem(row, 1, new QTableWidgetItem(tr("[new cheat]")));
ui->tableCheats->setItem(row, 2, new QTableWidgetItem(""));
ui->lineName->setText("");
ui->tableCheats->setItem(row, 2, new QTableWidgetItem(QString{}));
ui->lineName->clear();
ui->lineName->setPlaceholderText(tr("[new cheat]"));
ui->textCode->setPlainText("");
ui->textNotes->setPlainText("");
ui->textCode->clear();
ui->textNotes->clear();
ui->lineName->setEnabled(true);
ui->textCode->setEnabled(true);
ui->textNotes->setEnabled(true);