mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-21 11:37:14 +01:00
DolphinQt: Replace QStringLiteral with alternatives where applicable
QStringLiterals generate a buffer so that during runtime there's very little cost to constructing a QString. However, this also means that duplicated strings cannot be optimized out into a single entry that gets referenced everywhere, taking up space in the binary. Rather than use QStringLiteral(""), we can just use QString{} (the default constructor) to signify the empty string. This gets rid of an unnecessary string buffer from being created, saving a tiny bit of space. While we're at it, we can just use the character overloads of particular functions when they're available instead of using a QString overload. The characters in this case are Latin-1 to begin with, so we can just specify the characters as QLatin1Char instances to use those overloads. These will automatically convert to QChar if needed, so this is safe.
This commit is contained in:
parent
dea2b9c509
commit
fef1b84f0a
@ -625,8 +625,7 @@ static QString GetResultString(const Result& result)
|
|||||||
case DataType::String:
|
case DataType::String:
|
||||||
return QObject::tr("String Match");
|
return QObject::tr("String Match");
|
||||||
default:
|
default:
|
||||||
// Make MSVC happy
|
return {};
|
||||||
return QStringLiteral("");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -722,7 +721,7 @@ void CheatsManager::Reset()
|
|||||||
m_match_table->clear();
|
m_match_table->clear();
|
||||||
m_watch_table->clear();
|
m_watch_table->clear();
|
||||||
m_match_decimal->setChecked(true);
|
m_match_decimal->setChecked(true);
|
||||||
m_result_label->setText(QStringLiteral(""));
|
m_result_label->clear();
|
||||||
|
|
||||||
Update();
|
Update();
|
||||||
}
|
}
|
||||||
|
@ -152,8 +152,8 @@ void ARCodeWidget::UpdateList()
|
|||||||
{
|
{
|
||||||
const auto& ar = m_ar_codes[i];
|
const auto& ar = m_ar_codes[i];
|
||||||
auto* item = new QListWidgetItem(QString::fromStdString(ar.name)
|
auto* item = new QListWidgetItem(QString::fromStdString(ar.name)
|
||||||
.replace(QStringLiteral("<"), QStringLiteral("<"))
|
.replace(QStringLiteral("<"), QChar::fromLatin1('<'))
|
||||||
.replace(QStringLiteral(">"), QStringLiteral(">")));
|
.replace(QStringLiteral(">"), QChar::fromLatin1('>')));
|
||||||
|
|
||||||
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable |
|
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable |
|
||||||
Qt::ItemIsDragEnabled);
|
Qt::ItemIsDragEnabled);
|
||||||
|
@ -124,7 +124,7 @@ bool CheatCodeEditor::AcceptAR()
|
|||||||
std::vector<ActionReplay::AREntry> entries;
|
std::vector<ActionReplay::AREntry> entries;
|
||||||
std::vector<std::string> encrypted_lines;
|
std::vector<std::string> encrypted_lines;
|
||||||
|
|
||||||
QStringList lines = m_code_edit->toPlainText().split(QStringLiteral("\n"));
|
QStringList lines = m_code_edit->toPlainText().split(QLatin1Char{'\n'});
|
||||||
|
|
||||||
for (int i = 0; i < lines.size(); i++)
|
for (int i = 0; i < lines.size(); i++)
|
||||||
{
|
{
|
||||||
@ -133,7 +133,7 @@ bool CheatCodeEditor::AcceptAR()
|
|||||||
if (line.isEmpty())
|
if (line.isEmpty())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
QStringList values = line.split(QStringLiteral(" "));
|
QStringList values = line.split(QLatin1Char{' '});
|
||||||
|
|
||||||
bool good = true;
|
bool good = true;
|
||||||
|
|
||||||
@ -152,7 +152,7 @@ bool CheatCodeEditor::AcceptAR()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
QStringList blocks = line.split(QStringLiteral("-"));
|
QStringList blocks = line.split(QLatin1Char{'-'});
|
||||||
|
|
||||||
if (blocks.size() == 3 && blocks[0].size() == 4 && blocks[1].size() == 4 &&
|
if (blocks.size() == 3 && blocks[0].size() == 4 && blocks[1].size() == 4 &&
|
||||||
blocks[2].size() == 5)
|
blocks[2].size() == 5)
|
||||||
@ -230,7 +230,7 @@ bool CheatCodeEditor::AcceptGecko()
|
|||||||
{
|
{
|
||||||
std::vector<Gecko::GeckoCode::Code> entries;
|
std::vector<Gecko::GeckoCode::Code> entries;
|
||||||
|
|
||||||
QStringList lines = m_code_edit->toPlainText().split(QStringLiteral("\n"));
|
QStringList lines = m_code_edit->toPlainText().split(QLatin1Char{'\n'});
|
||||||
|
|
||||||
for (int i = 0; i < lines.size(); i++)
|
for (int i = 0; i < lines.size(); i++)
|
||||||
{
|
{
|
||||||
@ -239,7 +239,7 @@ bool CheatCodeEditor::AcceptGecko()
|
|||||||
if (line.isEmpty())
|
if (line.isEmpty())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
QStringList values = line.split(QStringLiteral(" "));
|
QStringList values = line.split(QLatin1Char{' '});
|
||||||
|
|
||||||
bool good = values.size() == 2;
|
bool good = values.size() == 2;
|
||||||
|
|
||||||
@ -289,7 +289,7 @@ bool CheatCodeEditor::AcceptGecko()
|
|||||||
m_gecko_code->user_defined = true;
|
m_gecko_code->user_defined = true;
|
||||||
|
|
||||||
std::vector<std::string> note_lines;
|
std::vector<std::string> note_lines;
|
||||||
for (QString line : m_notes_edit->toPlainText().split(QStringLiteral("\n")))
|
for (const QString& line : m_notes_edit->toPlainText().split(QLatin1Char{'\n'}))
|
||||||
note_lines.push_back(line.toStdString());
|
note_lines.push_back(line.toStdString());
|
||||||
|
|
||||||
m_gecko_code->notes = std::move(note_lines);
|
m_gecko_code->notes = std::move(note_lines);
|
||||||
|
@ -263,7 +263,7 @@ DiscIO::Partition FilesystemWidget::GetPartitionFromID(int id)
|
|||||||
|
|
||||||
void FilesystemWidget::ExtractPartition(const DiscIO::Partition& partition, const QString& out)
|
void FilesystemWidget::ExtractPartition(const DiscIO::Partition& partition, const QString& out)
|
||||||
{
|
{
|
||||||
ExtractDirectory(partition, QStringLiteral(""), out + QStringLiteral("/files"));
|
ExtractDirectory(partition, QString{}, out + QStringLiteral("/files"));
|
||||||
ExtractSystemData(partition, out);
|
ExtractSystemData(partition, out);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ void GameConfigEdit::SetOption(const QString& section, const QString& key, const
|
|||||||
if (value_cursor.isNull())
|
if (value_cursor.isNull())
|
||||||
{
|
{
|
||||||
section_cursor.clearSelection();
|
section_cursor.clearSelection();
|
||||||
section_cursor.insertText(QStringLiteral("\n") + new_line);
|
section_cursor.insertText(QLatin1Char{'\n'} + new_line);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -280,8 +280,8 @@ void GeckoCodeWidget::UpdateList()
|
|||||||
const auto& code = m_gecko_codes[i];
|
const auto& code = m_gecko_codes[i];
|
||||||
|
|
||||||
auto* item = new QListWidgetItem(QString::fromStdString(code.name)
|
auto* item = new QListWidgetItem(QString::fromStdString(code.name)
|
||||||
.replace(QStringLiteral("<"), QStringLiteral("<"))
|
.replace(QStringLiteral("<"), QChar::fromLatin1('<'))
|
||||||
.replace(QStringLiteral(">"), QStringLiteral(">")));
|
.replace(QStringLiteral(">"), QChar::fromLatin1('>')));
|
||||||
|
|
||||||
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable |
|
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable |
|
||||||
Qt::ItemIsDragEnabled);
|
Qt::ItemIsDragEnabled);
|
||||||
|
@ -189,7 +189,7 @@ void EnhancementsWidget::LoadPPShaders()
|
|||||||
m_pp_effect->setEnabled(supports_postprocessing);
|
m_pp_effect->setEnabled(supports_postprocessing);
|
||||||
|
|
||||||
m_pp_effect->setToolTip(supports_postprocessing ?
|
m_pp_effect->setToolTip(supports_postprocessing ?
|
||||||
QStringLiteral("") :
|
QString{} :
|
||||||
tr("%1 doesn't support this feature.")
|
tr("%1 doesn't support this feature.")
|
||||||
.arg(tr(g_video_backend->GetDisplayName().c_str())));
|
.arg(tr(g_video_backend->GetDisplayName().c_str())));
|
||||||
|
|
||||||
|
@ -299,7 +299,7 @@ void GeneralWidget::OnBackendChanged(const QString& backend_name)
|
|||||||
m_adapter_combo->setEnabled(supports_adapters && !Core::IsRunning());
|
m_adapter_combo->setEnabled(supports_adapters && !Core::IsRunning());
|
||||||
|
|
||||||
m_adapter_combo->setToolTip(supports_adapters ?
|
m_adapter_combo->setToolTip(supports_adapters ?
|
||||||
QStringLiteral("") :
|
QString{} :
|
||||||
tr("%1 doesn't support this feature.")
|
tr("%1 doesn't support this feature.")
|
||||||
.arg(tr(g_video_backend->GetDisplayName().c_str())));
|
.arg(tr(g_video_backend->GetDisplayName().c_str())));
|
||||||
}
|
}
|
||||||
|
@ -129,8 +129,8 @@ void HacksWidget::OnBackendChanged(const QString& backend_name)
|
|||||||
|
|
||||||
const QString tooltip = tr("%1 doesn't support this feature on your system.").arg(backend_name);
|
const QString tooltip = tr("%1 doesn't support this feature on your system.").arg(backend_name);
|
||||||
|
|
||||||
m_gpu_texture_decoding->setToolTip(!gpu_texture_decoding ? tooltip : QStringLiteral(""));
|
m_gpu_texture_decoding->setToolTip(!gpu_texture_decoding ? tooltip : QString{});
|
||||||
m_disable_bounding_box->setToolTip(!bbox ? tooltip : QStringLiteral(""));
|
m_disable_bounding_box->setToolTip(!bbox ? tooltip : QString{});
|
||||||
}
|
}
|
||||||
|
|
||||||
void HacksWidget::ConnectWidgets()
|
void HacksWidget::ConnectWidgets()
|
||||||
|
@ -24,19 +24,19 @@ void GCKeyboardEmu::CreateMainLayout()
|
|||||||
m_main_layout = new QHBoxLayout();
|
m_main_layout = new QHBoxLayout();
|
||||||
|
|
||||||
m_main_layout->addWidget(
|
m_main_layout->addWidget(
|
||||||
CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb0x)));
|
CreateGroupBox(QString{}, Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb0x)));
|
||||||
m_main_layout->addWidget(
|
m_main_layout->addWidget(
|
||||||
CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb1x)));
|
CreateGroupBox(QString{}, Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb1x)));
|
||||||
m_main_layout->addWidget(
|
m_main_layout->addWidget(
|
||||||
CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb2x)));
|
CreateGroupBox(QString{}, Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb2x)));
|
||||||
m_main_layout->addWidget(
|
m_main_layout->addWidget(
|
||||||
CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb3x)));
|
CreateGroupBox(QString{}, Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb3x)));
|
||||||
m_main_layout->addWidget(
|
m_main_layout->addWidget(
|
||||||
CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb4x)));
|
CreateGroupBox(QString{}, Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb4x)));
|
||||||
|
|
||||||
auto* vbox_layout = new QVBoxLayout();
|
auto* vbox_layout = new QVBoxLayout();
|
||||||
vbox_layout->addWidget(
|
vbox_layout->addWidget(
|
||||||
CreateGroupBox(QStringLiteral(""), Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb5x)));
|
CreateGroupBox(QString{}, Keyboard::GetGroup(GetPort(), KeyboardGroup::Kb5x)));
|
||||||
|
|
||||||
m_main_layout->addLayout(vbox_layout);
|
m_main_layout->addLayout(vbox_layout);
|
||||||
|
|
||||||
|
@ -32,8 +32,8 @@ constexpr int SLIDER_TICK_COUNT = 100;
|
|||||||
// Escape ampersands and remove ticks
|
// Escape ampersands and remove ticks
|
||||||
static QString ToDisplayString(QString&& string)
|
static QString ToDisplayString(QString&& string)
|
||||||
{
|
{
|
||||||
return string.replace(QStringLiteral("&"), QStringLiteral("&&"))
|
return string.replace(QLatin1Char{'&'}, QStringLiteral("&&"))
|
||||||
.replace(QStringLiteral("`"), QStringLiteral(""));
|
.replace(QLatin1Char{'`'}, QString{});
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MappingButton::IsInput() const
|
bool MappingButton::IsInput() const
|
||||||
|
@ -33,7 +33,7 @@ QString GetExpressionForControl(const QString& control_name,
|
|||||||
if (control_device != default_device)
|
if (control_device != default_device)
|
||||||
{
|
{
|
||||||
expr += QString::fromStdString(control_device.ToString());
|
expr += QString::fromStdString(control_device.ToString());
|
||||||
expr += QStringLiteral(":");
|
expr += QLatin1Char{':'};
|
||||||
}
|
}
|
||||||
|
|
||||||
// append the control name
|
// append the control name
|
||||||
|
@ -16,7 +16,7 @@ MappingDouble::MappingDouble(MappingWidget* parent, ControllerEmu::NumericSettin
|
|||||||
setDecimals(2);
|
setDecimals(2);
|
||||||
|
|
||||||
if (const auto ui_suffix = m_setting.GetUISuffix())
|
if (const auto ui_suffix = m_setting.GetUISuffix())
|
||||||
setSuffix(QStringLiteral(" ") + tr(ui_suffix));
|
setSuffix(QLatin1Char{' '} + tr(ui_suffix));
|
||||||
|
|
||||||
if (const auto ui_description = m_setting.GetUIDescription())
|
if (const auto ui_description = m_setting.GetUIDescription())
|
||||||
setToolTip(tr(ui_description));
|
setToolTip(tr(ui_description));
|
||||||
|
@ -308,8 +308,8 @@ void MappingWindow::OnGlobalDevicesChanged()
|
|||||||
{
|
{
|
||||||
// Selected device is not currently attached.
|
// Selected device is not currently attached.
|
||||||
const auto qname = QString::fromStdString(default_device);
|
const auto qname = QString::fromStdString(default_device);
|
||||||
m_devices_combo->addItem(
|
m_devices_combo->addItem(QLatin1Char{'['} + tr("disconnected") + QStringLiteral("] ") + qname,
|
||||||
QStringLiteral("[") + tr("disconnected") + QStringLiteral("] ") + qname, qname);
|
qname);
|
||||||
m_devices_combo->setCurrentIndex(m_devices_combo->count() - 1);
|
m_devices_combo->setCurrentIndex(m_devices_combo->count() - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -339,7 +339,7 @@ void MappingWindow::SetMappingType(MappingWindow::Type type)
|
|||||||
case Type::MAPPING_GC_MICROPHONE:
|
case Type::MAPPING_GC_MICROPHONE:
|
||||||
widget = new GCMicrophone(this);
|
widget = new GCMicrophone(this);
|
||||||
setWindowTitle(tr("GameCube Microphone Slot %1")
|
setWindowTitle(tr("GameCube Microphone Slot %1")
|
||||||
.arg(GetPort() == 0 ? QStringLiteral("A") : QStringLiteral("B")));
|
.arg(GetPort() == 0 ? QLatin1Char{'A'} : QLatin1Char{'B'}));
|
||||||
AddWidget(tr("Microphone"), widget);
|
AddWidget(tr("Microphone"), widget);
|
||||||
break;
|
break;
|
||||||
case Type::MAPPING_WIIMOTE_EMU:
|
case Type::MAPPING_WIIMOTE_EMU:
|
||||||
|
@ -160,7 +160,7 @@ void BreakpointWidget::Update()
|
|||||||
int i = 0;
|
int i = 0;
|
||||||
m_table->setRowCount(i);
|
m_table->setRowCount(i);
|
||||||
|
|
||||||
auto create_item = [](const QString string = QStringLiteral("")) {
|
const auto create_item = [](const QString string = {}) {
|
||||||
QTableWidgetItem* item = new QTableWidgetItem(string);
|
QTableWidgetItem* item = new QTableWidgetItem(string);
|
||||||
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
|
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
|
||||||
return item;
|
return item;
|
||||||
@ -224,10 +224,10 @@ void BreakpointWidget::Update()
|
|||||||
QString flags;
|
QString flags;
|
||||||
|
|
||||||
if (mbp.is_break_on_read)
|
if (mbp.is_break_on_read)
|
||||||
flags.append(QStringLiteral("r"));
|
flags.append(QLatin1Char{'r'});
|
||||||
|
|
||||||
if (mbp.is_break_on_write)
|
if (mbp.is_break_on_write)
|
||||||
flags.append(QStringLiteral("w"));
|
flags.append(QLatin1Char{'w'});
|
||||||
|
|
||||||
m_table->setItem(i, 4, create_item(flags));
|
m_table->setItem(i, 4, create_item(flags));
|
||||||
|
|
||||||
|
@ -422,7 +422,7 @@ void CodeViewWidget::OnSelectionChanged()
|
|||||||
}
|
}
|
||||||
else if (!styleSheet().isEmpty())
|
else if (!styleSheet().isEmpty())
|
||||||
{
|
{
|
||||||
setStyleSheet(QStringLiteral(""));
|
setStyleSheet(QString{});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -314,9 +314,9 @@ void CodeWidget::UpdateCallstack()
|
|||||||
|
|
||||||
void CodeWidget::UpdateSymbols()
|
void CodeWidget::UpdateSymbols()
|
||||||
{
|
{
|
||||||
QString selection = m_symbols_list->selectedItems().isEmpty() ?
|
const QString selection = m_symbols_list->selectedItems().isEmpty() ?
|
||||||
QStringLiteral("") :
|
QString{} :
|
||||||
m_symbols_list->selectedItems()[0]->text();
|
m_symbols_list->selectedItems()[0]->text();
|
||||||
m_symbols_list->clear();
|
m_symbols_list->clear();
|
||||||
|
|
||||||
for (const auto& symbol : g_symbolDB.Symbols())
|
for (const auto& symbol : g_symbolDB.Symbols())
|
||||||
|
@ -169,7 +169,8 @@ void MemoryViewWidget::Update()
|
|||||||
case Type::ASCII:
|
case Type::ASCII:
|
||||||
update_values([&accessors](u32 address) {
|
update_values([&accessors](u32 address) {
|
||||||
const char value = accessors->ReadU8(address);
|
const char value = accessors->ReadU8(address);
|
||||||
return std::isprint(value) ? QString{QChar::fromLatin1(value)} : QStringLiteral(".");
|
return std::isprint(value) ? QString{QChar::fromLatin1(value)} :
|
||||||
|
QString{QChar::fromLatin1('.')};
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case Type::U16:
|
case Type::U16:
|
||||||
|
@ -81,7 +81,7 @@ void RegisterWidget::CreateWidgets()
|
|||||||
QStringList empty_list;
|
QStringList empty_list;
|
||||||
|
|
||||||
for (auto i = 0; i < 9; i++)
|
for (auto i = 0; i < 9; i++)
|
||||||
empty_list << QStringLiteral("");
|
empty_list << QString{};
|
||||||
|
|
||||||
m_table->setHorizontalHeaderLabels(empty_list);
|
m_table->setHorizontalHeaderLabels(empty_list);
|
||||||
|
|
||||||
|
@ -475,7 +475,7 @@ void FIFOAnalyzer::UpdateDescription()
|
|||||||
text += name.empty() ?
|
text += name.empty() ?
|
||||||
QStringLiteral("UNKNOWN_%1").arg(*(cmddata + 1), 2, 16, QLatin1Char('0')) :
|
QStringLiteral("UNKNOWN_%1").arg(*(cmddata + 1), 2, 16, QLatin1Char('0')) :
|
||||||
QString::fromStdString(name);
|
QString::fromStdString(name);
|
||||||
text += QStringLiteral("\n");
|
text += QLatin1Char{'\n'};
|
||||||
|
|
||||||
if (desc.empty())
|
if (desc.empty())
|
||||||
text += tr("No description available");
|
text += tr("No description available");
|
||||||
|
@ -165,13 +165,13 @@ void GCMemcardManager::UpdateSlotTable(int slot)
|
|||||||
auto& memcard = m_slot_memcard[slot];
|
auto& memcard = m_slot_memcard[slot];
|
||||||
auto* table = m_slot_table[slot];
|
auto* table = m_slot_table[slot];
|
||||||
|
|
||||||
auto create_item = [](const QString string = QStringLiteral("")) {
|
const auto create_item = [](const QString& string = {}) {
|
||||||
QTableWidgetItem* item = new QTableWidgetItem(string);
|
QTableWidgetItem* item = new QTableWidgetItem(string);
|
||||||
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
|
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
|
||||||
return item;
|
return item;
|
||||||
};
|
};
|
||||||
|
|
||||||
auto strip_garbage = [](const std::string s) {
|
const auto strip_garbage = [](const std::string& s) {
|
||||||
auto offset = s.find('\0');
|
auto offset = s.find('\0');
|
||||||
if (offset == std::string::npos)
|
if (offset == std::string::npos)
|
||||||
offset = s.length();
|
offset = s.length();
|
||||||
|
@ -449,7 +449,7 @@ void GameList::ExportWiiSave()
|
|||||||
{
|
{
|
||||||
QString failed_str;
|
QString failed_str;
|
||||||
for (const std::string& str : failed)
|
for (const std::string& str : failed)
|
||||||
failed_str.append(QStringLiteral("\n")).append(QString::fromStdString(str));
|
failed_str.append(QLatin1Char{'\n'}).append(QString::fromStdString(str));
|
||||||
ModalMessageBox::critical(this, tr("Save Export"),
|
ModalMessageBox::critical(this, tr("Save Export"),
|
||||||
tr("Failed to export the following save files:") + failed_str);
|
tr("Failed to export the following save files:") + failed_str);
|
||||||
}
|
}
|
||||||
@ -579,7 +579,7 @@ void GameList::CompressISO(bool decompress)
|
|||||||
if (decompress)
|
if (decompress)
|
||||||
{
|
{
|
||||||
if (files.size() > 1)
|
if (files.size() > 1)
|
||||||
progress_dialog.setLabelText(tr("Decompressing...") + QStringLiteral("\n") +
|
progress_dialog.setLabelText(tr("Decompressing...") + QLatin1Char{'\n'} +
|
||||||
QFileInfo(QString::fromStdString(original_path)).fileName());
|
QFileInfo(QString::fromStdString(original_path)).fileName());
|
||||||
good = DiscIO::DecompressBlobToFile(original_path, dst_path.toStdString(), &CompressCB,
|
good = DiscIO::DecompressBlobToFile(original_path, dst_path.toStdString(), &CompressCB,
|
||||||
&progress_dialog);
|
&progress_dialog);
|
||||||
@ -587,7 +587,7 @@ void GameList::CompressISO(bool decompress)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (files.size() > 1)
|
if (files.size() > 1)
|
||||||
progress_dialog.setLabelText(tr("Compressing...") + QStringLiteral("\n") +
|
progress_dialog.setLabelText(tr("Compressing...") + QLatin1Char{'\n'} +
|
||||||
QFileInfo(QString::fromStdString(original_path)).fileName());
|
QFileInfo(QString::fromStdString(original_path)).fileName());
|
||||||
good = DiscIO::CompressFileToBlob(original_path, dst_path.toStdString(),
|
good = DiscIO::CompressFileToBlob(original_path, dst_path.toStdString(),
|
||||||
file->GetPlatform() == DiscIO::Platform::WiiDisc ? 1 : 0,
|
file->GetPlatform() == DiscIO::Platform::WiiDisc ? 1 : 0,
|
||||||
|
@ -657,7 +657,7 @@ QStringList MainWindow::PromptFileNames()
|
|||||||
auto& settings = Settings::Instance().GetQSettings();
|
auto& settings = Settings::Instance().GetQSettings();
|
||||||
QStringList paths = QFileDialog::getOpenFileNames(
|
QStringList paths = QFileDialog::getOpenFileNames(
|
||||||
this, tr("Select a File"),
|
this, tr("Select a File"),
|
||||||
settings.value(QStringLiteral("mainwindow/lastdir"), QStringLiteral("")).toString(),
|
settings.value(QStringLiteral("mainwindow/lastdir"), QString{}).toString(),
|
||||||
tr("All GC/Wii files (*.elf *.dol *.gcm *.iso *.tgc *.wbfs *.ciso *.gcz *.wad *.dff *.m3u);;"
|
tr("All GC/Wii files (*.elf *.dol *.gcm *.iso *.tgc *.wbfs *.ciso *.gcz *.wad *.dff *.m3u);;"
|
||||||
"All Files (*)"));
|
"All Files (*)"));
|
||||||
|
|
||||||
|
@ -192,7 +192,7 @@ void MenuBar::AddFileMenu()
|
|||||||
{
|
{
|
||||||
QMenu* file_menu = addMenu(tr("&File"));
|
QMenu* file_menu = addMenu(tr("&File"));
|
||||||
m_open_action = file_menu->addAction(tr("&Open..."), this, &MenuBar::Open,
|
m_open_action = file_menu->addAction(tr("&Open..."), this, &MenuBar::Open,
|
||||||
QKeySequence(QStringLiteral("Ctrl+O")));
|
QKeySequence(Qt::CTRL + Qt::Key_O));
|
||||||
|
|
||||||
file_menu->addSeparator();
|
file_menu->addSeparator();
|
||||||
|
|
||||||
@ -203,8 +203,8 @@ void MenuBar::AddFileMenu()
|
|||||||
|
|
||||||
file_menu->addSeparator();
|
file_menu->addSeparator();
|
||||||
|
|
||||||
m_exit_action = file_menu->addAction(tr("E&xit"), this, &MenuBar::Exit,
|
m_exit_action =
|
||||||
QKeySequence(QStringLiteral("Alt+F4")));
|
file_menu->addAction(tr("E&xit"), this, &MenuBar::Exit, QKeySequence(Qt::ALT + Qt::Key_F4));
|
||||||
}
|
}
|
||||||
|
|
||||||
void MenuBar::AddToolsMenu()
|
void MenuBar::AddToolsMenu()
|
||||||
@ -244,8 +244,7 @@ void MenuBar::AddToolsMenu()
|
|||||||
tools_menu->addSeparator();
|
tools_menu->addSeparator();
|
||||||
|
|
||||||
// Label will be set by a NANDRefresh later
|
// Label will be set by a NANDRefresh later
|
||||||
m_boot_sysmenu =
|
m_boot_sysmenu = tools_menu->addAction(QString{}, this, [this] { emit BootWiiSystemMenu(); });
|
||||||
tools_menu->addAction(QStringLiteral(""), this, [this] { emit BootWiiSystemMenu(); });
|
|
||||||
m_wad_install_action = tools_menu->addAction(tr("Install WAD..."), this, &MenuBar::InstallWAD);
|
m_wad_install_action = tools_menu->addAction(tr("Install WAD..."), this, &MenuBar::InstallWAD);
|
||||||
m_manage_nand_menu = tools_menu->addMenu(tr("Manage NAND"));
|
m_manage_nand_menu = tools_menu->addMenu(tr("Manage NAND"));
|
||||||
m_import_backup = m_manage_nand_menu->addAction(tr("Import BootMii NAND Backup..."), this,
|
m_import_backup = m_manage_nand_menu->addAction(tr("Import BootMii NAND Backup..."), this,
|
||||||
@ -325,7 +324,7 @@ void MenuBar::AddStateLoadMenu(QMenu* emu_menu)
|
|||||||
|
|
||||||
for (int i = 1; i <= 10; i++)
|
for (int i = 1; i <= 10; i++)
|
||||||
{
|
{
|
||||||
QAction* action = m_state_load_slots_menu->addAction(QStringLiteral(""));
|
QAction* action = m_state_load_slots_menu->addAction(QString{});
|
||||||
|
|
||||||
connect(action, &QAction::triggered, this, [=]() { emit StateLoadSlotAt(i); });
|
connect(action, &QAction::triggered, this, [=]() { emit StateLoadSlotAt(i); });
|
||||||
}
|
}
|
||||||
@ -342,7 +341,7 @@ void MenuBar::AddStateSaveMenu(QMenu* emu_menu)
|
|||||||
|
|
||||||
for (int i = 1; i <= 10; i++)
|
for (int i = 1; i <= 10; i++)
|
||||||
{
|
{
|
||||||
QAction* action = m_state_save_slots_menu->addAction(QStringLiteral(""));
|
QAction* action = m_state_save_slots_menu->addAction(QString{});
|
||||||
|
|
||||||
connect(action, &QAction::triggered, this, [=]() { emit StateSaveSlotAt(i); });
|
connect(action, &QAction::triggered, this, [=]() { emit StateSaveSlotAt(i); });
|
||||||
}
|
}
|
||||||
@ -355,7 +354,7 @@ void MenuBar::AddStateSlotMenu(QMenu* emu_menu)
|
|||||||
|
|
||||||
for (int i = 1; i <= 10; i++)
|
for (int i = 1; i <= 10; i++)
|
||||||
{
|
{
|
||||||
QAction* action = m_state_slot_menu->addAction(QStringLiteral(""));
|
QAction* action = m_state_slot_menu->addAction(QString{});
|
||||||
action->setCheckable(true);
|
action->setCheckable(true);
|
||||||
action->setActionGroup(m_state_slots);
|
action->setActionGroup(m_state_slots);
|
||||||
if (Settings::Instance().GetStateSlot() == i)
|
if (Settings::Instance().GetStateSlot() == i)
|
||||||
@ -479,7 +478,7 @@ void MenuBar::AddViewMenu()
|
|||||||
view_menu->addAction(tr("Purge Game List Cache"), this, &MenuBar::PurgeGameListCache);
|
view_menu->addAction(tr("Purge Game List Cache"), this, &MenuBar::PurgeGameListCache);
|
||||||
view_menu->addSeparator();
|
view_menu->addSeparator();
|
||||||
view_menu->addAction(tr("Search"), this, &MenuBar::ShowSearch,
|
view_menu->addAction(tr("Search"), this, &MenuBar::ShowSearch,
|
||||||
QKeySequence(QStringLiteral("Ctrl+F")));
|
QKeySequence(Qt::CTRL + Qt::Key_F));
|
||||||
}
|
}
|
||||||
|
|
||||||
void MenuBar::AddOptionsMenu()
|
void MenuBar::AddOptionsMenu()
|
||||||
@ -939,7 +938,7 @@ void MenuBar::UpdateToolsMenu(bool emulation_started)
|
|||||||
const QString sysmenu_version =
|
const QString sysmenu_version =
|
||||||
tmd.IsValid() ?
|
tmd.IsValid() ?
|
||||||
QString::fromStdString(DiscIO::GetSysMenuVersionString(tmd.GetTitleVersion())) :
|
QString::fromStdString(DiscIO::GetSysMenuVersionString(tmd.GetTitleVersion())) :
|
||||||
QStringLiteral("");
|
QString{};
|
||||||
m_boot_sysmenu->setText(tr("Load Wii System Menu %1").arg(sysmenu_version));
|
m_boot_sysmenu->setText(tr("Load Wii System Menu %1").arg(sysmenu_version));
|
||||||
|
|
||||||
m_boot_sysmenu->setEnabled(tmd.IsValid());
|
m_boot_sysmenu->setEnabled(tmd.IsValid());
|
||||||
@ -1438,8 +1437,8 @@ void MenuBar::LogInstructions()
|
|||||||
void MenuBar::SearchInstruction()
|
void MenuBar::SearchInstruction()
|
||||||
{
|
{
|
||||||
bool good;
|
bool good;
|
||||||
QString op = QInputDialog::getText(this, tr("Search instruction"), tr("Instruction:"),
|
const QString op = QInputDialog::getText(this, tr("Search instruction"), tr("Instruction:"),
|
||||||
QLineEdit::Normal, QStringLiteral(""), &good);
|
QLineEdit::Normal, QString{}, &good);
|
||||||
|
|
||||||
if (!good)
|
if (!good)
|
||||||
return;
|
return;
|
||||||
|
@ -349,10 +349,9 @@ void NetPlaySetupDialog::PopulateGameList()
|
|||||||
|
|
||||||
m_host_games->sortItems();
|
m_host_games->sortItems();
|
||||||
|
|
||||||
QString selected_game = Settings::GetQSettings()
|
const QString selected_game =
|
||||||
.value(QStringLiteral("netplay/hostgame"), QStringLiteral(""))
|
Settings::GetQSettings().value(QStringLiteral("netplay/hostgame"), QString{}).toString();
|
||||||
.toString();
|
const auto find_list = m_host_games->findItems(selected_game, Qt::MatchFlag::MatchExactly);
|
||||||
auto find_list = m_host_games->findItems(selected_game, Qt::MatchFlag::MatchExactly);
|
|
||||||
|
|
||||||
if (find_list.count() > 0)
|
if (find_list.count() > 0)
|
||||||
m_host_games->setCurrentItem(find_list[0]);
|
m_host_games->setCurrentItem(find_list[0]);
|
||||||
|
@ -10,8 +10,7 @@ class ElidedButton : public QPushButton
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit ElidedButton(const QString& text = QStringLiteral(""),
|
explicit ElidedButton(const QString& text = {}, Qt::TextElideMode elide_mode = Qt::ElideRight);
|
||||||
Qt::TextElideMode elide_mode = Qt::ElideRight);
|
|
||||||
|
|
||||||
Qt::TextElideMode elideMode() const;
|
Qt::TextElideMode elideMode() const;
|
||||||
void setElideMode(Qt::TextElideMode elide_mode);
|
void setElideMode(Qt::TextElideMode elide_mode);
|
||||||
|
@ -86,8 +86,8 @@ void ResourcePackManager::RepopulateTable()
|
|||||||
m_table_widget->clear();
|
m_table_widget->clear();
|
||||||
m_table_widget->setColumnCount(6);
|
m_table_widget->setColumnCount(6);
|
||||||
|
|
||||||
m_table_widget->setHorizontalHeaderLabels({QStringLiteral(""), tr("Name"), tr("Version"),
|
m_table_widget->setHorizontalHeaderLabels(
|
||||||
tr("Description"), tr("Author"), tr("Website")});
|
{QString{}, tr("Name"), tr("Version"), tr("Description"), tr("Author"), tr("Website")});
|
||||||
|
|
||||||
auto* header = m_table_widget->horizontalHeader();
|
auto* header = m_table_widget->horizontalHeader();
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ QList<QPixmap> Resources::m_misc;
|
|||||||
|
|
||||||
QIcon Resources::GetIcon(const QString& name, const QString& dir)
|
QIcon Resources::GetIcon(const QString& name, const QString& dir)
|
||||||
{
|
{
|
||||||
QString base_path = dir + QStringLiteral("/") + name;
|
QString base_path = dir + QLatin1Char{'/'} + name;
|
||||||
|
|
||||||
const auto dpr = QGuiApplication::primaryScreen()->devicePixelRatio();
|
const auto dpr = QGuiApplication::primaryScreen()->devicePixelRatio();
|
||||||
|
|
||||||
|
@ -317,7 +317,7 @@ void GameCubePane::LoadSettings()
|
|||||||
}
|
}
|
||||||
|
|
||||||
m_skip_main_menu->setEnabled(have_menu);
|
m_skip_main_menu->setEnabled(have_menu);
|
||||||
m_skip_main_menu->setToolTip(have_menu ? QStringLiteral("") :
|
m_skip_main_menu->setToolTip(have_menu ? QString{} :
|
||||||
tr("Put Main Menu roms in User/GC/{region}."));
|
tr("Put Main Menu roms in User/GC/{region}."));
|
||||||
|
|
||||||
// Device Settings
|
// Device Settings
|
||||||
|
@ -66,7 +66,7 @@ static QComboBox* MakeLanguageComboBox()
|
|||||||
};
|
};
|
||||||
|
|
||||||
auto* combobox = new QComboBox();
|
auto* combobox = new QComboBox();
|
||||||
combobox->addItem(QObject::tr("<System Language>"), QStringLiteral(""));
|
combobox->addItem(QObject::tr("<System Language>"), QString{});
|
||||||
for (const auto& lang : languages)
|
for (const auto& lang : languages)
|
||||||
combobox->addItem(lang.name, QString::fromLatin1(lang.id));
|
combobox->addItem(lang.name, QString::fromLatin1(lang.id));
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ void InterfacePane::CreateUI()
|
|||||||
|
|
||||||
auto userstyle_search_results = Common::DoFileSearch({File::GetUserPath(D_STYLES_IDX)});
|
auto userstyle_search_results = Common::DoFileSearch({File::GetUserPath(D_STYLES_IDX)});
|
||||||
|
|
||||||
m_combobox_userstyle->addItem(tr("(None)"), QStringLiteral(""));
|
m_combobox_userstyle->addItem(tr("(None)"), QString{});
|
||||||
|
|
||||||
for (const std::string& filename : userstyle_search_results)
|
for (const std::string& filename : userstyle_search_results)
|
||||||
{
|
{
|
||||||
|
@ -79,7 +79,7 @@ void Updater::OnUpdateAvailable(const NewVersionInformation& info)
|
|||||||
layout->addWidget(buttons);
|
layout->addWidget(buttons);
|
||||||
|
|
||||||
connect(never_btn, &QPushButton::clicked, [dialog] {
|
connect(never_btn, &QPushButton::clicked, [dialog] {
|
||||||
Settings::Instance().SetAutoUpdateTrack(QStringLiteral(""));
|
Settings::Instance().SetAutoUpdateTrack(QString{});
|
||||||
dialog->reject();
|
dialog->reject();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user