From 1233c5b67bd86f3b4031cf98b06955481f32e375 Mon Sep 17 00:00:00 2001 From: Anton Lashkov Date: Sun, 30 Oct 2016 22:53:23 +0400 Subject: [PATCH] Fix name of variable same as class member --- .../bittorrent/private/filterparserthread.cpp | 16 ++++++++-------- src/base/bittorrent/private/filterparserthread.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/base/bittorrent/private/filterparserthread.cpp b/src/base/bittorrent/private/filterparserthread.cpp index 21e188706..250893e0f 100644 --- a/src/base/bittorrent/private/filterparserthread.cpp +++ b/src/base/bittorrent/private/filterparserthread.cpp @@ -55,10 +55,10 @@ FilterParserThread::~FilterParserThread() } // 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; - QFile file(m_filePath); + QFile file(filePath); if (!file.exists()) return ruleCount; 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 -int FilterParserThread::parseP2PFilterFile(QString m_filePath, libt::ip_filter &filter) +int FilterParserThread::parseP2PFilterFile(QString filePath, libt::ip_filter &filter) { int ruleCount = 0; - QFile file(m_filePath); + QFile file(filePath); if (!file.exists()) return ruleCount; 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 -int FilterParserThread::parseP2BFilterFile(QString m_filePath, libt::ip_filter &filter) +int FilterParserThread::parseP2BFilterFile(QString filePath, libt::ip_filter &filter) { int ruleCount = 0; - QFile file(m_filePath); + QFile file(filePath); if (!file.exists()) return ruleCount; 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 // * PeerGuardian Text (P2P): http://wiki.phoenixlabs.org/wiki/P2P_Format // * PeerGuardian Binary (P2B): http://wiki.phoenixlabs.org/wiki/P2B_Format -void FilterParserThread::processFilterFile(QString _filePath) +void FilterParserThread::processFilterFile(QString filePath) { if (isRunning()) { // Already parsing a filter, m_abort first @@ -378,7 +378,7 @@ void FilterParserThread::processFilterFile(QString _filePath) } m_abort = false; - m_filePath = _filePath; + m_filePath = filePath; // Run it start(); } diff --git a/src/base/bittorrent/private/filterparserthread.h b/src/base/bittorrent/private/filterparserthread.h index 9e3bdb6be..ed2bd13cf 100644 --- a/src/base/bittorrent/private/filterparserthread.h +++ b/src/base/bittorrent/private/filterparserthread.h @@ -54,7 +54,7 @@ public: int parseP2PFilterFile(QString filePath, libtorrent::ip_filter &filter); int getlineInStream(QDataStream &stream, std::string &name, char delim); int parseP2BFilterFile(QString filePath, libtorrent::ip_filter &filter); - void processFilterFile(QString _filePath); + void processFilterFile(QString filePath); signals: void IPFilterParsed(int ruleCount);