diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-10 07:12:52 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-10 07:12:52 +0100 |
| commit | 3f5c46a1c4b27e82976e0067e4ec2d6abfffd9ba (patch) | |
| tree | 9231f1304db15e966e1fe57c1b5b41ba26267b21 /gui | |
| parent | 8db2e5db81c91cca9291ca35ed74e632278563e6 (diff) | |
| download | MultiMC-3f5c46a1c4b27e82976e0067e4ec2d6abfffd9ba.tar MultiMC-3f5c46a1c4b27e82976e0067e4ec2d6abfffd9ba.tar.gz MultiMC-3f5c46a1c4b27e82976e0067e4ec2d6abfffd9ba.tar.lz MultiMC-3f5c46a1c4b27e82976e0067e4ec2d6abfffd9ba.tar.xz MultiMC-3f5c46a1c4b27e82976e0067e4ec2d6abfffd9ba.zip | |
Finish assets update for 1.7.3
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/MainWindow.cpp | 11 | ||||
| -rw-r--r-- | gui/MainWindow.h | 2 |
2 files changed, 0 insertions, 13 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index b080f610..d8ba5572 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -72,7 +72,6 @@ #include "logic/BaseInstance.h" #include "logic/InstanceFactory.h" #include "logic/MinecraftProcess.h" -#include "logic/OneSixAssets.h" #include "logic/OneSixUpdate.h" #include "logic/JavaUtils.h" #include "logic/NagUtils.h" @@ -233,15 +232,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi { MMC->lwjgllist()->loadList(); } - - assets_downloader = new OneSixAssets(); - connect(assets_downloader, SIGNAL(indexStarted()), SLOT(assetsIndexStarted())); - connect(assets_downloader, SIGNAL(filesStarted()), SLOT(assetsFilesStarted())); - connect(assets_downloader, SIGNAL(filesProgress(int, int, int)), - SLOT(assetsFilesProgress(int, int, int))); - connect(assets_downloader, SIGNAL(failed()), SLOT(assetsFailed())); - connect(assets_downloader, SIGNAL(finished()), SLOT(assetsFinished())); - //assets_downloader->start(); } const QString currentInstanceId = MMC->settings()->get("SelectedInstance").toString(); @@ -274,7 +264,6 @@ MainWindow::~MainWindow() delete ui; delete proxymodel; delete drawer; - delete assets_downloader; } void MainWindow::repopulateAccountsMenu() diff --git a/gui/MainWindow.h b/gui/MainWindow.h index 62c9797e..795590c0 100644 --- a/gui/MainWindow.h +++ b/gui/MainWindow.h @@ -31,7 +31,6 @@ class KCategorizedView; class KCategoryDrawer; class MinecraftProcess; class ConsoleWindow; -class OneSixAssets; namespace Ui { @@ -173,7 +172,6 @@ private: InstanceProxyModel *proxymodel; MinecraftProcess *proc; ConsoleWindow *console; - OneSixAssets *assets_downloader; LabeledToolButton *renameButton; QToolButton *changeIconButton; |