RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-11 01:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

overlays: fix some warnings, simplify code, use move and references

Browse source
This commit is contained in:
Megamouse 2023-08-22 23:31:08 +02:00
parent 4794869bd8
commit d8af3ea855
13 changed files with 65 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/rpcs3qt/msg_dialog_frame.cpp
View file

@ -5,8 +5,6 @@
#include <QPushButton>
#include <QFormLayout>
constexpr auto qstr = QString::fromStdString;
void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
{
state = MsgDialogState::Open;
@ -16,10 +14,10 @@ void msg_dialog_frame::Create(const std::string& msg, const std::string& title)
Close(true);
m_dialog = new custom_dialog(type.disable_cancel);
m_dialog->setWindowTitle(title.empty() ? (type.se_normal ? tr("Normal dialog") : tr("Error dialog")) : qstr(title));
m_dialog->setWindowTitle(title.empty() ? (type.se_normal ? tr("Normal dialog") : tr("Error dialog")) : QString::fromStdString(title));
m_dialog->setWindowOpacity(type.bg_invisible ? 1. : 0.75);
m_text = new QLabel(qstr(msg));
m_text = new QLabel(QString::fromStdString(msg));
m_text->setAlignment(Qt::AlignCenter);
// Layout
@ -159,7 +157,7 @@ void msg_dialog_frame::SetMsg(const std::string& msg)
{
if (m_dialog)
{
m_text->setText(qstr(msg));
m_text->setText(QString::fromStdString(msg));
}
}
@ -171,14 +169,14 @@ void msg_dialog_frame::ProgressBarSetMsg(u32 index, const std::string& msg)
{
if (m_text1)
{
m_text1->setText(qstr(msg));
m_text1->setText(QString::fromStdString(msg));
}
}
else if (index == 1)
{
if (m_text2)
{
m_text2->setText(qstr(msg));
m_text2->setText(QString::fromStdString(msg));
}
}
}