From 4e94de413ba60a1da91715a41c8ba8caa8474728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 7 Feb 2015 10:43:09 +0100 Subject: SCRATCH no more gui includes in logic --- logic/minecraft/OneSixInstance.cpp | 33 +-------------------------------- logic/minecraft/OneSixInstance.h | 7 +------ 2 files changed, 2 insertions(+), 38 deletions(-) (limited to 'logic/minecraft') diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp index ebba22d6..f43275ab 100644 --- a/logic/minecraft/OneSixInstance.cpp +++ b/logic/minecraft/OneSixInstance.cpp @@ -28,15 +28,7 @@ #include "logic/minecraft/AssetsUtils.h" #include "logic/icons/IconList.h" -#include "gui/pagedialog/PageDialog.h" -#include "gui/pages/VersionPage.h" -#include "gui/pages/ModFolderPage.h" -#include "gui/pages/ResourcePackPage.h" -#include "gui/pages/TexturePackPage.h" -#include "gui/pages/InstanceSettingsPage.h" -#include "gui/pages/NotesPage.h" -#include "gui/pages/ScreenshotsPage.h" -#include "gui/pages/OtherLogsPage.h" + OneSixInstance::OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) : MinecraftInstance(globalSettings, settings, rootDir) { @@ -53,29 +45,6 @@ void OneSixInstance::createProfile() m_version.reset(new MinecraftProfile(new OneSixProfileStrategy(this))); } - -QList OneSixInstance::getPages() -{ - QList values; - values.append(new VersionPage(this)); - values.append(new ModFolderPage(this, loaderModList(), "mods", "loadermods", - tr("Loader mods"), "Loader-mods")); - values.append(new CoreModFolderPage(this, coreModList(), "coremods", "coremods", - tr("Core mods"), "Core-mods")); - values.append(new ResourcePackPage(this)); - values.append(new TexturePackPage(this)); - values.append(new NotesPage(this)); - values.append(new ScreenshotsPage(PathCombine(minecraftRoot(), "screenshots"))); - values.append(new InstanceSettingsPage(this)); - values.append(new OtherLogsPage(minecraftRoot())); - return values; -} - -QString OneSixInstance::dialogTitle() -{ - return tr("Edit Instance (%1)").arg(name()); -} - QSet OneSixInstance::traits() { auto version = getMinecraftProfile(); diff --git a/logic/minecraft/OneSixInstance.h b/logic/minecraft/OneSixInstance.h index 3a9e528e..79e67bd2 100644 --- a/logic/minecraft/OneSixInstance.h +++ b/logic/minecraft/OneSixInstance.h @@ -19,9 +19,8 @@ #include "logic/minecraft/MinecraftProfile.h" #include "logic/minecraft/ModList.h" -#include "gui/pages/BasePageProvider.h" -class OneSixInstance : public MinecraftInstance, public BasePageProvider +class OneSixInstance : public MinecraftInstance { Q_OBJECT public: @@ -30,10 +29,6 @@ public: virtual void init(); - ////// Edit Instance Dialog stuff ////// - virtual QList getPages(); - virtual QString dialogTitle(); - ////// Mod Lists ////// std::shared_ptr loaderModList() const; std::shared_ptr coreModList() const; -- cgit v1.2.3