From 6738cdd715a511049ed35ead55b1a44a6fe09f05 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 16 May 2019 15:02:17 +0800 Subject: [PATCH] Constify exception references --- src/app/main.cpp | 2 +- .../bittorrent/private/filterparserthread.cpp | 10 +++++----- src/base/bittorrent/session.cpp | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index a26c167d1..b17f6ce7a 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -261,7 +261,7 @@ int main(int argc, char *argv[]) return app->exec(params.paramList()); } - catch (CommandLineParameterError &er) { + catch (const CommandLineParameterError &er) { displayBadArgMessage(er.messageForUser()); return EXIT_FAILURE; } diff --git a/src/base/bittorrent/private/filterparserthread.cpp b/src/base/bittorrent/private/filterparserthread.cpp index cf7b19b81..ba275384c 100644 --- a/src/base/bittorrent/private/filterparserthread.cpp +++ b/src/base/bittorrent/private/filterparserthread.cpp @@ -245,7 +245,7 @@ int FilterParserThread::parseDATFilterFile() m_filter.add_rule(startAddr, endAddr, lt::ip_filter::blocked); ++ruleCount; } - catch (std::exception &e) { + catch (const std::exception &e) { ++parseErrorCount; addLog(tr("IP filter exception thrown for line %1. Exception is: %2") .arg(nbLine).arg(QString::fromLocal8Bit(e.what()))); @@ -383,7 +383,7 @@ int FilterParserThread::parseP2PFilterFile() m_filter.add_rule(startAddr, endAddr, lt::ip_filter::blocked); ++ruleCount; } - catch (std::exception &e) { + catch (const std::exception &e) { ++parseErrorCount; addLog(tr("IP filter exception thrown for line %1. Exception is: %2") .arg(nbLine).arg(QString::fromLocal8Bit(e.what()))); @@ -468,7 +468,7 @@ int FilterParserThread::parseP2BFilterFile() m_filter.add_rule(first, last, lt::ip_filter::blocked); ++ruleCount; } - catch (std::exception &) {} + catch (const std::exception &) {} } } else if (version == 3) { @@ -518,7 +518,7 @@ int FilterParserThread::parseP2BFilterFile() m_filter.add_rule(first, last, lt::ip_filter::blocked); ++ruleCount; } - catch (std::exception &) {} + catch (const std::exception &) {} if (m_abort) return ruleCount; } @@ -577,7 +577,7 @@ void FilterParserThread::run() try { emit IPFilterParsed(ruleCount); } - catch (std::exception &) { + catch (const std::exception &) { emit IPFilterError(); } diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index e2ea1d689..184c2dbae 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -1400,7 +1400,7 @@ void Session::configurePeerClasses() , lt::address_v6::from_string("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff") , 1 << lt::session::global_peer_class_id); } - catch (std::exception &) {} + catch (const std::exception &) {} #endif // TORRENT_USE_IPV6 if (ignoreLimitsOnLAN()) { // local networks @@ -1439,7 +1439,7 @@ void Session::configurePeerClasses() , lt::address_v6::from_string("::1") , 1 << lt::session::local_peer_class_id); } - catch (std::exception &) {} + catch (const std::exception &) {} #endif // TORRENT_USE_IPV6 } m_nativeSession->set_peer_class_filter(f); @@ -1870,7 +1870,7 @@ bool Session::addTorrent_impl(CreateTorrentParams params, const MagnetUri &magne #endif handle.pause(); } - catch (std::exception &) {} + catch (const std::exception &) {} adjustLimits(); @@ -3856,7 +3856,7 @@ void Session::handleAlert(const lt::alert *a) break; } } - catch (std::exception &exc) { + catch (const std::exception &exc) { qWarning() << "Caught exception in " << Q_FUNC_INFO << ": " << QString::fromStdString(exc.what()); } } @@ -4374,7 +4374,7 @@ namespace try { handle.queue_position_up(); } - catch (std::exception &exc) { + catch (const std::exception &exc) { qDebug() << Q_FUNC_INFO << " fails: " << exc.what(); } } @@ -4384,7 +4384,7 @@ namespace try { handle.queue_position_down(); } - catch (std::exception &exc) { + catch (const std::exception &exc) { qDebug() << Q_FUNC_INFO << " fails: " << exc.what(); } } @@ -4394,7 +4394,7 @@ namespace try { handle.queue_position_top(); } - catch (std::exception &exc) { + catch (const std::exception &exc) { qDebug() << Q_FUNC_INFO << " fails: " << exc.what(); } } @@ -4404,7 +4404,7 @@ namespace try { handle.queue_position_bottom(); } - catch (std::exception &exc) { + catch (const std::exception &exc) { qDebug() << Q_FUNC_INFO << " fails: " << exc.what(); } }