d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-14 16:57:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5882 from onto/pvs-studio

Browse Source 
Fixes and improvements after check by PVS-Studio
This commit is contained in:
sledgehammer999 2016-11-07 00:18:46 +02:00 committed by GitHub
commit 90bbe3379d
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/base/bittorrent/private/filterparserthread.cpp
View File

@ -55,10 +55,10 @@ FilterParserThread::~FilterParserThread()
} }
// Parser for eMule ip filter in DAT format // Parser for eMule ip filter in DAT format
int FilterParserThread::parseDATFilterFile(QString m_filePath, libt::ip_filter &filter) int FilterParserThread::parseDATFilterFile(QString filePath, libt::ip_filter &filter)
{ {
int ruleCount = 0; int ruleCount = 0;
QFile file(m_filePath); QFile file(filePath);
if (!file.exists()) return ruleCount; if (!file.exists()) return ruleCount;
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@ -149,10 +149,10 @@ int FilterParserThread::parseDATFilterFile(QString m_filePath, libt::ip_filter &
} }
// Parser for PeerGuardian ip filter in p2p format // Parser for PeerGuardian ip filter in p2p format
int FilterParserThread::parseP2PFilterFile(QString m_filePath, libt::ip_filter &filter) int FilterParserThread::parseP2PFilterFile(QString filePath, libt::ip_filter &filter)
{ {
int ruleCount = 0; int ruleCount = 0;
QFile file(m_filePath); QFile file(filePath);
if (!file.exists()) return ruleCount; if (!file.exists()) return ruleCount;
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@ -257,10 +257,10 @@ int FilterParserThread::getlineInStream(QDataStream &stream, std::string &name,
} }
// Parser for PeerGuardian ip filter in p2p format // Parser for PeerGuardian ip filter in p2p format
int FilterParserThread::parseP2BFilterFile(QString m_filePath, libt::ip_filter &filter) int FilterParserThread::parseP2BFilterFile(QString filePath, libt::ip_filter &filter)
{ {
int ruleCount = 0; int ruleCount = 0;
QFile file(m_filePath); QFile file(filePath);
if (!file.exists()) return ruleCount; if (!file.exists()) return ruleCount;
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
@ -369,7 +369,7 @@ int FilterParserThread::parseP2BFilterFile(QString m_filePath, libt::ip_filter &
// * eMule IP list (DAT): http://wiki.phoenixlabs.org/wiki/DAT_Format // * eMule IP list (DAT): http://wiki.phoenixlabs.org/wiki/DAT_Format
// * PeerGuardian Text (P2P): http://wiki.phoenixlabs.org/wiki/P2P_Format // * PeerGuardian Text (P2P): http://wiki.phoenixlabs.org/wiki/P2P_Format
// * PeerGuardian Binary (P2B): http://wiki.phoenixlabs.org/wiki/P2B_Format // * PeerGuardian Binary (P2B): http://wiki.phoenixlabs.org/wiki/P2B_Format
void FilterParserThread::processFilterFile(QString _filePath) void FilterParserThread::processFilterFile(QString filePath)
{ {
if (isRunning()) { if (isRunning()) {
// Already parsing a filter, m_abort first // Already parsing a filter, m_abort first
@ -378,7 +378,7 @@ void FilterParserThread::processFilterFile(QString _filePath)
} }
m_abort = false; m_abort = false;
m_filePath = _filePath; m_filePath = filePath;
// Run it // Run it
start(); start();
} }

2
src/base/bittorrent/private/filterparserthread.h
View File

@ -54,7 +54,7 @@ public:
int parseP2PFilterFile(QString filePath, libtorrent::ip_filter &filter); int parseP2PFilterFile(QString filePath, libtorrent::ip_filter &filter);
int getlineInStream(QDataStream &stream, std::string &name, char delim); int getlineInStream(QDataStream &stream, std::string &name, char delim);
int parseP2BFilterFile(QString filePath, libtorrent::ip_filter &filter); int parseP2BFilterFile(QString filePath, libtorrent::ip_filter &filter);
void processFilterFile(QString _filePath); void processFilterFile(QString filePath);
signals: signals:
void IPFilterParsed(int ruleCount); void IPFilterParsed(int ruleCount);

4
src/gui/properties/propertieswidget.cpp
View File

@ -194,7 +194,7 @@ void PropertiesWidget::showPiecesAvailability(bool show)
avail_pieces_lbl->setVisible(show); avail_pieces_lbl->setVisible(show);
pieces_availability->setVisible(show); pieces_availability->setVisible(show);
avail_average_lbl->setVisible(show); avail_average_lbl->setVisible(show);
if (show || (!show && !downloaded_pieces->isVisible())) if (show || !downloaded_pieces->isVisible())
line_2->setVisible(show); line_2->setVisible(show);
} }
@ -203,7 +203,7 @@ void PropertiesWidget::showPiecesDownloaded(bool show)
downloaded_pieces_lbl->setVisible(show); downloaded_pieces_lbl->setVisible(show);
downloaded_pieces->setVisible(show); downloaded_pieces->setVisible(show);
progress_lbl->setVisible(show); progress_lbl->setVisible(show);
if (show || (!show && !pieces_availability->isVisible())) if (show || !pieces_availability->isVisible())
line_2->setVisible(show); line_2->setVisible(show);
} }

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

@ -67,7 +67,7 @@ void FeedListWidget::itemAboutToBeRemoved(QTreeWidgetItem *item) {
Rss::FilePtr file = m_rssMapping.take(item); Rss::FilePtr file = m_rssMapping.take(item);
if (Rss::FeedPtr feed = qSharedPointerDynamicCast<Rss::Feed>(file)) { if (Rss::FeedPtr feed = qSharedPointerDynamicCast<Rss::Feed>(file)) {
m_feedsItems.remove(feed->id()); m_feedsItems.remove(feed->id());
} if (Rss::FolderPtr folder = qSharedPointerDynamicCast<Rss::Folder>(file)) { } else if (Rss::FolderPtr folder = qSharedPointerDynamicCast<Rss::Folder>(file)) {
Rss::FeedList feeds = folder->getAllFeeds(); Rss::FeedList feeds = folder->getAllFeeds();
foreach (const Rss::FeedPtr& feed, feeds) { foreach (const Rss::FeedPtr& feed, feeds) {
m_feedsItems.remove(feed->id()); m_feedsItems.remove(feed->id());

2
src/gui/transferlistsortmodel.cpp
View File

@ -131,7 +131,7 @@ bool TransferListSortModel::lessThan(const QModelIndex &left, const QModelIndex
const bool seedingR = (prioR < 0); const bool seedingR = (prioR < 0);
bool activeR = TorrentFilter::ActiveTorrent.match(model->torrentHandle(model->index(right.row()))); bool activeR = TorrentFilter::ActiveTorrent.match(model->torrentHandle(model->index(right.row())));
bool activeL = TorrentFilter::ActiveTorrent.match(model->torrentHandle(model->index(right.row()))); bool activeL = TorrentFilter::ActiveTorrent.match(model->torrentHandle(model->index(left.row())));
// Sorting rules prioritized. // Sorting rules prioritized.
// 1. Active torrents at the top // 1. Active torrents at the top