CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix many memory leaks.

Browse Source
This commit is contained in:
Petr Mrázek
2014-03-30 20:11:05 +02:00
parent e1e1d99102
commit fbc29b6a06
35 changed files with 139 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
logic/tools/BaseExternalTool.cpp
View File

@ -11,7 +11,7 @@
#include "logic/BaseInstance.h"
#include "MultiMC.h"
BaseExternalTool::BaseExternalTool(BaseInstance *instance, QObject *parent)
BaseExternalTool::BaseExternalTool(InstancePtr instance, QObject *parent)
: QObject(parent), m_instance(instance)
{
}
@ -55,7 +55,7 @@ QString BaseExternalTool::getSave() const
}
BaseDetachedTool::BaseDetachedTool(BaseInstance *instance, QObject *parent)
BaseDetachedTool::BaseDetachedTool(InstancePtr instance, QObject *parent)
: BaseExternalTool(instance, parent)
{
@ -71,7 +71,8 @@ BaseExternalToolFactory::~BaseExternalToolFactory()
{
}
BaseDetachedTool *BaseDetachedToolFactory::createDetachedTool(BaseInstance *instance, QObject *parent)
BaseDetachedTool *BaseDetachedToolFactory::createDetachedTool(InstancePtr instance,
QObject *parent)
{
return qobject_cast<BaseDetachedTool *>(createTool(instance, parent));
}

11
logic/tools/BaseExternalTool.h
View File

@ -1,6 +1,7 @@
#pragma once
#include <QObject>
#include <logic/BaseInstance.h>
class BaseInstance;
class SettingsObject;
@ -11,11 +12,11 @@ class BaseExternalTool : public QObject
{
Q_OBJECT
public:
explicit BaseExternalTool(BaseInstance *instance, QObject *parent = 0);
explicit BaseExternalTool(InstancePtr instance, QObject *parent = 0);
virtual ~BaseExternalTool();
protected:
BaseInstance *m_instance;
InstancePtr m_instance;
qint64 pid(QProcess *process);
QString getSave() const;
@ -25,7 +26,7 @@ class BaseDetachedTool : public BaseExternalTool
{
Q_OBJECT
public:
explicit BaseDetachedTool(BaseInstance *instance, QObject *parent = 0);
explicit BaseDetachedTool(InstancePtr instance, QObject *parent = 0);
public
slots:
@ -44,7 +45,7 @@ public:
virtual void registerSettings(SettingsObject *settings) = 0;
virtual BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) = 0;
virtual BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) = 0;
virtual bool check(QString *error) = 0;
virtual bool check(const QString &path, QString *error) = 0;
@ -53,5 +54,5 @@ public:
class BaseDetachedToolFactory : public BaseExternalToolFactory
{
public:
virtual BaseDetachedTool *createDetachedTool(BaseInstance *instance, QObject *parent = 0);
virtual BaseDetachedTool *createDetachedTool(InstancePtr instance, QObject *parent = 0);
};

4
logic/tools/BaseProfiler.cpp
View File

@ -2,7 +2,7 @@
#include <QProcess>
BaseProfiler::BaseProfiler(BaseInstance *instance, QObject *parent)
BaseProfiler::BaseProfiler(InstancePtr instance, QObject *parent)
: BaseExternalTool(instance, parent)
{
}
@ -29,7 +29,7 @@ void BaseProfiler::abortProfilingImpl()
emit abortLaunch(tr("Profiler aborted"));
}
BaseProfiler *BaseProfilerFactory::createProfiler(BaseInstance *instance, QObject *parent)
BaseProfiler *BaseProfilerFactory::createProfiler(InstancePtr instance, QObject *parent)
{
return qobject_cast<BaseProfiler *>(createTool(instance, parent));
}

4
logic/tools/BaseProfiler.h
View File

@ -11,7 +11,7 @@ class BaseProfiler : public BaseExternalTool
{
Q_OBJECT
public:
explicit BaseProfiler(BaseInstance *instance, QObject *parent = 0);
explicit BaseProfiler(InstancePtr instance, QObject *parent = 0);
public
slots:
@ -32,5 +32,5 @@ signals:
class BaseProfilerFactory : public BaseExternalToolFactory
{
public:
virtual BaseProfiler *createProfiler(BaseInstance *instance, QObject *parent = 0);
virtual BaseProfiler *createProfiler(InstancePtr instance, QObject *parent = 0);
};

4
logic/tools/JProfiler.cpp
View File

@ -8,7 +8,7 @@
#include "logic/BaseInstance.h"
#include "MultiMC.h"
JProfiler::JProfiler(BaseInstance *instance, QObject *parent) : BaseProfiler(instance, parent)
JProfiler::JProfiler(InstancePtr instance, QObject *parent) : BaseProfiler(instance, parent)
{
}
@ -46,7 +46,7 @@ void JProfilerFactory::registerSettings(SettingsObject *settings)
settings->registerSetting("JProfilerPort", 42042);
}
BaseExternalTool *JProfilerFactory::createTool(BaseInstance *instance, QObject *parent)
BaseExternalTool *JProfilerFactory::createTool(InstancePtr instance, QObject *parent)
{
return new JProfiler(instance, parent);
}

4
logic/tools/JProfiler.h
View File

@ -6,7 +6,7 @@ class JProfiler : public BaseProfiler
{
Q_OBJECT
public:
JProfiler(BaseInstance *instance, QObject *parent = 0);
JProfiler(InstancePtr instance, QObject *parent = 0);
protected:
void beginProfilingImpl(MinecraftProcess *process);
@ -17,7 +17,7 @@ class JProfilerFactory : public BaseProfilerFactory
public:
QString name() const override { return "JProfiler"; }
void registerSettings(SettingsObject *settings) override;
BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override;
BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override;
bool check(QString *error) override;
bool check(const QString &path, QString *error) override;
};

4
logic/tools/JVisualVM.cpp
View File

@ -8,7 +8,7 @@
#include "logic/BaseInstance.h"
#include "MultiMC.h"
JVisualVM::JVisualVM(BaseInstance *instance, QObject *parent) : BaseProfiler(instance, parent)
JVisualVM::JVisualVM(InstancePtr instance, QObject *parent) : BaseProfiler(instance, parent)
{
}
@ -47,7 +47,7 @@ void JVisualVMFactory::registerSettings(SettingsObject *settings)
settings->registerSetting("JVisualVMPath", defaultValue);
}
BaseExternalTool *JVisualVMFactory::createTool(BaseInstance *instance, QObject *parent)
BaseExternalTool *JVisualVMFactory::createTool(InstancePtr instance, QObject *parent)
{
return new JVisualVM(instance, parent);
}

4
logic/tools/JVisualVM.h
View File

@ -6,7 +6,7 @@ class JVisualVM : public BaseProfiler
{
Q_OBJECT
public:
JVisualVM(BaseInstance *instance, QObject *parent = 0);
JVisualVM(InstancePtr instance, QObject *parent = 0);
protected:
void beginProfilingImpl(MinecraftProcess *process);
@ -17,7 +17,7 @@ class JVisualVMFactory : public BaseProfilerFactory
public:
QString name() const override { return "JVisualVM"; }
void registerSettings(SettingsObject *settings) override;
BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override;
BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override;
bool check(QString *error) override;
bool check(const QString &path, QString *error) override;
};

4
logic/tools/MCEditTool.cpp
View File

@ -9,7 +9,7 @@
#include "logic/BaseInstance.h"
#include "MultiMC.h"
MCEditTool::MCEditTool(BaseInstance *instance, QObject *parent)
MCEditTool::MCEditTool(InstancePtr instance, QObject *parent)
: BaseDetachedTool(instance, parent)
{
}
@ -47,7 +47,7 @@ void MCEditFactory::registerSettings(SettingsObject *settings)
{
settings->registerSetting("MCEditPath");
}
BaseExternalTool *MCEditFactory::createTool(BaseInstance *instance, QObject *parent)
BaseExternalTool *MCEditFactory::createTool(InstancePtr instance, QObject *parent)
{
return new MCEditTool(instance, parent);
}

4
logic/tools/MCEditTool.h
View File

@ -6,7 +6,7 @@ class MCEditTool : public BaseDetachedTool
{
Q_OBJECT
public:
explicit MCEditTool(BaseInstance *instance, QObject *parent = 0);
explicit MCEditTool(InstancePtr instance, QObject *parent = 0);
protected:
void runImpl() override;
@ -17,7 +17,7 @@ class MCEditFactory : public BaseDetachedToolFactory
public:
QString name() const override { return "MCEdit"; }
void registerSettings(SettingsObject *settings) override;
BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override;
BaseExternalTool *createTool(InstancePtr instance, QObject *parent = 0) override;
bool check(QString *error) override;
bool check(const QString &path, QString *error) override;
};