Browse Source

Use range-based for loops

adaptive-webui-19844
Chocobo1 6 years ago
parent
commit
e92209475e
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 6
      src/base/bittorrent/torrenthandle.cpp
  2. 2
      src/base/scanfoldersmodel.cpp
  3. 5
      src/gui/torrentcontenttreeview.cpp
  4. 4
      src/webui/api/appcontroller.cpp

6
src/base/bittorrent/torrenthandle.cpp

@ -1174,10 +1174,8 @@ QBitArray TorrentHandle::downloadingPieces() const @@ -1174,10 +1174,8 @@ QBitArray TorrentHandle::downloadingPieces() const
std::vector<lt::partial_piece_info> queue;
m_nativeHandle.get_download_queue(queue);
std::vector<lt::partial_piece_info>::const_iterator it = queue.begin();
std::vector<lt::partial_piece_info>::const_iterator itend = queue.end();
for (; it != itend; ++it)
result.setBit(it->piece_index);
for (const lt::partial_piece_info &info : queue)
result.setBit(info.piece_index);
return result;
}

2
src/base/scanfoldersmodel.cpp

@ -341,7 +341,7 @@ void ScanFoldersModel::configure() @@ -341,7 +341,7 @@ void ScanFoldersModel::configure()
{
const QVariantHash dirs = Preferences::instance()->getScanDirs();
for (QVariantHash::const_iterator i = dirs.begin(), e = dirs.end(); i != e; ++i) {
for (auto i = dirs.cbegin(); i != dirs.cend(); ++i) {
if (i.value().type() == QVariant::Int)
addPath(i.key(), static_cast<PathType>(i.value().toInt()), QString());
else

5
src/gui/torrentcontenttreeview.cpp

@ -69,9 +69,8 @@ void TorrentContentTreeView::keyPressEvent(QKeyEvent *event) @@ -69,9 +69,8 @@ void TorrentContentTreeView::keyPressEvent(QKeyEvent *event)
const QModelIndexList selection = selectionModel()->selectedRows(TorrentContentModelItem::COL_NAME);
for (QModelIndexList::const_iterator i = selection.begin(); i != selection.end(); ++i) {
QModelIndex index = *i;
Q_ASSERT(i->column() == TorrentContentModelItem::COL_NAME);
for (const QModelIndex &index : selection) {
Q_ASSERT(index.column() == TorrentContentModelItem::COL_NAME);
model()->setData(index, state, Qt::CheckStateRole);
}
}

4
src/webui/api/appcontroller.cpp

@ -112,7 +112,7 @@ void AppController::preferencesAction() @@ -112,7 +112,7 @@ void AppController::preferencesAction()
// Automatically add torrents from
const QVariantHash dirs = pref->getScanDirs();
QVariantMap nativeDirs;
for (QVariantHash::const_iterator i = dirs.cbegin(), e = dirs.cend(); i != e; ++i) {
for (auto i = dirs.cbegin(); i != dirs.cend(); ++i) {
if (i.value().type() == QVariant::Int)
nativeDirs.insert(Utils::Fs::toNativePath(i.key()), i.value().toInt());
else
@ -299,7 +299,7 @@ void AppController::setPreferencesAction() @@ -299,7 +299,7 @@ void AppController::setPreferencesAction()
QVariantHash oldScanDirs = pref->getScanDirs();
QVariantHash scanDirs;
ScanFoldersModel *model = ScanFoldersModel::instance();
for (QVariantMap::const_iterator i = nativeDirs.cbegin(), e = nativeDirs.cend(); i != e; ++i) {
for (auto i = nativeDirs.cbegin(); i != nativeDirs.cend(); ++i) {
QString folder = Utils::Fs::fromNativePath(i.key());
int downloadType;
QString downloadPath;

Loading…
Cancel
Save