From 1be7d573326570d63e55e36235537ed2b1831ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 10 Apr 2016 17:01:24 +0200 Subject: NOISSUE re/move some dead code and unused build system parts --- application/CMakeLists.txt | 6 --- application/MainWindow.cpp | 1 - application/MultiMC.cpp | 17 ------- application/handlers/IconResourceHandler.cpp | 37 --------------- application/handlers/IconResourceHandler.h | 23 ---------- application/handlers/WebResourceHandler.cpp | 68 ---------------------------- application/handlers/WebResourceHandler.h | 23 ---------- 7 files changed, 175 deletions(-) delete mode 100644 application/handlers/IconResourceHandler.cpp delete mode 100644 application/handlers/IconResourceHandler.h delete mode 100644 application/handlers/WebResourceHandler.cpp delete mode 100644 application/handlers/WebResourceHandler.h (limited to 'application') diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index f1a95a8a..15934e3e 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -86,12 +86,6 @@ SET(MULTIMC_SOURCES BuildConfig.h ${PROJECT_BINARY_DIR}/BuildConfig.cpp - # Resource handlers and transformers - handlers/IconResourceHandler.cpp - handlers/IconResourceHandler.h - handlers/WebResourceHandler.cpp - handlers/WebResourceHandler.h - # GUI - general utilities GuiUtil.h GuiUtil.cpp diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index 97c0b02a..1dcc5982 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index 24e71fa0..b157c83d 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -45,9 +45,6 @@ #include "settings/Setting.h" #include "trans/TranslationDownloader.h" -#include "resources/Resource.h" -#include "handlers/IconResourceHandler.h" -#include "handlers/WebResourceHandler.h" #include "minecraft/ftb/FTBPlugin.h" @@ -347,19 +344,6 @@ void MultiMC::initIcons() { m_icons->directoryChanged(value.toString()); }); - - //FIXME: none of this should be here. - Resource::registerHandler("web"); - Resource::registerHandler("icon"); - - Resource::registerTransformer([](const QByteArray &data) -> QPixmap - { - return QPixmap::fromImage(QImage::fromData(data)); - }); - Resource::registerTransformer([](const QByteArray &data) -> QIcon - { - return QIcon(QPixmap::fromImage(QImage::fromData(data))); - }); } @@ -912,7 +896,6 @@ FAILED: void MultiMC::setIconTheme(const QString& name) { XdgIcon::setThemeName(name); - IconResourceHandler::setTheme(name); } QIcon MultiMC::getThemedIcon(const QString& name) diff --git a/application/handlers/IconResourceHandler.cpp b/application/handlers/IconResourceHandler.cpp deleted file mode 100644 index b03553fd..00000000 --- a/application/handlers/IconResourceHandler.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "IconResourceHandler.h" -#include - -#include -#include - -QList> IconResourceHandler::m_iconHandlers; - -IconResourceHandler::IconResourceHandler(const QString &key) - : m_key(key) -{ -} - -void IconResourceHandler::setTheme(const QString &theme) -{ - // notify everyone - for (auto handler : m_iconHandlers) - { - std::shared_ptr ptr = handler.lock(); - if (ptr) - { - ptr->setResult(ptr->get()); - } - } -} - -void IconResourceHandler::init(std::shared_ptr &ptr) -{ - m_iconHandlers.append(std::dynamic_pointer_cast(ptr)); - // we always have a result, so lets report it now! - setResult(get()); -} - -QVariant IconResourceHandler::get() const -{ - return XdgIcon::fromTheme(m_key); -} diff --git a/application/handlers/IconResourceHandler.h b/application/handlers/IconResourceHandler.h deleted file mode 100644 index 0cc4de4f..00000000 --- a/application/handlers/IconResourceHandler.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include -#include - -class IconResourceHandler : public ResourceHandler -{ -public: - explicit IconResourceHandler(const QString &key); - - /// Sets the current theme and notifies all IconResourceHandlers of the change - static void setTheme(const QString &theme); - -private: - // we need to keep track of all IconResourceHandlers so that we can update them if the theme changes - void init(std::shared_ptr &ptr) override; - static QList> m_iconHandlers; - - QString m_key; - - // the workhorse, returns QVariantMap (filename => size) for m_key/m_theme - QVariant get() const; -}; diff --git a/application/handlers/WebResourceHandler.cpp b/application/handlers/WebResourceHandler.cpp deleted file mode 100644 index 757b870a..00000000 --- a/application/handlers/WebResourceHandler.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include "WebResourceHandler.h" - -#include "net/CacheDownload.h" -#include "net/HttpMetaCache.h" -#include "net/NetJob.h" -#include "FileSystem.h" -#include "Env.h" - -//FIXME: wrong. needs to be done elsewhere. -QMap WebResourceHandler::m_activeDownloads; - -WebResourceHandler::WebResourceHandler(const QString &url) - : QObject(), m_url(url) -{ - MetaEntryPtr entry = ENV.metacache()->resolveEntry("icons", url); - if (!entry->isStale()) - { - setResultFromFile(entry->getFullPath()); - } - else if (m_activeDownloads.contains(url)) - { - NetJob *job = m_activeDownloads.value(url); - connect(job, &NetJob::succeeded, this, &WebResourceHandler::succeeded); - connect(job, &NetJob::failed, this, [job, this]() {setFailure(job->failReason());}); - connect(job, &NetJob::progress, this, &WebResourceHandler::progress); - } - else - { - NetJob *job = new NetJob("Icon download"); - job->addNetAction(CacheDownload::make(QUrl(url), entry)); - connect(job, &NetJob::succeeded, this, &WebResourceHandler::succeeded); - connect(job, &NetJob::failed, this, [job, this]() {setFailure(job->failReason());}); - connect(job, &NetJob::progress, this, &WebResourceHandler::progress); - connect(job, &NetJob::finished, job, [job](){m_activeDownloads.remove(m_activeDownloads.key(job));job->deleteLater();}); - m_activeDownloads.insert(url, job); - job->start(); - } -} - -void WebResourceHandler::succeeded() -{ - MetaEntryPtr entry = ENV.metacache()->resolveEntry("icons", m_url); - setResultFromFile(entry->getFullPath()); - m_activeDownloads.remove(m_activeDownloads.key(qobject_cast(sender()))); -} -void WebResourceHandler::progress(qint64 current, qint64 total) -{ - if (total == 0) - { - setProgress(101); - } - else - { - setProgress(current / total); - } -} - -void WebResourceHandler::setResultFromFile(const QString &file) -{ - try - { - setResult(FS::read(file)); - } - catch (Exception &e) - { - setFailure(e.cause()); - } -} diff --git a/application/handlers/WebResourceHandler.h b/application/handlers/WebResourceHandler.h deleted file mode 100644 index 54bef6a1..00000000 --- a/application/handlers/WebResourceHandler.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include -#include - -class NetJob; - -class WebResourceHandler : public QObject, public ResourceHandler -{ -public: - explicit WebResourceHandler(const QString &url); - -private slots: - void succeeded(); - void progress(qint64 current, qint64 total); - -private: - static QMap m_activeDownloads; - - QString m_url; - - void setResultFromFile(const QString &file); -}; -- cgit v1.2.3