From 71e4b147ec3b8c5f3e2a004920ffbc0a3b6e18c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 26 Feb 2016 02:04:21 +0100 Subject: NOISSUE remove OneSixLibrary --- logic/ftb/OneSixFTBInstance.cpp | 10 +++++----- logic/ftb/OneSixFTBInstance.h | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'logic/ftb') diff --git a/logic/ftb/OneSixFTBInstance.cpp b/logic/ftb/OneSixFTBInstance.cpp index ebe421e0..54a3d2bd 100644 --- a/logic/ftb/OneSixFTBInstance.cpp +++ b/logic/ftb/OneSixFTBInstance.cpp @@ -2,7 +2,7 @@ #include "FTBProfileStrategy.h" #include "minecraft/MinecraftProfile.h" -#include "minecraft/OneSixLibrary.h" +#include "minecraft/GradleSpecifier.h" #include "tasks/SequentialTask.h" #include "forge/ForgeInstaller.h" #include "forge/ForgeVersionList.h" @@ -77,8 +77,8 @@ void OneSixFTBInstance::copy(const QDir &newDir) qDebug() << "Copying FTB libraries"; for (auto library : libraryNames) { - OneSixLibrary lib(library); - const QString out = QDir::current().absoluteFilePath("libraries/" + lib.storageSuffix()); + GradleSpecifier lib(library); + const QString out = QDir::current().absoluteFilePath("libraries/" + lib.toPath()); if (QFile::exists(out)) { continue; @@ -87,9 +87,9 @@ void OneSixFTBInstance::copy(const QDir &newDir) { qCritical() << "Couldn't create folder structure for" << out; } - if (!QFile::copy(librariesPath().absoluteFilePath(lib.storageSuffix()), out)) + if (!QFile::copy(librariesPath().absoluteFilePath(lib.toPath()), out)) { - qCritical() << "Couldn't copy" << lib.rawName(); + qCritical() << "Couldn't copy" << QString(lib); } } } diff --git a/logic/ftb/OneSixFTBInstance.h b/logic/ftb/OneSixFTBInstance.h index 35d8216b..add6b51c 100644 --- a/logic/ftb/OneSixFTBInstance.h +++ b/logic/ftb/OneSixFTBInstance.h @@ -2,8 +2,6 @@ #include "minecraft/OneSixInstance.h" -class OneSixLibrary; - class OneSixFTBInstance : public OneSixInstance { Q_OBJECT -- cgit v1.2.3