From: Albert Astals Cid Date: Thu, 24 Apr 2008 20:41:04 +0000 (+0000) Subject: avoid unnecessary copies by using const & in foreach X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f32987d719f4b396ea2679b59a712a8bc288b8d2?ds=sidebyside avoid unnecessary copies by using const & in foreach svn path=/trunk/KDE/kdebase/apps/; revision=800783 --- diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index d87571c7e..28e50a0a2 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -301,7 +301,7 @@ KFileItemList DolphinView::selectedItems() const KFileItemList itemList; const QModelIndexList indexList = selection.indexes(); - foreach (QModelIndex index, indexList) { + foreach (const QModelIndex &index, indexList) { KFileItem item = m_dolphinModel->itemForIndex(index); if (!item.isNull()) { itemList.append(item); @@ -315,7 +315,7 @@ KUrl::List DolphinView::selectedUrls() const { KUrl::List urls; const KFileItemList list = selectedItems(); - foreach (KFileItem item, list) { + foreach (const KFileItem &item, list) { urls.append(item.url()); } return urls; @@ -468,7 +468,7 @@ void DolphinView::setNameFilter(const QString& nameFilter) void DolphinView::calculateItemCount(int& fileCount, int& folderCount) { - foreach (KFileItem item, m_dirLister->items()) { + foreach (const KFileItem &item, m_dirLister->items()) { if (item.isDir()) { ++folderCount; } else { @@ -524,7 +524,7 @@ void DolphinView::renameSelectedItems() // iterate through all selected items and rename them... int index = 1; - foreach (KFileItem item, items) { + foreach (const KFileItem &item, items) { const KUrl& oldUrl = item.url(); QString number; number.setNum(index++); diff --git a/src/fileitemcapabilities.cpp b/src/fileitemcapabilities.cpp index 144f148a7..6ab37ad2c 100644 --- a/src/fileitemcapabilities.cpp +++ b/src/fileitemcapabilities.cpp @@ -32,7 +32,7 @@ FileItemCapabilities::FileItemCapabilities(const KFileItemList& items) : m_isLocal(true) { QFileInfo parentDirInfo; - foreach (KFileItem item, items) { + foreach (const KFileItem &item, items) { const KUrl url = item.url(); m_isLocal = m_isLocal && url.isLocalFile(); m_supportsReading = m_supportsReading && KProtocolManager::supportsReading(url); diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp index b46328cea..72549d71b 100644 --- a/src/iconmanager.cpp +++ b/src/iconmanager.cpp @@ -107,7 +107,7 @@ void IconManager::generatePreviews(const KFileItemList &items) // Order the items in a way that the preview for the visible items // is generated first, as this improves the feeled performance a lot. KFileItemList orderedItems; - foreach (KFileItem item, items) { + foreach (const KFileItem &item, items) { const QModelIndex dirIndex = m_dolphinModel->indexForItem(item); const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex); const QRect itemRect = m_view->visualRect(proxyIndex); @@ -147,7 +147,7 @@ void IconManager::updateCutItems() { // restore the icons of all previously selected items to the // original state... - foreach (CutItem cutItem, m_cutItemsCache) { + foreach (const CutItem &cutItem, m_cutItemsCache) { const QModelIndex index = m_dolphinModel->indexForUrl(cutItem.url); if (index.isValid()) { m_dolphinModel->setData(index, QIcon(cutItem.pixmap), Qt::DecorationRole); @@ -207,7 +207,7 @@ void IconManager::replaceIcon(const KFileItem& item, const QPixmap& pixmap) bool isOldPreview = true; const KUrl::List dirs = dirLister->directories(); const QString itemDir = item.url().directory(); - foreach (KUrl url, dirs) { + foreach (const KUrl &url, dirs) { if (url.path() == itemDir) { isOldPreview = false; break; @@ -244,7 +244,7 @@ bool IconManager::isCutItem(const KFileItem& item) const const KUrl::List cutUrls = KUrl::List::fromMimeData(mimeData); const KUrl& itemUrl = item.url(); - foreach (KUrl url, cutUrls) { + foreach (const KUrl &url, cutUrls) { if (url == itemUrl) { return true; } @@ -263,11 +263,11 @@ void IconManager::applyCutItemEffect() KFileItemList items; KDirLister* dirLister = m_dolphinModel->dirLister(); const KUrl::List dirs = dirLister->directories(); - foreach (KUrl url, dirs) { + foreach (const KUrl &url, dirs) { items << dirLister->itemsForDir(url); } - foreach (KFileItem item, items) { + foreach (const KFileItem &item, items) { if (isCutItem(item)) { const QModelIndex index = m_dolphinModel->indexForItem(item); const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole); diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp index e9acac7ce..9567c0e82 100644 --- a/src/metadatawidget.cpp +++ b/src/metadatawidget.cpp @@ -123,7 +123,7 @@ void MetaDataWidget::setFiles(const KUrl::List& urls) d->files.clear(); bool first = true; QList fileRes; - Q_FOREACH( KUrl url, urls ) { + Q_FOREACH( const KUrl &url, urls ) { Nepomuk::Resource file( url, Soprano::Vocabulary::Xesam::File() ); d->files.insert( url, file ); fileRes.append( file ); diff --git a/src/nepomukmassupdatejob.cpp b/src/nepomukmassupdatejob.cpp index b47358fe9..5c883fd4b 100644 --- a/src/nepomukmassupdatejob.cpp +++ b/src/nepomukmassupdatejob.cpp @@ -46,7 +46,7 @@ Nepomuk::MassUpdateJob::~MassUpdateJob() void Nepomuk::MassUpdateJob::setFiles( const KUrl::List& urls ) { m_resources.clear(); - foreach( KUrl url, urls ) { + foreach( const KUrl &url, urls ) { m_resources.append( Resource( url ) ); } setTotalAmount( KJob::Files, m_resources.count() ); diff --git a/src/tagcloud/resourcetaggingwidget.cpp b/src/tagcloud/resourcetaggingwidget.cpp index 389342608..1ac829952 100644 --- a/src/tagcloud/resourcetaggingwidget.cpp +++ b/src/tagcloud/resourcetaggingwidget.cpp @@ -57,7 +57,7 @@ void Nepomuk::ResourceTaggingWidget::Private::showTaggingPopup( const QPoint& po { popup->showAllTags(); resourceTags = intersectTags( resources ); - Q_FOREACH( Tag tag, resourceTags ) { + Q_FOREACH( const Tag &tag, resourceTags ) { popup->setTagSelected( tag, true ); } diff --git a/src/tagcloud/tagcloud.cpp b/src/tagcloud/tagcloud.cpp index 0cfe76885..e59074fab 100644 --- a/src/tagcloud/tagcloud.cpp +++ b/src/tagcloud/tagcloud.cpp @@ -651,7 +651,7 @@ void Nepomuk::TagCloud::showTags( const QList& tags ) d->showAllTags = false; d->invalidateCachedValues(); d->nodes.clear(); - Q_FOREACH( Tag tag, tags ) { + Q_FOREACH( const Tag &tag, tags ) { TagNode node; node.tag = tag; node.weight = d->calculateWeight( tag );