piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8271 from lioncash/qstring

Browse Source 
DolphinQt: Replace unnecessary QStringLiterals with alternatives where applicable
This commit is contained in:
Connor McLaughlin
2019-08-08 12:25:30 +10:00
committed by GitHub
parent 1092efa77a fef1b84f0a
commit 1bd8f03362
31 changed files with 70 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/DolphinQt/MenuBar.cpp
View File

@ -192,7 +192,7 @@ void MenuBar::AddFileMenu()
{
QMenu* file_menu = addMenu(tr("&File"));
m_open_action = file_menu->addAction(tr("&Open..."), this, &MenuBar::Open,
QKeySequence(QStringLiteral("Ctrl+O")));
QKeySequence(Qt::CTRL + Qt::Key_O));
file_menu->addSeparator();
@ -203,8 +203,8 @@ void MenuBar::AddFileMenu()
file_menu->addSeparator();
m_exit_action = file_menu->addAction(tr("E&xit"), this, &MenuBar::Exit,
QKeySequence(QStringLiteral("Alt+F4")));
m_exit_action =
file_menu->addAction(tr("E&xit"), this, &MenuBar::Exit, QKeySequence(Qt::ALT + Qt::Key_F4));
}
void MenuBar::AddToolsMenu()
@ -244,8 +244,7 @@ void MenuBar::AddToolsMenu()
tools_menu->addSeparator();
// Label will be set by a NANDRefresh later
m_boot_sysmenu =
tools_menu->addAction(QStringLiteral(""), this, [this] { emit BootWiiSystemMenu(); });
m_boot_sysmenu = tools_menu->addAction(QString{}, this, [this] { emit BootWiiSystemMenu(); });
m_wad_install_action = tools_menu->addAction(tr("Install WAD..."), this, &MenuBar::InstallWAD);
m_manage_nand_menu = tools_menu->addMenu(tr("Manage NAND"));
m_import_backup = m_manage_nand_menu->addAction(tr("Import BootMii NAND Backup..."), this,
@ -328,7 +327,7 @@ void MenuBar::AddStateLoadMenu(QMenu* emu_menu)
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); });
}
@ -345,7 +344,7 @@ void MenuBar::AddStateSaveMenu(QMenu* emu_menu)
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); });
}
@ -358,7 +357,7 @@ void MenuBar::AddStateSlotMenu(QMenu* emu_menu)
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->setActionGroup(m_state_slots);
if (Settings::Instance().GetStateSlot() == i)
@ -482,7 +481,7 @@ void MenuBar::AddViewMenu()
view_menu->addAction(tr("Purge Game List Cache"), this, &MenuBar::PurgeGameListCache);
view_menu->addSeparator();
view_menu->addAction(tr("Search"), this, &MenuBar::ShowSearch,
QKeySequence(QStringLiteral("Ctrl+F")));
QKeySequence(Qt::CTRL + Qt::Key_F));
}
void MenuBar::AddOptionsMenu()
@ -942,7 +941,7 @@ void MenuBar::UpdateToolsMenu(bool emulation_started)
const QString sysmenu_version =
tmd.IsValid() ?
QString::fromStdString(DiscIO::GetSysMenuVersionString(tmd.GetTitleVersion())) :
QStringLiteral("");
QString{};
m_boot_sysmenu->setText(tr("Load Wii System Menu %1").arg(sysmenu_version));
m_boot_sysmenu->setEnabled(tmd.IsValid());
@ -1441,8 +1440,8 @@ void MenuBar::LogInstructions()
void MenuBar::SearchInstruction()
{
bool good;
QString op = QInputDialog::getText(this, tr("Search instruction"), tr("Instruction:"),
QLineEdit::Normal, QStringLiteral(""), &good);
const QString op = QInputDialog::getText(this, tr("Search instruction"), tr("Instruction:"),
QLineEdit::Normal, QString{}, &good);
if (!good)
return;