Farees/eden
1
0
Fork 0
forked from eden-emu/eden
Code Pull requests Activity

[compat] attempt fix qt connections in solaris

Browse source
This commit is contained in:
lizzie 2025-08-03 19:47:14 +01:00
parent 27e1f6adc7
commit 5e40b28e0c
Signed by untrusted user: Lizzie
GPG key ID: D9E134A23AD395CE
4 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/yuzu/configuration/configure_graphics.cpp
View file

@ -295,7 +295,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
api_restore_global_button = widget->restore_button; api_restore_global_button = widget->restore_button;
if (!Settings::IsConfiguringGlobal()) { if (!Settings::IsConfiguringGlobal()) {
QObject::connect(api_restore_global_button, &QAbstractButton::clicked, api_restore_global_button->connect(api_restore_global_button, &QAbstractButton::clicked,
[this](bool) { UpdateAPILayout(); }); [this](bool) { UpdateAPILayout(); });
// Detach API's restore button and place it where we want // Detach API's restore button and place it where we want
@ -327,7 +327,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
restore_button->setEnabled(true); restore_button->setEnabled(true);
widget->layout()->addWidget(restore_button); widget->layout()->addWidget(restore_button);
QObject::connect(restore_button, &QAbstractButton::clicked, restore_button->connect(restore_button, &QAbstractButton::clicked,
[restore_button, this](bool) { [restore_button, this](bool) {
Settings::values.vsync_mode.SetGlobal(true); Settings::values.vsync_mode.SetGlobal(true);
PopulateVSyncModeSelection(true); PopulateVSyncModeSelection(true);
@ -340,7 +340,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
UpdateVsyncSetting(); UpdateVsyncSetting();
restore_button->setVisible(true); restore_button->setVisible(true);
}; };
QObject::connect(widget->combobox, QOverload<int>::of(&QComboBox::activated), widget->combobox->connect(widget->combobox, QOverload<int>::of(&QComboBox::activated),
[set_non_global]() { set_non_global(); }); [set_non_global]() { set_non_global(); });
vsync_restore_global_button = restore_button; vsync_restore_global_button = restore_button;
} }
@ -379,7 +379,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
Settings::values.bg_red.UsingGlobal(), ui->bg_widget); Settings::values.bg_red.UsingGlobal(), ui->bg_widget);
ui->bg_widget->layout()->addWidget(bg_restore_button); ui->bg_widget->layout()->addWidget(bg_restore_button);
QObject::connect(bg_restore_button, &QAbstractButton::clicked, bg_restore_button->connect(bg_restore_button, &QAbstractButton::clicked,
[bg_restore_button, this](bool) { [bg_restore_button, this](bool) {
const int r = Settings::values.bg_red.GetValue(true); const int r = Settings::values.bg_red.GetValue(true);
const int g = Settings::values.bg_green.GetValue(true); const int g = Settings::values.bg_green.GetValue(true);
@ -390,7 +390,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
bg_restore_button->setEnabled(false); bg_restore_button->setEnabled(false);
}); });
QObject::connect(ui->bg_button, &QAbstractButton::clicked, [bg_restore_button](bool) { ui->bg_button->connect(ui->bg_button, &QAbstractButton::clicked, [bg_restore_button](bool) {
bg_restore_button->setVisible(true); bg_restore_button->setVisible(true);
bg_restore_button->setEnabled(true); bg_restore_button->setEnabled(true);
}); });

28
src/yuzu/configuration/shared_widget.cpp
View file

@ -118,7 +118,7 @@ QWidget* Widget::CreateCheckBox(Settings::BasicSetting* bool_setting, const QStr
}; };
if (!Settings::IsConfiguringGlobal()) { if (!Settings::IsConfiguringGlobal()) {
QObject::connect(checkbox, &QCheckBox::clicked, [touch]() { touch(); }); checkbox->connect(checkbox, &QCheckBox::clicked, [touch]() { touch(); });
} }
return checkbox; return checkbox;
@ -165,7 +165,7 @@ QWidget* Widget::CreateCombobox(std::function<std::string()>& serializer,
}; };
if (!Settings::IsConfiguringGlobal()) { if (!Settings::IsConfiguringGlobal()) {
QObject::connect(combobox, QOverload<int>::of(&QComboBox::activated), combobox->connect(combobox, QOverload<int>::of(&QComboBox::activated),
[touch]() { touch(); }); [touch]() { touch(); });
} }
@ -223,9 +223,8 @@ QWidget* Widget::CreateRadioGroup(std::function<std::string()>& serializer,
}; };
if (!Settings::IsConfiguringGlobal()) { if (!Settings::IsConfiguringGlobal()) {
for (const auto& [id, button] : radio_buttons) { for (const auto& [id, button] : radio_buttons)
QObject::connect(button, &QAbstractButton::clicked, [touch]() { touch(); }); button->connect(button, &QAbstractButton::clicked, [touch]() { touch(); });
}
} }
return group; return group;
@ -249,7 +248,7 @@ QWidget* Widget::CreateLineEdit(std::function<std::string()>& serializer,
}; };
if (!Settings::IsConfiguringGlobal()) { if (!Settings::IsConfiguringGlobal()) {
QObject::connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); }); line_edit->connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); });
} }
return line_edit; return line_edit;
@ -266,7 +265,7 @@ static void CreateIntSlider(Settings::BasicSetting& setting, bool reversed, floa
feedback->setText(use_format.arg(QVariant::fromValue(present).value<QString>())); feedback->setText(use_format.arg(QVariant::fromValue(present).value<QString>()));
}; };
QObject::connect(slider, &QAbstractSlider::valueChanged, update_feedback); slider->connect(slider, &QAbstractSlider::valueChanged, update_feedback);
update_feedback(std::strtol(setting.ToString().c_str(), nullptr, 0)); update_feedback(std::strtol(setting.ToString().c_str(), nullptr, 0));
slider->setMinimum(std::strtol(setting.MinVal().c_str(), nullptr, 0)); slider->setMinimum(std::strtol(setting.MinVal().c_str(), nullptr, 0));
@ -293,7 +292,7 @@ static void CreateFloatSlider(Settings::BasicSetting& setting, bool reversed, fl
feedback->setText(use_format.arg(QVariant::fromValue(present).value<QString>())); feedback->setText(use_format.arg(QVariant::fromValue(present).value<QString>()));
}; };
QObject::connect(slider, &QAbstractSlider::valueChanged, update_feedback); slider->connect(slider, &QAbstractSlider::valueChanged, update_feedback);
update_feedback(std::strtof(setting.ToString().c_str(), nullptr)); update_feedback(std::strtof(setting.ToString().c_str(), nullptr));
slider->setMinimum(min_val * use_multiplier); slider->setMinimum(min_val * use_multiplier);
@ -346,7 +345,7 @@ QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& gi
slider->setInvertedAppearance(reversed); slider->setInvertedAppearance(reversed);
if (!Settings::IsConfiguringGlobal()) { if (!Settings::IsConfiguringGlobal()) {
QObject::connect(slider, &QAbstractSlider::actionTriggered, [touch]() { touch(); }); slider->connect(slider, &QAbstractSlider::actionTriggered, [touch]() { touch(); });
} }
return container; return container;
@ -376,7 +375,7 @@ QWidget* Widget::CreateSpinBox(const QString& given_suffix,
}; };
if (!Settings::IsConfiguringGlobal()) { if (!Settings::IsConfiguringGlobal()) {
QObject::connect(spinbox, QOverload<int>::of(&QSpinBox::valueChanged), [this, touch]() { spinbox->connect(spinbox, QOverload<int>::of(&QSpinBox::valueChanged), [this, touch]() {
if (spinbox->value() != std::strtol(setting.ToStringGlobal().c_str(), nullptr, 0)) { if (spinbox->value() != std::strtol(setting.ToStringGlobal().c_str(), nullptr, 0)) {
touch(); touch();
} }
@ -410,7 +409,7 @@ QWidget* Widget::CreateDoubleSpinBox(const QString& given_suffix,
}; };
if (!Settings::IsConfiguringGlobal()) { if (!Settings::IsConfiguringGlobal()) {
QObject::connect(double_spinbox, QOverload<double>::of(&QDoubleSpinBox::valueChanged), double_spinbox->connect(double_spinbox, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
[this, touch]() { [this, touch]() {
if (double_spinbox->value() != if (double_spinbox->value() !=
std::strtod(setting.ToStringGlobal().c_str(), nullptr)) { std::strtod(setting.ToStringGlobal().c_str(), nullptr)) {
@ -453,8 +452,7 @@ QWidget* Widget::CreateHexEdit(std::function<std::string()>& serializer,
restore_func = [this, to_hex]() { line_edit->setText(to_hex(RelevantDefault(setting))); }; restore_func = [this, to_hex]() { line_edit->setText(to_hex(RelevantDefault(setting))); };
if (!Settings::IsConfiguringGlobal()) { if (!Settings::IsConfiguringGlobal()) {
line_edit->connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); });
QObject::connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); });
} }
return line_edit; return line_edit;
@ -488,7 +486,7 @@ QWidget* Widget::CreateDateTimeEdit(bool disabled, bool restrict,
restore_func = [this, get_clear_val]() { date_time_edit->setDateTime(get_clear_val()); }; restore_func = [this, get_clear_val]() { date_time_edit->setDateTime(get_clear_val()); };
if (!Settings::IsConfiguringGlobal()) { if (!Settings::IsConfiguringGlobal()) {
QObject::connect(date_time_edit, &QDateTimeEdit::editingFinished, date_time_edit->connect(date_time_edit, &QDateTimeEdit::editingFinished,
[this, get_clear_val, touch]() { [this, get_clear_val, touch]() {
if (date_time_edit->dateTime() != get_clear_val()) { if (date_time_edit->dateTime() != get_clear_val()) {
touch(); touch();
@ -665,7 +663,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
} else { } else {
layout->addWidget(restore_button); layout->addWidget(restore_button);
QObject::connect(restore_button, &QAbstractButton::clicked, restore_button->connect(restore_button, &QAbstractButton::clicked,
[this, restore_func, checkbox_restore_func](bool) { [this, restore_func, checkbox_restore_func](bool) {
LOG_DEBUG(Frontend, "Restore global state for \"{}\"", LOG_DEBUG(Frontend, "Restore global state for \"{}\"",
setting.GetLabel()); setting.GetLabel());

2
src/yuzu/discord_impl.cpp
View file

@ -100,7 +100,7 @@ void DiscordImpl::Update() {
request.setTransferTimeout(3000); request.setTransferTimeout(3000);
QNetworkReply* reply = manager.head(request); QNetworkReply* reply = manager.head(request);
QEventLoop request_event_loop; QEventLoop request_event_loop;
QObject::connect(reply, &QNetworkReply::finished, &request_event_loop, &QEventLoop::quit); reply->connect(reply, &QNetworkReply::finished, &request_event_loop, &QEventLoop::quit);
request_event_loop.exec(); request_event_loop.exec();
UpdateGameStatus(reply->error()); UpdateGameStatus(reply->error());

4
src/yuzu/main.cpp
View file

@ -536,7 +536,7 @@ GMainWindow::GMainWindow(bool has_broken_vulkan)
} }
return QString{}; return QString{};
}); });
QObject::connect(&update_watcher, &QFutureWatcher<QString>::finished, this, update_watcher.connect(&update_watcher, &QFutureWatcher<QString>::finished, this,
&GMainWindow::OnEmulatorUpdateAvailable); &GMainWindow::OnEmulatorUpdateAvailable);
update_watcher.setFuture(update_future); update_watcher.setFuture(update_future);
} }
@ -5786,7 +5786,7 @@ int main(int argc, char* argv[]) {
// After settings have been loaded by GMainWindow, apply the filter // After settings have been loaded by GMainWindow, apply the filter
main_window.show(); main_window.show();
QObject::connect(&app, &QGuiApplication::applicationStateChanged, &main_window, app.connect(&app, &QGuiApplication::applicationStateChanged, &main_window,
&GMainWindow::OnAppFocusStateChanged); &GMainWindow::OnAppFocusStateChanged);
int result = app.exec(); int result = app.exec();