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

NOISSUE replace std::shared_ptr with shared_qobject_ptr for all download tasks

Browse Source
This commit is contained in:
Petr Mrázek
2017-05-03 21:09:36 +02:00
parent 907aa36704
commit 0efa714ba5
10 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/minecraft/Library.cpp
View File

@ -51,7 +51,7 @@ void Library::getApplicableFiles(OpSys system, QStringList& jar, QStringList& na
}
}
QList< std::shared_ptr< NetAction > > Library::getDownloads(OpSys system, class HttpMetaCache* cache,
QList<NetActionPtr> Library::getDownloads(OpSys system, class HttpMetaCache* cache,
QStringList& failedFiles, const QString & overridePath) const
{
QList<NetActionPtr> out;

3
api/logic/minecraft/forge/ForgeXzDownload.h
View File

@ -19,8 +19,9 @@
#include "net/HttpMetaCache.h"
#include <QFile>
#include <QTemporaryFile>
#include "QObjectPtr.h"
typedef std::shared_ptr<class ForgeXzDownload> ForgeXzDownloadPtr;
typedef shared_qobject_ptr<class ForgeXzDownload> ForgeXzDownloadPtr;
class ForgeXzDownload : public NetAction
{

10
api/logic/minecraft/onesix/OneSixUpdate.cpp
View File

@ -41,7 +41,7 @@ OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent)
{
// create folders
{
m_tasks.append(std::make_shared<FoldersTask>(m_inst));
m_tasks.append(new FoldersTask(m_inst));
}
// add metadata update tasks, if necessary
@ -66,7 +66,7 @@ OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent)
if(task)
{
qDebug() << "Loading remote meta patch" << id;
m_tasks.append(task.unwrap());
m_tasks.append(task);
}
}
else
@ -78,17 +78,17 @@ OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent)
// libraries download
{
m_tasks.append(std::make_shared<LibrariesTask>(m_inst));
m_tasks.append(new LibrariesTask(m_inst));
}
// FML libraries download and copy into the instance
{
m_tasks.append(std::make_shared<FMLLibrariesTask>(m_inst));
m_tasks.append(new FMLLibrariesTask(m_inst));
}
// assets update
{
m_tasks.append(std::make_shared<AssetUpdateTask>(m_inst));
m_tasks.append(new AssetUpdateTask(m_inst));
}
}

2
api/logic/minecraft/onesix/OneSixUpdate.h
View File

@ -46,7 +46,7 @@ private:
private:
OneSixInstance *m_inst = nullptr;
QList<std::shared_ptr<Task>> m_tasks;
QList<shared_qobject_ptr<Task>> m_tasks;
QString m_preFailure;
int m_currentTask = -1;
bool m_abort = false;