From 2059825597ee5006b4397546ef31e3ed97b69f71 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 5 May 2023 02:01:07 +0800 Subject: [PATCH] Don't use instance for accessing static functions --- src/app/application.cpp | 2 +- src/base/search/searchdownloadhandler.cpp | 2 +- src/base/search/searchhandler.cpp | 2 +- src/gui/transferlistfilters/categoryfiltermodel.cpp | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/application.cpp b/src/app/application.cpp index 02a9f8b8a..c50c82a4b 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp @@ -225,7 +225,7 @@ namespace Application::Application(int &argc, char **argv) : BaseApplication(argc, argv) , m_shutdownAct(ShutdownDialogAction::Exit) - , m_commandLineArgs(parseCommandLine(this->arguments())) + , m_commandLineArgs(parseCommandLine(Application::arguments())) , m_storeFileLoggerEnabled(FILELOGGER_SETTINGS_KEY(u"Enabled"_qs)) , m_storeFileLoggerBackup(FILELOGGER_SETTINGS_KEY(u"Backup"_qs)) , m_storeFileLoggerDeleteOld(FILELOGGER_SETTINGS_KEY(u"DeleteOld"_qs)) diff --git a/src/base/search/searchdownloadhandler.cpp b/src/base/search/searchdownloadhandler.cpp index dbbee9bbd..75b737f71 100644 --- a/src/base/search/searchdownloadhandler.cpp +++ b/src/base/search/searchdownloadhandler.cpp @@ -46,7 +46,7 @@ SearchDownloadHandler::SearchDownloadHandler(const QString &siteUrl, const QStri , this, &SearchDownloadHandler::downloadProcessFinished); const QStringList params { - (m_manager->engineLocation() / Path(u"nova2dl.py"_qs)).toString(), + (SearchPluginManager::engineLocation() / Path(u"nova2dl.py"_qs)).toString(), siteUrl, url }; diff --git a/src/base/search/searchhandler.cpp b/src/base/search/searchhandler.cpp index 691d0b79e..a3fde897b 100644 --- a/src/base/search/searchhandler.cpp +++ b/src/base/search/searchhandler.cpp @@ -73,7 +73,7 @@ SearchHandler::SearchHandler(const QString &pattern, const QString &category, co const QStringList params { - (m_manager->engineLocation() / Path(u"nova2.py"_qs)).toString(), + (SearchPluginManager::engineLocation() / Path(u"nova2.py"_qs)).toString(), m_usedPlugins.join(u','), m_category }; diff --git a/src/gui/transferlistfilters/categoryfiltermodel.cpp b/src/gui/transferlistfilters/categoryfiltermodel.cpp index e92c13464..679dc80db 100644 --- a/src/gui/transferlistfilters/categoryfiltermodel.cpp +++ b/src/gui/transferlistfilters/categoryfiltermodel.cpp @@ -305,7 +305,7 @@ void CategoryFilterModel::categoryAdded(const QString &categoryName) if (m_isSubcategoriesEnabled) { - QStringList expanded = BitTorrent::Session::instance()->expandCategory(categoryName); + QStringList expanded = BitTorrent::Session::expandCategory(categoryName); if (expanded.count() > 1) parent = findItem(expanded[expanded.count() - 2]); } @@ -410,7 +410,7 @@ void CategoryFilterModel::populate() for (const QString &categoryName : asConst(session->categories())) { CategoryModelItem *parent = m_rootItem; - for (const QString &subcat : asConst(session->expandCategory(categoryName))) + for (const QString &subcat : asConst(BitTorrent::Session::expandCategory(categoryName))) { const QString subcatName = shortName(subcat); if (!parent->hasChild(subcatName)) @@ -443,7 +443,7 @@ CategoryModelItem *CategoryFilterModel::findItem(const QString &fullName) const return m_rootItem->child(fullName); CategoryModelItem *item = m_rootItem; - for (const QString &subcat : asConst(BitTorrent::Session::instance()->expandCategory(fullName))) + for (const QString &subcat : asConst(BitTorrent::Session::expandCategory(fullName))) { const QString subcatName = shortName(subcat); if (!item->hasChild(subcatName)) return nullptr;