Browse Source

Avoid binding constant reference to returned object

In such cases, it makes no sense doing so.
adaptive-webui-19844
Chocobo1 6 years ago
parent
commit
56766dc08b
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 4
      src/base/bittorrent/peerinfo.cpp
  2. 4
      src/base/net/reverseresolution.cpp
  3. 10
      src/base/scanfoldersmodel.cpp
  4. 4
      src/gui/addnewtorrentdialog.cpp
  5. 2
      src/gui/properties/propertieswidget.cpp
  6. 2
      src/gui/transferlistfilterswidget.cpp

4
src/base/bittorrent/peerinfo.cpp

@ -246,8 +246,8 @@ QString PeerInfo::connectionType() const
void PeerInfo::calcRelevance(const TorrentHandle *torrent) void PeerInfo::calcRelevance(const TorrentHandle *torrent)
{ {
const QBitArray &allPieces = torrent->pieces(); const QBitArray allPieces = torrent->pieces();
const QBitArray &peerPieces = pieces(); const QBitArray peerPieces = pieces();
int localMissing = 0; int localMissing = 0;
int remoteHaves = 0; int remoteHaves = 0;

4
src/base/net/reverseresolution.cpp

@ -75,7 +75,7 @@ void ReverseResolution::resolve(const QString &ip)
void ReverseResolution::hostResolved(const QHostInfo &host) void ReverseResolution::hostResolved(const QHostInfo &host)
{ {
const QString &ip = m_lookups.take(host.lookupId()); const QString ip = m_lookups.take(host.lookupId());
Q_ASSERT(!ip.isNull()); Q_ASSERT(!ip.isNull());
if (host.error() != QHostInfo::NoError) { if (host.error() != QHostInfo::NoError) {
@ -83,7 +83,7 @@ void ReverseResolution::hostResolved(const QHostInfo &host)
return; return;
} }
const QString &hostname = host.hostName(); const QString hostname = host.hostName();
qDebug() << Q_FUNC_INFO << ip << QString("->") << hostname; qDebug() << Q_FUNC_INFO << ip << QString("->") << hostname;
m_cache.insert(ip, new QString(hostname)); m_cache.insert(ip, new QString(hostname));

10
src/base/scanfoldersmodel.cpp

@ -212,11 +212,11 @@ ScanFoldersModel::PathStatus ScanFoldersModel::addPath(const QString &watchPath,
if (!watchDir.exists()) return DoesNotExist; if (!watchDir.exists()) return DoesNotExist;
if (!watchDir.isReadable()) return CannotRead; if (!watchDir.isReadable()) return CannotRead;
const QString &canonicalWatchPath = watchDir.canonicalPath(); const QString canonicalWatchPath = watchDir.canonicalPath();
if (findPathData(canonicalWatchPath) != -1) return AlreadyInList; if (findPathData(canonicalWatchPath) != -1) return AlreadyInList;
QDir downloadDir(downloadPath); QDir downloadDir(downloadPath);
const QString &canonicalDownloadPath = downloadDir.canonicalPath(); const QString canonicalDownloadPath = downloadDir.canonicalPath();
if (!m_fsWatcher) { if (!m_fsWatcher) {
m_fsWatcher = new FileSystemWatcher(this); m_fsWatcher = new FileSystemWatcher(this);
@ -236,12 +236,12 @@ ScanFoldersModel::PathStatus ScanFoldersModel::addPath(const QString &watchPath,
ScanFoldersModel::PathStatus ScanFoldersModel::updatePath(const QString &watchPath, const PathType &downloadType, const QString &downloadPath) ScanFoldersModel::PathStatus ScanFoldersModel::updatePath(const QString &watchPath, const PathType &downloadType, const QString &downloadPath)
{ {
QDir watchDir(watchPath); QDir watchDir(watchPath);
const QString &canonicalWatchPath = watchDir.canonicalPath(); const QString canonicalWatchPath = watchDir.canonicalPath();
int row = findPathData(canonicalWatchPath); int row = findPathData(canonicalWatchPath);
if (row == -1) return DoesNotExist; if (row == -1) return DoesNotExist;
QDir downloadDir(downloadPath); QDir downloadDir(downloadPath);
const QString &canonicalDownloadPath = downloadDir.canonicalPath(); const QString canonicalDownloadPath = downloadDir.canonicalPath();
m_pathList.at(row)->downloadType = downloadType; m_pathList.at(row)->downloadType = downloadType;
m_pathList.at(row)->downloadPath = Utils::Fs::toNativePath(canonicalDownloadPath); m_pathList.at(row)->downloadPath = Utils::Fs::toNativePath(canonicalDownloadPath);
@ -256,7 +256,7 @@ void ScanFoldersModel::addToFSWatcher(const QStringList &watchPaths)
foreach (const QString &path, watchPaths) { foreach (const QString &path, watchPaths) {
QDir watchDir(path); QDir watchDir(path);
const QString &canonicalWatchPath = watchDir.canonicalPath(); const QString canonicalWatchPath = watchDir.canonicalPath();
m_fsWatcher->addPath(canonicalWatchPath); m_fsWatcher->addPath(canonicalWatchPath);
} }
} }

4
src/gui/addnewtorrentdialog.cpp

@ -551,7 +551,7 @@ void AddNewTorrentDialog::renameSelectedFile()
if (!newPath.endsWith('/')) newPath += '/'; if (!newPath.endsWith('/')) newPath += '/';
// Check for overwriting // Check for overwriting
for (int i = 0; i < m_torrentInfo.filesCount(); ++i) { for (int i = 0; i < m_torrentInfo.filesCount(); ++i) {
const QString &currentName = m_torrentInfo.filePath(i); const QString currentName = m_torrentInfo.filePath(i);
#if defined(Q_OS_UNIX) || defined(Q_WS_QWS) #if defined(Q_OS_UNIX) || defined(Q_WS_QWS)
if (currentName.startsWith(newPath, Qt::CaseSensitive)) { if (currentName.startsWith(newPath, Qt::CaseSensitive)) {
#else #else
@ -565,7 +565,7 @@ void AddNewTorrentDialog::renameSelectedFile()
} }
// Replace path in all files // Replace path in all files
for (int i = 0; i < m_torrentInfo.filesCount(); ++i) { for (int i = 0; i < m_torrentInfo.filesCount(); ++i) {
const QString &currentName = m_torrentInfo.filePath(i); const QString currentName = m_torrentInfo.filePath(i);
if (currentName.startsWith(oldPath)) { if (currentName.startsWith(oldPath)) {
QString newName = currentName; QString newName = currentName;
newName.replace(0, oldPath.length(), newPath); newName.replace(0, oldPath.length(), newPath);

2
src/gui/properties/propertieswidget.cpp

@ -751,7 +751,7 @@ void PropertiesWidget::renameSelectedFile()
if (!newPath.endsWith('/')) newPath += '/'; if (!newPath.endsWith('/')) newPath += '/';
// Check for overwriting // Check for overwriting
for (int i = 0; i < m_torrent->filesCount(); ++i) { for (int i = 0; i < m_torrent->filesCount(); ++i) {
const QString &currentName = m_torrent->filePath(i); const QString currentName = m_torrent->filePath(i);
#if defined(Q_OS_UNIX) || defined(Q_WS_QWS) #if defined(Q_OS_UNIX) || defined(Q_WS_QWS)
if (currentName.startsWith(newPath, Qt::CaseSensitive)) { if (currentName.startsWith(newPath, Qt::CaseSensitive)) {
#else #else

2
src/gui/transferlistfilterswidget.cpp

@ -515,7 +515,7 @@ void TrackerFiltersList::torrentAboutToBeDeleted(BitTorrent::TorrentHandle *cons
QString TrackerFiltersList::trackerFromRow(int row) const QString TrackerFiltersList::trackerFromRow(int row) const
{ {
Q_ASSERT(row > 1); Q_ASSERT(row > 1);
const QString &tracker = item(row)->text(); const QString tracker = item(row)->text();
QStringList parts = tracker.split(' '); QStringList parts = tracker.split(' ');
Q_ASSERT(parts.size() >= 2); Q_ASSERT(parts.size() >= 2);
parts.removeLast(); // Remove trailing number parts.removeLast(); // Remove trailing number

Loading…
Cancel
Save