From dd3ada04334609deb347a42adc1400026790ad9e Mon Sep 17 00:00:00 2001 From: lizzie Date: Sun, 3 Aug 2025 19:47:14 +0100 Subject: [PATCH] [compat] attempt fix qt connections in solaris --- src/yuzu/configuration/configure_graphics.cpp | 10 +++---- src/yuzu/configuration/shared_widget.cpp | 28 +++++++++---------- src/yuzu/discord_impl.cpp | 2 +- src/yuzu/main.cpp | 4 +-- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 54c931e56c..16846878f9 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp @@ -295,7 +295,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) { api_restore_global_button = widget->restore_button; 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(); }); // 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); widget->layout()->addWidget(restore_button); - QObject::connect(restore_button, &QAbstractButton::clicked, + restore_button->connect(restore_button, &QAbstractButton::clicked, [restore_button, this](bool) { Settings::values.vsync_mode.SetGlobal(true); PopulateVSyncModeSelection(true); @@ -340,7 +340,7 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) { UpdateVsyncSetting(); restore_button->setVisible(true); }; - QObject::connect(widget->combobox, QOverload::of(&QComboBox::activated), + widget->combobox->connect(widget->combobox, QOverload::of(&QComboBox::activated), [set_non_global]() { set_non_global(); }); 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); 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) { const int r = Settings::values.bg_red.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); }); - 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->setEnabled(true); }); diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp index c27a4644e9..e23d86dc69 100644 --- a/src/yuzu/configuration/shared_widget.cpp +++ b/src/yuzu/configuration/shared_widget.cpp @@ -118,7 +118,7 @@ QWidget* Widget::CreateCheckBox(Settings::BasicSetting* bool_setting, const QStr }; if (!Settings::IsConfiguringGlobal()) { - QObject::connect(checkbox, &QCheckBox::clicked, [touch]() { touch(); }); + checkbox->connect(checkbox, &QCheckBox::clicked, [touch]() { touch(); }); } return checkbox; @@ -165,7 +165,7 @@ QWidget* Widget::CreateCombobox(std::function& serializer, }; if (!Settings::IsConfiguringGlobal()) { - QObject::connect(combobox, QOverload::of(&QComboBox::activated), + combobox->connect(combobox, QOverload::of(&QComboBox::activated), [touch]() { touch(); }); } @@ -223,9 +223,8 @@ QWidget* Widget::CreateRadioGroup(std::function& serializer, }; if (!Settings::IsConfiguringGlobal()) { - for (const auto& [id, button] : radio_buttons) { - QObject::connect(button, &QAbstractButton::clicked, [touch]() { touch(); }); - } + for (const auto& [id, button] : radio_buttons) + button->connect(button, &QAbstractButton::clicked, [touch]() { touch(); }); } return group; @@ -249,7 +248,7 @@ QWidget* Widget::CreateLineEdit(std::function& serializer, }; if (!Settings::IsConfiguringGlobal()) { - QObject::connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); }); + line_edit->connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); }); } 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())); }; - QObject::connect(slider, &QAbstractSlider::valueChanged, update_feedback); + slider->connect(slider, &QAbstractSlider::valueChanged, update_feedback); update_feedback(std::strtol(setting.ToString().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())); }; - QObject::connect(slider, &QAbstractSlider::valueChanged, update_feedback); + slider->connect(slider, &QAbstractSlider::valueChanged, update_feedback); update_feedback(std::strtof(setting.ToString().c_str(), nullptr)); slider->setMinimum(min_val * use_multiplier); @@ -346,7 +345,7 @@ QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& gi slider->setInvertedAppearance(reversed); if (!Settings::IsConfiguringGlobal()) { - QObject::connect(slider, &QAbstractSlider::actionTriggered, [touch]() { touch(); }); + slider->connect(slider, &QAbstractSlider::actionTriggered, [touch]() { touch(); }); } return container; @@ -376,7 +375,7 @@ QWidget* Widget::CreateSpinBox(const QString& given_suffix, }; if (!Settings::IsConfiguringGlobal()) { - QObject::connect(spinbox, QOverload::of(&QSpinBox::valueChanged), [this, touch]() { + spinbox->connect(spinbox, QOverload::of(&QSpinBox::valueChanged), [this, touch]() { if (spinbox->value() != std::strtol(setting.ToStringGlobal().c_str(), nullptr, 0)) { touch(); } @@ -410,7 +409,7 @@ QWidget* Widget::CreateDoubleSpinBox(const QString& given_suffix, }; if (!Settings::IsConfiguringGlobal()) { - QObject::connect(double_spinbox, QOverload::of(&QDoubleSpinBox::valueChanged), + double_spinbox->connect(double_spinbox, QOverload::of(&QDoubleSpinBox::valueChanged), [this, touch]() { if (double_spinbox->value() != std::strtod(setting.ToStringGlobal().c_str(), nullptr)) { @@ -453,8 +452,7 @@ QWidget* Widget::CreateHexEdit(std::function& serializer, restore_func = [this, to_hex]() { line_edit->setText(to_hex(RelevantDefault(setting))); }; if (!Settings::IsConfiguringGlobal()) { - - QObject::connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); }); + line_edit->connect(line_edit, &QLineEdit::textChanged, [touch]() { touch(); }); } 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()); }; if (!Settings::IsConfiguringGlobal()) { - QObject::connect(date_time_edit, &QDateTimeEdit::editingFinished, + date_time_edit->connect(date_time_edit, &QDateTimeEdit::editingFinished, [this, get_clear_val, touch]() { if (date_time_edit->dateTime() != get_clear_val()) { touch(); @@ -665,7 +663,7 @@ void Widget::SetupComponent(const QString& label, std::function& load_fu } else { layout->addWidget(restore_button); - QObject::connect(restore_button, &QAbstractButton::clicked, + restore_button->connect(restore_button, &QAbstractButton::clicked, [this, restore_func, checkbox_restore_func](bool) { LOG_DEBUG(Frontend, "Restore global state for \"{}\"", setting.GetLabel()); diff --git a/src/yuzu/discord_impl.cpp b/src/yuzu/discord_impl.cpp index 04f4ddb3a1..497fa0f115 100644 --- a/src/yuzu/discord_impl.cpp +++ b/src/yuzu/discord_impl.cpp @@ -100,7 +100,7 @@ void DiscordImpl::Update() { request.setTransferTimeout(3000); QNetworkReply* reply = manager.head(request); 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(); UpdateGameStatus(reply->error()); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 2ad8ed9720..4e0ff685bf 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -536,7 +536,7 @@ GMainWindow::GMainWindow(bool has_broken_vulkan) } return QString{}; }); - QObject::connect(&update_watcher, &QFutureWatcher::finished, this, + update_watcher.connect(&update_watcher, &QFutureWatcher::finished, this, &GMainWindow::OnEmulatorUpdateAvailable); 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 main_window.show(); - QObject::connect(&app, &QGuiApplication::applicationStateChanged, &main_window, + app.connect(&app, &QGuiApplication::applicationStateChanged, &main_window, &GMainWindow::OnAppFocusStateChanged); int result = app.exec();