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

Merge pull request #18936 from Chocobo1/tidy

Browse Source 
Code clean up
This commit is contained in:
Chocobo1
2023-05-08 13:11:11 +08:00
committed by GitHub
parent 7880fe8440 81daad92ec
commit 32a55551fe
39 changed files with 106 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/gui/powermanagement/powermanagement_x11.cpp
View File

@@ -57,27 +57,21 @@ void PowerManagementInhibitor::requestIdle()
if ((m_state == Error) || (m_state == Idle) || (m_state == RequestIdle) || (m_state == RequestBusy))
return;
m_state = RequestIdle;
qDebug("D-Bus: PowerManagementInhibitor: Requesting idle");
QDBusMessage call;
if (!m_useGSM)
call = QDBusMessage::createMethodCall(
u"org.freedesktop.PowerManagement"_qs,
u"/org/freedesktop/PowerManagement/Inhibit"_qs,
u"org.freedesktop.PowerManagement.Inhibit"_qs,
u"UnInhibit"_qs);
else
call = QDBusMessage::createMethodCall(
u"org.gnome.SessionManager"_qs,
u"/org/gnome/SessionManager"_qs,
u"org.gnome.SessionManager"_qs,
u"Uninhibit"_qs);
m_state = RequestIdle;
QList<QVariant> args;
args << m_cookie;
call.setArguments(args);
QDBusMessage call = m_useGSM
? QDBusMessage::createMethodCall(
u"org.gnome.SessionManager"_qs,
u"/org/gnome/SessionManager"_qs,
u"org.gnome.SessionManager"_qs,
u"Uninhibit"_qs)
: QDBusMessage::createMethodCall(
u"org.freedesktop.PowerManagement"_qs,
u"/org/freedesktop/PowerManagement/Inhibit"_qs,
u"org.freedesktop.PowerManagement.Inhibit"_qs,
u"UnInhibit"_qs);
call.setArguments({m_cookie});
QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);
auto *watcher = new QDBusPendingCallWatcher(pcall, this);
@@ -91,28 +85,27 @@ void PowerManagementInhibitor::requestBusy()
if ((m_state == Error) || (m_state == Busy) || (m_state == RequestBusy) || (m_state == RequestIdle))
return;
m_state = RequestBusy;
qDebug("D-Bus: PowerManagementInhibitor: Requesting busy");
QDBusMessage call;
if (!m_useGSM)
call = QDBusMessage::createMethodCall(
QDBusMessage call = m_useGSM
? QDBusMessage::createMethodCall(
u"org.gnome.SessionManager"_qs,
u"/org/gnome/SessionManager"_qs,
u"org.gnome.SessionManager"_qs,
u"Inhibit"_qs)
: QDBusMessage::createMethodCall(
u"org.freedesktop.PowerManagement"_qs,
u"/org/freedesktop/PowerManagement/Inhibit"_qs,
u"org.freedesktop.PowerManagement.Inhibit"_qs,
u"Inhibit"_qs);
else
call = QDBusMessage::createMethodCall(
u"org.gnome.SessionManager"_qs,
u"/org/gnome/SessionManager"_qs,
u"org.gnome.SessionManager"_qs,
u"Inhibit"_qs);
m_state = RequestBusy;
QList<QVariant> args = {u"qBittorrent"_qs};
if (m_useGSM) args << 0u;
if (m_useGSM)
args << 0u;
args << u"Active torrents are presented"_qs;
if (m_useGSM) args << 8u;
if (m_useGSM)
args << 8u;
call.setArguments(args);
QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(call, 1000);

2
src/gui/properties/speedplotview.h
View File

@@ -139,5 +139,5 @@ private:
Averager *m_currentAverager {&m_averager5Min};
QMap<GraphID, GraphProperties> m_properties;
milliseconds m_currentMaxDuration;
milliseconds m_currentMaxDuration {0};
};

13
src/gui/rss/feedlistwidget.cpp
View File

@@ -243,15 +243,12 @@ void FeedListWidget::dragMoveEvent(QDragMoveEvent *event)
QTreeWidget::dragMoveEvent(event);
QTreeWidgetItem *item = itemAt(event->pos());
// Prohibit dropping onto global unread counter
if (item == m_unreadStickyItem)
event->ignore();
// Prohibit dragging of global unread counter
else if (selectedItems().contains(m_unreadStickyItem))
event->ignore();
// Prohibit dropping onto feeds
else if (item && isFeed(item))
if ((item == m_unreadStickyItem) // Prohibit dropping onto global unread counter
|| selectedItems().contains(m_unreadStickyItem) // Prohibit dragging of global unread counter
|| (item && isFeed(item))) // Prohibit dropping onto feeds
{
event->ignore();
}
}
void FeedListWidget::dropEvent(QDropEvent *event)

7
src/gui/search/searchsortmodel.cpp
View File

@@ -32,13 +32,6 @@
SearchSortModel::SearchSortModel(QObject *parent)
: base(parent)
, m_isNameFilterEnabled(false)
, m_minSeeds(0)
, m_maxSeeds(-1)
, m_minLeeches(0)
, m_maxLeeches(-1)
, m_minSize(0)
, m_maxSize(-1)
{
setSortRole(UnderlyingDataRole);
setFilterRole(UnderlyingDataRole);

8
src/gui/search/searchsortmodel.h
View File

@@ -90,12 +90,12 @@ protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
private:
bool m_isNameFilterEnabled;
bool m_isNameFilterEnabled = false;
QString m_searchTerm;
QStringList m_searchTermWords;
int m_minSeeds, m_maxSeeds;
int m_minLeeches, m_maxLeeches;
qint64 m_minSize, m_maxSize;
int m_minSeeds = 0, m_maxSeeds = -1;
int m_minLeeches = 0, m_maxLeeches = -1;
qint64 m_minSize = 0, m_maxSize = -1;
Utils::Compare::NaturalLessThan<Qt::CaseInsensitive> m_naturalLessThan;
};

11
src/gui/search/searchwidget.cpp
View File

@@ -75,7 +75,6 @@ namespace
case SearchJobWidget::Status::Aborted:
return u"task-reject"_qs;
case SearchJobWidget::Status::Error:
return u"dialog-warning"_qs;
case SearchJobWidget::Status::NoResults:
return u"dialog-warning"_qs;
default:
@@ -330,15 +329,15 @@ void SearchWidget::on_searchButton_clicked()
return;
}
const QString plugin = selectedPlugin();
QStringList plugins;
if (selectedPlugin() == u"all")
if (plugin == u"all")
plugins = SearchPluginManager::instance()->allPlugins();
else if (selectedPlugin() == u"enabled")
plugins = SearchPluginManager::instance()->enabledPlugins();
else if (selectedPlugin() == u"multi")
else if ((plugin == u"enabled") || (plugin == u"multi"))
plugins = SearchPluginManager::instance()->enabledPlugins();
else
plugins << selectedPlugin();
plugins << plugin;
qDebug("Search with category: %s", qUtf8Printable(selectedCategory()));

2
src/gui/torrenttagsdialog.h
View File

@@ -52,6 +52,6 @@ public:
private:
void addNewTag();
Ui::TorrentTagsDialog *m_ui;
Ui::TorrentTagsDialog *m_ui = nullptr;
SettingValue<QSize> m_storeDialogSize;
};

2
src/gui/transferlistfilters/categoryfiltermodel.cpp
View File

@@ -40,7 +40,7 @@ class CategoryModelItem
public:
CategoryModelItem() = default;
CategoryModelItem(CategoryModelItem *parent, QString categoryName, int torrentsCount = 0)
CategoryModelItem(CategoryModelItem *parent, const QString &categoryName, const int torrentsCount = 0)
: m_name(categoryName)
, m_torrentsCount(torrentsCount)
{

2
src/gui/transferlistfilters/categoryfiltermodel.h
View File

@@ -72,6 +72,6 @@ private:
QModelIndex index(CategoryModelItem *item) const;
CategoryModelItem *findItem(const QString &fullName) const;
bool m_isSubcategoriesEnabled;
bool m_isSubcategoriesEnabled = false;
CategoryModelItem *m_rootItem = nullptr;
};

2
src/gui/tristatewidget.cpp
View File

@@ -38,8 +38,6 @@
TriStateWidget::TriStateWidget(const QString &text, QWidget *parent)
: QWidget {parent}
, m_closeOnInteraction {true}
, m_checkState {Qt::Unchecked}
, m_text {text}
{
setMouseTracking(true); // for visual effects via mouse navigation

4
src/gui/tristatewidget.h
View File

@@ -55,7 +55,7 @@ private:
void toggleCheckState();
bool m_closeOnInteraction;
Qt::CheckState m_checkState;
bool m_closeOnInteraction = true;
Qt::CheckState m_checkState = Qt::Unchecked;
const QString m_text;
};

2
src/gui/uithemedialog.h
View File

@@ -60,7 +60,7 @@ private:
bool storeColors();
bool storeIcons();
Ui::UIThemeDialog *m_ui;
Ui::UIThemeDialog *m_ui = nullptr;
SettingValue<QSize> m_storeDialogSize;
DefaultThemeSource m_defaultThemeSource;