Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

1 files changed, 20 insertions, 33 deletions

diff --git a/launcher/tools/JVisualVM.cpp b/launcher/tools/JVisualVM.cpp
index 28ffb9cd..4da4e1e5 100644
--- a/launcher/tools/JVisualVM.cpp
+++ b/launcher/tools/JVisualVM.cpp
@@ -3,43 +3,36 @@
 #include <QDir>
 #include <QStandardPaths>
 
-#include "settings/SettingsObject.h"
-#include "launch/LaunchTask.h"
 #include "BaseInstance.h"
+#include "launch/LaunchTask.h"
+#include "settings/SettingsObject.h"
 
-class JVisualVM : public BaseProfiler
-{
+class JVisualVM : public BaseProfiler {
     Q_OBJECT
-public:
-    JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
+   public:
+    JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
 
-private slots:
+   private slots:
     void profilerStarted();
     void profilerFinished(int exit, QProcess::ExitStatus status);
 
-protected:
+   protected:
     void beginProfilingImpl(shared_qobject_ptr<LaunchTask> process);
 };
 
-
-JVisualVM::JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
-    : BaseProfiler(settings, instance, parent)
-{
-}
+JVisualVM::JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject* parent) : BaseProfiler(settings, instance, parent) {}
 
 void JVisualVM::profilerStarted()
 {
     emit readyToLaunch(tr("JVisualVM started"));
 }
 
-void JVisualVM::profilerFinished(int exit, QProcess::ExitStatus status)
+void JVisualVM::profilerFinished([[maybe_unused]] int exit, QProcess::ExitStatus status)
 {
-    if (status == QProcess::CrashExit)
-    {
+    if (status == QProcess::CrashExit) {
         emit abortLaunch(tr("Profiler aborted"));
     }
-    if (m_profilerProcess)
-    {
+    if (m_profilerProcess) {
         m_profilerProcess->deleteLater();
         m_profilerProcess = 0;
     }
@@ -47,18 +40,15 @@ void JVisualVM::profilerFinished(int exit, QProcess::ExitStatus status)
 
 void JVisualVM::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
 {
-    QProcess *profiler = new QProcess(this);
-    QStringList profilerArgs =
-    {
-        "--openpid", QString::number(process->pid())
-    };
+    QProcess* profiler = new QProcess(this);
+    QStringList profilerArgs = { "--openpid", QString::number(process->pid()) };
     auto programPath = globalSettings->get("JVisualVMPath").toString();
 
     profiler->setArguments(profilerArgs);
     profiler->setProgram(programPath);
 
     connect(profiler, &QProcess::started, this, &JVisualVM::profilerStarted);
-    connect(profiler, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this,  &JVisualVM::profilerFinished);
+    connect(profiler, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &JVisualVM::profilerFinished);
 
     profiler->start();
     m_profilerProcess = profiler;
@@ -67,34 +57,31 @@ void JVisualVM::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
 void JVisualVMFactory::registerSettings(SettingsObjectPtr settings)
 {
     QString defaultValue = QStandardPaths::findExecutable("jvisualvm");
-    if (defaultValue.isNull())
-    {
+    if (defaultValue.isNull()) {
         defaultValue = QStandardPaths::findExecutable("visualvm");
     }
     settings->registerSetting("JVisualVMPath", defaultValue);
     globalSettings = settings;
 }
 
-BaseExternalTool *JVisualVMFactory::createTool(InstancePtr instance, QObject *parent)
+BaseExternalTool* JVisualVMFactory::createTool(InstancePtr instance, QObject* parent)
 {
     return new JVisualVM(globalSettings, instance, parent);
 }
 
-bool JVisualVMFactory::check(QString *error)
+bool JVisualVMFactory::check(QString* error)
 {
     return check(globalSettings->get("JVisualVMPath").toString(), error);
 }
 
-bool JVisualVMFactory::check(const QString &path, QString *error)
+bool JVisualVMFactory::check(const QString& path, QString* error)
 {
-    if (path.isEmpty())
-    {
+    if (path.isEmpty()) {
         *error = QObject::tr("Empty path");
         return false;
     }
     QFileInfo finfo(path);
-    if (!finfo.isExecutable() || !finfo.fileName().contains("visualvm"))
-    {
+    if (!finfo.isExecutable() || !finfo.fileName().contains("visualvm")) {
         *error = QObject::tr("Invalid path to JVisualVM");
         return false;
     }