NOISSUE dissolve util library

This commit is contained in:
Petr Mrázek
2015-10-05 01:47:27 +02:00
parent 7459eb627c
commit f93f867c3d
80 changed files with 770 additions and 869 deletions

View File

@ -23,10 +23,10 @@
#include "minecraft/VersionFilterData.h"
#include "Env.h"
#include "Exception.h"
#include <FileSystem.h>
#include <quazip.h>
#include <quazipfile.h>
#include <pathutils.h>
#include <QStringList>
#include <QRegularExpression>
#include <QRegularExpressionMatch>
@ -90,7 +90,7 @@ void ForgeInstaller::prepare(const QString &filename, const QString &universalUr
auto cacheentry = ENV.metacache()->resolveEntry("libraries", lib.storageSuffix());
finalPath = "libraries/" + lib.storageSuffix();
if (!ensureFilePathExists(finalPath))
if (!FS::ensureFilePathExists(finalPath))
return;
if (!zip.setCurrentFile(internalPath))
@ -278,8 +278,8 @@ bool ForgeInstaller::addLegacy(OneSixInstance *to)
return false;
}
auto entry = ENV.metacache()->resolveEntry("minecraftforge", m_forge_version->filename());
finalPath = PathCombine(to->jarModsDir(), m_forge_version->filename());
if (!ensureFilePathExists(finalPath))
finalPath = FS::PathCombine(to->jarModsDir(), m_forge_version->filename());
if (!FS::ensureFilePathExists(finalPath))
{
return false;
}

View File

@ -15,7 +15,7 @@
#include "Env.h"
#include "ForgeXzDownload.h"
#include <pathutils.h>
#include <FileSystem.h>
#include <QCryptographicHash>
#include <QFileInfo>
@ -49,7 +49,7 @@ void ForgeXzDownload::start()
return;
}
// can we actually create the real, final file?
if (!ensureFilePathExists(m_target_path))
if (!FS::ensureFilePathExists(m_target_path))
{
m_status = Job_Failed;
emit failed(m_index_within_job);