From 89ceef2a8ad49e54c62d04c293910292325db977 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 24 Aug 2021 11:13:53 -0400 Subject: [PATCH] MainWindow: Use MainWindow variant of tr() MainWindow derives from QMainWindow, so we can use tr() directly without the qualification. --- Source/Core/DolphinQt/MainWindow.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index b4fc3e7da4..8a687cef47 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -1379,16 +1379,15 @@ bool MainWindow::NetPlayJoin() { if (Core::IsRunning()) { - ModalMessageBox::critical( - nullptr, QObject::tr("Error"), - QObject::tr("Can't start a NetPlay Session while a game is still running!")); + ModalMessageBox::critical(nullptr, tr("Error"), + tr("Can't start a NetPlay Session while a game is still running!")); return false; } if (m_netplay_dialog->isVisible()) { - ModalMessageBox::critical(nullptr, QObject::tr("Error"), - QObject::tr("A NetPlay Session is already in progress!")); + ModalMessageBox::critical(nullptr, tr("Error"), + tr("A NetPlay Session is already in progress!")); return false; } @@ -1447,16 +1446,15 @@ bool MainWindow::NetPlayHost(const UICommon::GameFile& game) { if (Core::IsRunning()) { - ModalMessageBox::critical( - nullptr, QObject::tr("Error"), - QObject::tr("Can't start a NetPlay Session while a game is still running!")); + ModalMessageBox::critical(nullptr, tr("Error"), + tr("Can't start a NetPlay Session while a game is still running!")); return false; } if (m_netplay_dialog->isVisible()) { - ModalMessageBox::critical(nullptr, QObject::tr("Error"), - QObject::tr("A NetPlay Session is already in progress!")); + ModalMessageBox::critical(nullptr, tr("Error"), + tr("A NetPlay Session is already in progress!")); return false; } @@ -1480,9 +1478,8 @@ bool MainWindow::NetPlayHost(const UICommon::GameFile& game) if (!Settings::Instance().GetNetPlayServer()->is_connected) { ModalMessageBox::critical( - nullptr, QObject::tr("Failed to open server"), - QObject::tr( - "Failed to listen on port %1. Is another instance of the NetPlay server running?") + nullptr, tr("Failed to open server"), + tr("Failed to listen on port %1. Is another instance of the NetPlay server running?") .arg(host_port)); NetPlayQuit(); return false;