squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-04 22:52:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Clean up usage of static keyword

Browse Source 
They are either misused or redundant, so remove it.
This commit is contained in:
Chocobo1
2022-05-27 03:46:14 +08:00
parent c2c17fd053
commit 73faf67084
14 changed files with 106 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/search/searchjobwidget.cpp
View File

@@ -44,7 +44,6 @@
#include "base/search/searchdownloadhandler.h"
#include "base/search/searchhandler.h"
#include "base/search/searchpluginmanager.h"
#include "base/settingvalue.h"
#include "base/utils/misc.h"
#include "gui/addnewtorrentdialog.h"
#include "gui/lineedit.h"
@@ -57,6 +56,7 @@ SearchJobWidget::SearchJobWidget(SearchHandler *searchHandler, QWidget *parent)
: QWidget(parent)
, m_ui(new Ui::SearchJobWidget)
, m_searchHandler(searchHandler)
, m_nameFilteringMode(u"Search/FilteringMode"_qs)
{
m_ui->setupUi(this);
@@ -319,7 +319,7 @@ void SearchJobWidget::updateFilter()
sizeInBytes(m_ui->minSize->value(), static_cast<SizeUnit>(m_ui->minSizeUnit->currentIndex())),
sizeInBytes(m_ui->maxSize->value(), static_cast<SizeUnit>(m_ui->maxSizeUnit->currentIndex())));
nameFilteringModeSetting() = filteringMode();
m_nameFilteringMode = filteringMode();
m_proxyModel->invalidate();
updateResultsCount();
@@ -355,8 +355,8 @@ void SearchJobWidget::fillFilterComboBoxes()
m_ui->filterMode->addItem(tr("Torrent names only"), static_cast<int>(NameFilteringMode::OnlyNames));
m_ui->filterMode->addItem(tr("Everywhere"), static_cast<int>(NameFilteringMode::Everywhere));
QVariant selectedMode = static_cast<int>(nameFilteringModeSetting().get(NameFilteringMode::OnlyNames));
int index = m_ui->filterMode->findData(selectedMode);
const QVariant selectedMode = static_cast<int>(m_nameFilteringMode.get(NameFilteringMode::OnlyNames));
const int index = m_ui->filterMode->findData(selectedMode);
m_ui->filterMode->setCurrentIndex((index == -1) ? 0 : index);
}
@@ -545,12 +545,6 @@ void SearchJobWidget::appendSearchResults(const QVector<SearchResult> &results)
updateResultsCount();
}
SettingValue<SearchJobWidget::NameFilteringMode> &SearchJobWidget::nameFilteringModeSetting()
{
static SettingValue<NameFilteringMode> setting {u"Search/FilteringMode"_qs};
return setting;
}
void SearchJobWidget::keyPressEvent(QKeyEvent *event)
{
switch (event->key())

5
src/gui/search/searchjobwidget.h
View File

@@ -31,6 +31,8 @@
#include <QWidget>
#include "base/settingvalue.h"
#define ENGINE_URL_COLUMN 4
#define URL_COLUMN 5
@@ -127,7 +129,6 @@ private:
void copyField(int column) const;
static QString statusText(Status st);
static SettingValue<NameFilteringMode> &nameFilteringModeSetting();
Ui::SearchJobWidget *m_ui;
SearchHandler *m_searchHandler;
@@ -136,6 +137,8 @@ private:
LineEdit *m_lineEditSearchResultsFilter;
Status m_status = Status::Ongoing;
bool m_noSearchResults = true;
SettingValue<NameFilteringMode> m_nameFilteringMode;
};
Q_DECLARE_METATYPE(SearchJobWidget::NameFilteringMode)