mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused icon provider singleton

Browse source
This commit is contained in:
Chocobo1 2023-11-23 05:44:51 +08:00
parent 6d0ad62632
commit 8f230bc2e6
4 changed files with 0 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/app/application.cpp
View file

@ -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());

2
src/base/CMakeLists.txt
View file

@ -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

67
src/base/iconprovider.cpp
View file

@ -1,67 +0,0 @@
/*
* Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2015 Vladimir Golovnev <glassez@yandex.ru>
* Copyright (C) 2011 Christophe Dumez <chris@qbittorrent.org>
*
* 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;

54
src/base/iconprovider.h
View file

@ -1,54 +0,0 @@
/*
* Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2015 Vladimir Golovnev <glassez@yandex.ru>
* Copyright (C) 2011 Christophe Dumez <chris@qbittorrent.org>
*
* 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 <QObject>
#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;
};