fix: fix slots for Qt 6

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

4 files changed, 16 insertions, 14 deletions

diff --git a/launcher/ui/pages/global/ProxyPage.cpp b/launcher/ui/pages/global/ProxyPage.cpp
index aefd1e74..f53d74af 100644
--- a/launcher/ui/pages/global/ProxyPage.cpp
+++ b/launcher/ui/pages/global/ProxyPage.cpp
@@ -2,6 +2,7 @@
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (c) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -36,11 +37,11 @@
 #include "ProxyPage.h"
 #include "ui_ProxyPage.h"
 
+#include <QButtonGroup>
 #include <QTabBar>
 
 #include "settings/SettingsObject.h"
 #include "Application.h"
-#include "Application.h"
 
 ProxyPage::ProxyPage(QWidget *parent) : QWidget(parent), ui(new Ui::ProxyPage)
 {
@@ -49,7 +50,8 @@ ProxyPage::ProxyPage(QWidget *parent) : QWidget(parent), ui(new Ui::ProxyPage)
     loadSettings();
     updateCheckboxStuff();
 
-    connect(ui->proxyGroup, SIGNAL(buttonClicked(int)), SLOT(proxyChanged(int)));
+    connect(ui->proxyGroup, QOverload<QAbstractButton *>::of(&QButtonGroup::buttonClicked),
+            this, &ProxyPage::proxyGroupChanged);
 }
 
 ProxyPage::~ProxyPage()
@@ -65,13 +67,13 @@ bool ProxyPage::apply()
 
 void ProxyPage::updateCheckboxStuff()
 {
-    ui->proxyAddrBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-                                 !ui->proxyDefaultBtn->isChecked());
-    ui->proxyAuthBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-                                 !ui->proxyDefaultBtn->isChecked());
+    bool enableEditing = ui->proxyHTTPBtn->isChecked()
+        || ui->proxySOCKS5Btn->isChecked();
+    ui->proxyAddrBox->setEnabled(enableEditing);
+    ui->proxyAuthBox->setEnabled(enableEditing);
 }
 
-void ProxyPage::proxyChanged(int)
+void ProxyPage::proxyGroupChanged(QAbstractButton *button)
 {
     updateCheckboxStuff();
 }
diff --git a/launcher/ui/pages/global/ProxyPage.h b/launcher/ui/pages/global/ProxyPage.h
index e3677774..02c7ec40 100644
--- a/launcher/ui/pages/global/ProxyPage.h
+++ b/launcher/ui/pages/global/ProxyPage.h
@@ -36,6 +36,7 @@
 #pragma once
 
 #include <memory>
+#include <QAbstractButton>
 #include <QDialog>
 
 #include "ui/pages/BasePage.h"
@@ -73,15 +74,14 @@ public:
     bool apply() override;
     void retranslate() override;
 
+private slots:
+    void proxyGroupChanged(QAbstractButton *button);
+
 private:
     void updateCheckboxStuff();
     void applySettings();
     void loadSettings();
 
-private
-slots:
-    void proxyChanged(int);
-
 private:
     Ui::ProxyPage *ui;
 };
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index b9583d86..e5cce96c 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -623,7 +623,7 @@ ServersPage::ServersPage(InstancePtr inst, QWidget* parent)
 
     auto selectionModel = ui->serversView->selectionModel();
     connect(selectionModel, &QItemSelectionModel::currentChanged, this, &ServersPage::currentChanged);
-    connect(m_inst.get(), &MinecraftInstance::runningStatusChanged, this, &ServersPage::on_RunningState_changed);
+    connect(m_inst.get(), &MinecraftInstance::runningStatusChanged, this, &ServersPage::runningStateChanged);
     connect(ui->nameLine, &QLineEdit::textEdited, this, &ServersPage::nameEdited);
     connect(ui->addressLine, &QLineEdit::textEdited, this, &ServersPage::addressEdited);
     connect(ui->resourceComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(resourceIndexChanged(int)));
@@ -663,7 +663,7 @@ QMenu * ServersPage::createPopupMenu()
     return filteredMenu;
 }
 
-void ServersPage::on_RunningState_changed(bool running)
+void ServersPage::runningStateChanged(bool running)
 {
     if(m_locked == running)
     {
diff --git a/launcher/ui/pages/instance/ServersPage.h b/launcher/ui/pages/instance/ServersPage.h
index 5173712c..28339748 100644
--- a/launcher/ui/pages/instance/ServersPage.h
+++ b/launcher/ui/pages/instance/ServersPage.h
@@ -97,7 +97,7 @@ private slots:
     void on_actionMove_Down_triggered();
     void on_actionJoin_triggered();
 
-    void on_RunningState_changed(bool running);
+    void runningStateChanged(bool running);
 
     void nameEdited(const QString & name);
     void addressEdited(const QString & address);