Github/PrismLauncher
1
0
Fork 1
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-08 13:08:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor!!!: migrate from shared pointers

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2026-01-07 19:16:54 +05:00
parent c64d871a28
commit 549405ab2f
No known key found for this signature in database
GPG key ID: B77C34313AEE1FFF
199 changed files with 742 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

6
launcher/tools/BaseExternalTool.cpp
View file

@ -9,13 +9,13 @@
#include "BaseInstance.h"
BaseExternalTool::BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject* parent)
BaseExternalTool::BaseExternalTool(SettingsObject* settings, BaseInstance* instance, QObject* parent)
: QObject(parent), m_instance(instance), globalSettings(settings)
{}
BaseExternalTool::~BaseExternalTool() {}
BaseDetachedTool::BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject* parent)
BaseDetachedTool::BaseDetachedTool(SettingsObject* settings, BaseInstance* instance, QObject* parent)
: BaseExternalTool(settings, instance, parent)
{}
@ -26,7 +26,7 @@ void BaseDetachedTool::run()
BaseExternalToolFactory::~BaseExternalToolFactory() {}
BaseDetachedTool* BaseDetachedToolFactory::createDetachedTool(InstancePtr instance, QObject* parent)
BaseDetachedTool* BaseDetachedToolFactory::createDetachedTool(BaseInstance* instance, QObject* parent)
{
return qobject_cast<BaseDetachedTool*>(createTool(instance, parent));
}

16
launcher/tools/BaseExternalTool.h
View file

@ -10,18 +10,18 @@ class QProcess;
class BaseExternalTool : public QObject {
Q_OBJECT
public:
explicit BaseExternalTool(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
explicit BaseExternalTool(SettingsObject* settings, BaseInstance* instance, QObject* parent = 0);
virtual ~BaseExternalTool();
protected:
InstancePtr m_instance;
SettingsObjectPtr globalSettings;
BaseInstance* m_instance;
SettingsObject* globalSettings;
};
class BaseDetachedTool : public BaseExternalTool {
Q_OBJECT
public:
explicit BaseDetachedTool(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
explicit BaseDetachedTool(SettingsObject* settings, BaseInstance* instance, QObject* parent = 0);
public slots:
void run();
@ -36,18 +36,18 @@ class BaseExternalToolFactory {
virtual QString name() const = 0;
virtual void registerSettings(SettingsObjectPtr settings) = 0;
virtual void registerSettings(SettingsObject* settings) = 0;
virtual BaseExternalTool* createTool(InstancePtr instance, QObject* parent = 0) = 0;
virtual BaseExternalTool* createTool(BaseInstance* instance, QObject* parent = 0) = 0;
virtual bool check(QString* error) = 0;
virtual bool check(const QString& path, QString* error) = 0;
protected:
SettingsObjectPtr globalSettings;
SettingsObject* globalSettings;
};
class BaseDetachedToolFactory : public BaseExternalToolFactory {
public:
virtual BaseDetachedTool* createDetachedTool(InstancePtr instance, QObject* parent = 0);
virtual BaseDetachedTool* createDetachedTool(BaseInstance* instance, QObject* parent = 0);
};

6
launcher/tools/BaseProfiler.cpp
View file

@ -3,10 +3,10 @@
#include <QProcess>
BaseProfiler::BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent) : BaseExternalTool(settings, instance, parent)
BaseProfiler::BaseProfiler(SettingsObject* settings, BaseInstance* instance, QObject* parent) : BaseExternalTool(settings, instance, parent)
{}
void BaseProfiler::beginProfiling(shared_qobject_ptr<LaunchTask> process)
void BaseProfiler::beginProfiling(LaunchTask* process)
{
beginProfilingImpl(process);
}
@ -27,7 +27,7 @@ void BaseProfiler::abortProfilingImpl()
emit abortLaunch(tr("Profiler aborted"));
}
BaseProfiler* BaseProfilerFactory::createProfiler(InstancePtr instance, QObject* parent)
BaseProfiler* BaseProfilerFactory::createProfiler(BaseInstance* instance, QObject* parent)
{
return qobject_cast<BaseProfiler*>(createTool(instance, parent));
}

8
launcher/tools/BaseProfiler.h
View file

@ -11,16 +11,16 @@ class QProcess;
class BaseProfiler : public BaseExternalTool {
Q_OBJECT
public:
explicit BaseProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
explicit BaseProfiler(SettingsObject* settings, BaseInstance* instance, QObject* parent = 0);
public slots:
void beginProfiling(shared_qobject_ptr<LaunchTask> process);
void beginProfiling(LaunchTask* process);
void abortProfiling();
protected:
QProcess* m_profilerProcess;
virtual void beginProfilingImpl(shared_qobject_ptr<LaunchTask> process) = 0;
virtual void beginProfilingImpl(LaunchTask* process) = 0;
virtual void abortProfilingImpl();
signals:
@ -30,5 +30,5 @@ class BaseProfiler : public BaseExternalTool {
class BaseProfilerFactory : public BaseExternalToolFactory {
public:
virtual BaseProfiler* createProfiler(InstancePtr instance, QObject* parent = 0);
virtual BaseProfiler* createProfiler(BaseInstance* instance, QObject* parent = 0);
};

10
launcher/tools/GenericProfiler.cpp
View file

@ -24,22 +24,22 @@
class GenericProfiler : public BaseProfiler {
Q_OBJECT
public:
GenericProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
GenericProfiler(SettingsObject* settings, BaseInstance* instance, QObject* parent = 0);
protected:
void beginProfilingImpl(shared_qobject_ptr<LaunchTask> process);
void beginProfilingImpl(LaunchTask* process);
};
GenericProfiler::GenericProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent)
GenericProfiler::GenericProfiler(SettingsObject* settings, BaseInstance* instance, QObject* parent)
: BaseProfiler(settings, instance, parent)
{}
void GenericProfiler::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
void GenericProfiler::beginProfilingImpl(LaunchTask* process)
{
emit readyToLaunch(tr("Started process: %1").arg(process->pid()));
}
BaseExternalTool* GenericProfilerFactory::createTool(InstancePtr instance, QObject* parent)
BaseExternalTool* GenericProfilerFactory::createTool(BaseInstance* instance, QObject* parent)
{
return new GenericProfiler(globalSettings, instance, parent);
}

4
launcher/tools/GenericProfiler.h
View file

@ -22,8 +22,8 @@
class GenericProfilerFactory : public BaseProfilerFactory {
public:
QString name() const override { return "Generic"; }
void registerSettings([[maybe_unused]] SettingsObjectPtr settings) override {};
BaseExternalTool* createTool(InstancePtr instance, QObject* parent = 0) override;
void registerSettings([[maybe_unused]] SettingsObject* settings) override {};
BaseExternalTool* createTool(BaseInstance* instance, QObject* parent = 0) override;
bool check([[maybe_unused]] QString* error) override { return true; };
bool check([[maybe_unused]] const QString& path, [[maybe_unused]] QString* error) override { return true; };
};

12
launcher/tools/JProfiler.cpp
View file

@ -9,20 +9,20 @@
class JProfiler : public BaseProfiler {
Q_OBJECT
public:
JProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
JProfiler(SettingsObject* settings, BaseInstance* instance, QObject* parent = 0);
private slots:
void profilerStarted();
void profilerFinished(int exit, QProcess::ExitStatus status);
protected:
void beginProfilingImpl(shared_qobject_ptr<LaunchTask> process);
void beginProfilingImpl(LaunchTask* process);
private:
int listeningPort = 0;
};
JProfiler::JProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent) : BaseProfiler(settings, instance, parent) {}
JProfiler::JProfiler(SettingsObject* settings, BaseInstance* instance, QObject* parent) : BaseProfiler(settings, instance, parent) {}
void JProfiler::profilerStarted()
{
@ -40,7 +40,7 @@ void JProfiler::profilerFinished([[maybe_unused]] int exit, QProcess::ExitStatus
}
}
void JProfiler::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
void JProfiler::beginProfilingImpl(LaunchTask* process)
{
listeningPort = globalSettings->get("JProfilerPort").toInt();
QProcess* profiler = new QProcess(this);
@ -63,14 +63,14 @@ void JProfiler::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
profiler->start();
}
void JProfilerFactory::registerSettings(SettingsObjectPtr settings)
void JProfilerFactory::registerSettings(SettingsObject* settings)
{
settings->registerSetting("JProfilerPath");
settings->registerSetting("JProfilerPort", 42042);
globalSettings = settings;
}
BaseExternalTool* JProfilerFactory::createTool(InstancePtr instance, QObject* parent)
BaseExternalTool* JProfilerFactory::createTool(BaseInstance* instance, QObject* parent)
{
return new JProfiler(globalSettings, instance, parent);
}

4
launcher/tools/JProfiler.h
View file

@ -5,8 +5,8 @@
class JProfilerFactory : public BaseProfilerFactory {
public:
QString name() const override { return "JProfiler"; }
void registerSettings(SettingsObjectPtr settings) override;
BaseExternalTool* createTool(InstancePtr instance, QObject* parent = 0) override;
void registerSettings(SettingsObject* settings) override;
BaseExternalTool* createTool(BaseInstance* instance, QObject* parent = 0) override;
bool check(QString* error) override;
bool check(const QString& path, QString* error) override;
};

12
launcher/tools/JVisualVM.cpp
View file

@ -10,17 +10,17 @@
class JVisualVM : public BaseProfiler {
Q_OBJECT
public:
JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
JVisualVM(SettingsObject* settings, BaseInstance* instance, QObject* parent = 0);
private slots:
void profilerStarted();
void profilerFinished(int exit, QProcess::ExitStatus status);
protected:
void beginProfilingImpl(shared_qobject_ptr<LaunchTask> process);
void beginProfilingImpl(LaunchTask* process);
};
JVisualVM::JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject* parent) : BaseProfiler(settings, instance, parent) {}
JVisualVM::JVisualVM(SettingsObject* settings, BaseInstance* instance, QObject* parent) : BaseProfiler(settings, instance, parent) {}
void JVisualVM::profilerStarted()
{
@ -38,7 +38,7 @@ void JVisualVM::profilerFinished([[maybe_unused]] int exit, QProcess::ExitStatus
}
}
void JVisualVM::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
void JVisualVM::beginProfilingImpl(LaunchTask* process)
{
QProcess* profiler = new QProcess(this);
QStringList profilerArgs = { "--openpid", QString::number(process->pid()) };
@ -54,7 +54,7 @@ void JVisualVM::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
m_profilerProcess = profiler;
}
void JVisualVMFactory::registerSettings(SettingsObjectPtr settings)
void JVisualVMFactory::registerSettings(SettingsObject* settings)
{
QString defaultValue = QStandardPaths::findExecutable("jvisualvm");
if (defaultValue.isNull()) {
@ -64,7 +64,7 @@ void JVisualVMFactory::registerSettings(SettingsObjectPtr settings)
globalSettings = settings;
}
BaseExternalTool* JVisualVMFactory::createTool(InstancePtr instance, QObject* parent)
BaseExternalTool* JVisualVMFactory::createTool(BaseInstance* instance, QObject* parent)
{
return new JVisualVM(globalSettings, instance, parent);
}

4
launcher/tools/JVisualVM.h
View file

@ -5,8 +5,8 @@
class JVisualVMFactory : public BaseProfilerFactory {
public:
QString name() const override { return "VisualVM"; }
void registerSettings(SettingsObjectPtr settings) override;
BaseExternalTool* createTool(InstancePtr instance, QObject* parent = 0) override;
void registerSettings(SettingsObject* settings) override;
BaseExternalTool* createTool(BaseInstance* instance, QObject* parent = 0) override;
bool check(QString* error) override;
bool check(const QString& path, QString* error) override;
};

2
launcher/tools/MCEditTool.cpp
View file

@ -8,7 +8,7 @@
#include "minecraft/MinecraftInstance.h"
#include "settings/SettingsObject.h"
MCEditTool::MCEditTool(SettingsObjectPtr settings)
MCEditTool::MCEditTool(SettingsObject* settings)
{
settings->registerSetting("MCEditPath");
m_settings = settings;

4
launcher/tools/MCEditTool.h
View file

@ -5,12 +5,12 @@
class MCEditTool {
public:
MCEditTool(SettingsObjectPtr settings);
MCEditTool(SettingsObject* settings);
void setPath(QString& path);
QString path() const;
bool check(const QString& toolPath, QString& error);
QString getProgramPath();
private:
SettingsObjectPtr m_settings;
SettingsObject* m_settings;
};