From 8f230bc2e600528eae7034e900921cd958013e4d Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 23 Nov 2023 05:44:51 +0800 Subject: [PATCH] Remove unused icon provider singleton --- src/app/application.cpp | 3 -- src/base/CMakeLists.txt | 2 -- src/base/iconprovider.cpp | 67 --------------------------------------- src/base/iconprovider.h | 54 ------------------------------- 4 files changed, 126 deletions(-) delete mode 100644 src/base/iconprovider.cpp delete mode 100644 src/base/iconprovider.h diff --git a/src/app/application.cpp b/src/app/application.cpp index df8891e5a..c052d0bd5 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -70,7 +70,6 @@ #include "base/bittorrent/torrent.h" #include "base/exceptions.h" #include "base/global.h" -#include "base/iconprovider.h" #include "base/logger.h" #include "base/net/downloadmanager.h" #include "base/net/geoipmanager.h" @@ -793,7 +792,6 @@ int Application::exec() Net::ProxyConfigurationManager::initInstance(); Net::DownloadManager::initInstance(); - IconProvider::initInstance(); BitTorrent::Session::initInstance(); #ifndef DISABLE_GUI @@ -1335,7 +1333,6 @@ void Application::cleanup() Net::ProxyConfigurationManager::freeInstance(); Preferences::freeInstance(); SettingsStorage::freeInstance(); - IconProvider::freeInstance(); SearchPluginManager::freeInstance(); Utils::Fs::removeDirRecursively(Utils::Fs::tempPath()); diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index c173339d0..ab24be9aa 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -54,7 +54,6 @@ add_library(qbt_base STATIC http/responsegenerator.h http/server.h http/types.h - iconprovider.h indexrange.h interfaces/iapplication.h logger.h @@ -148,7 +147,6 @@ add_library(qbt_base STATIC http/responsebuilder.cpp http/responsegenerator.cpp http/server.cpp - iconprovider.cpp logger.cpp net/dnsupdater.cpp net/downloadhandlerimpl.cpp diff --git a/src/base/iconprovider.cpp b/src/base/iconprovider.cpp deleted file mode 100644 index f2d285f1c..000000000 --- a/src/base/iconprovider.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Bittorrent Client using Qt and libtorrent. - * Copyright (C) 2015 Vladimir Golovnev - * Copyright (C) 2011 Christophe Dumez - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * In addition, as a special exception, the copyright holders give permission to - * link this program with the OpenSSL project's "OpenSSL" library (or with - * modified versions of it that use the same license as the "OpenSSL" library), - * and distribute the linked executables. You must obey the GNU General Public - * License in all respects for all of the code used other than "OpenSSL". If you - * modify file(s), you may extend this exception to your version of the file(s), - * but you are not obligated to do so. If you do not wish to do so, delete this - * exception statement from your version. - */ - -#include "iconprovider.h" - -#include "base/path.h" - -IconProvider::IconProvider(QObject *parent) - : QObject(parent) -{ -} - -void IconProvider::initInstance() -{ - if (!m_instance) - m_instance = new IconProvider; -} - -void IconProvider::freeInstance() -{ - delete m_instance; - m_instance = nullptr; -} - -IconProvider *IconProvider::instance() -{ - return m_instance; -} - -Path IconProvider::getIconPath(const QString &iconId) const -{ - // there are a few icons not available in svg - const Path pathSvg {u":/icons/" + iconId + u".svg"}; - if (pathSvg.exists()) - return pathSvg; - - const Path pathPng {u":/icons/" + iconId + u".png"}; - return pathPng; -} - -IconProvider *IconProvider::m_instance = nullptr; diff --git a/src/base/iconprovider.h b/src/base/iconprovider.h deleted file mode 100644 index ea272c51d..000000000 --- a/src/base/iconprovider.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Bittorrent Client using Qt and libtorrent. - * Copyright (C) 2015 Vladimir Golovnev - * Copyright (C) 2011 Christophe Dumez - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * In addition, as a special exception, the copyright holders give permission to - * link this program with the OpenSSL project's "OpenSSL" library (or with - * modified versions of it that use the same license as the "OpenSSL" library), - * and distribute the linked executables. You must obey the GNU General Public - * License in all respects for all of the code used other than "OpenSSL". If you - * modify file(s), you may extend this exception to your version of the file(s), - * but you are not obligated to do so. If you do not wish to do so, delete this - * exception statement from your version. - */ - -#pragma once - -#include - -#include "base/pathfwd.h" - -class QString; - -class IconProvider final : public QObject -{ - Q_DISABLE_COPY_MOVE(IconProvider) - -public: - static void initInstance(); - static void freeInstance(); - static IconProvider *instance(); - - virtual Path getIconPath(const QString &iconId) const; - -protected: - explicit IconProvider(QObject *parent = nullptr); - ~IconProvider() = default; - - static IconProvider *m_instance; -};