[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam] /: code polish
From: Andi Clemens <andi.clemens () googlemail ! com>
Date: 2012-01-01 1:12:13
Message-ID: 20120101011213.189BAA60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 4d49a9cbd9edc4e627ded4664d82af6b44a1a9de by Andi Clemens.
Committed on 01/01/2012 at 01:52.
Pushed by aclemens into branch 'master'.
code polish
M +1 -1 databaseserver/pollthread.cpp
M +11 -11 digikam/album/albummanager.cpp
M +1 -1 digikam/album/albummanager.h
M +5 -5 digikam/album/albumtreeview.cpp
M +4 -4 digikam/album/albumwatch.cpp
M +2 -2 digikam/database/imageattributeswatch.cpp
M +1 -1 digikam/database/scancontroller.cpp
M +2 -2 digikam/dragdrop/ddragobjects.cpp
M +1 -1 digikam/dragdrop/imagedragdrop.cpp
M +1 -1 digikam/dragdrop/tagdragdrop.cpp
M +4 -4 digikam/filters/filtersidebarwidget.cpp
M +4 -4 digikam/items/digikamimageview.cpp
M +5 -5 digikam/items/imagecategorizedview.cpp
M +4 -4 digikam/items/imageviewutilities.cpp
M +15 -15 digikam/main/digikamapp.cpp
M +3 -3 digikam/metadata/metadatahub.cpp
M +6 -6 digikam/metadata/metadatamanager.cpp
M +6 -6 digikam/tags/addtagscompletionbox.cpp
M +2 -2 digikam/tags/tagcheckview.cpp
M +1 -1 digikam/tags/tagsactionmngr.cpp
M +1 -1 digikam/tags/tagspopupmenu.cpp
M +7 -7 digikam/utils/albumsettings.cpp
M +7 -7 digikam/utils/contextmenuhelper.cpp
M +1 -1 digikam/utils/tooltipfiller.cpp
M +5 -5 digikam/views/digikamview.cpp
M +2 -2 digikam/views/imagepreviewview.cpp
M +2 -2 digikam/views/mapwidgetview.cpp
M +1 -1 digikam/views/stackedview.cpp
M +2 -2 imageplugins/color/imageplugin_color.cpp
M +2 -2 imageplugins/enhance/hotpixels/hotpixelfixer.cpp
M +1 -1 libs/3rdparty/kinotify/kinotify.cpp
M +16 -16 libs/database/albumdb.cpp
M +29 -29 libs/database/collectionmanager.cpp
M +12 -12 libs/database/collectionscanner.cpp
M +3 -3 libs/database/databaseconfigelement.cpp
M +1 -1 libs/database/databasecopymanager.cpp
M +3 -3 libs/database/databasecorebackend.cpp
M +3 -3 libs/database/faces/facetags.cpp
M +14 -14 libs/database/faces/facetagseditor.cpp
M +1 -1 libs/database/haar/haariface.cpp
M +4 -4 libs/database/imagecomments.cpp
M +4 -4 libs/database/imagecopyright.cpp
M +31 -31 libs/database/imagehistory/imagehistorygraph.cpp
M +8 -8 libs/database/imagehistory/imagehistorygraph_boost.h
M +1 -1 libs/database/imagehistory/imagehistorygraphdata.h
M +13 -13 libs/database/imagehistory/imagehistorygraphmodel.cpp
M +3 -3 libs/database/imageinfo.cpp
M +2 -2 libs/database/imageinfocache.cpp
M +2 -2 libs/database/imageinfolist.cpp
M +5 -5 libs/database/imagelister.cpp
M +5 -5 libs/database/imagequerybuilder.cpp
M +6 -6 libs/database/imagescanner.cpp
M +4 -4 libs/database/imagetagpair.cpp
M +1 -1 libs/database/schemaupdater.cpp
M +9 -9 libs/database/searchxml.cpp
M +1 -1 libs/database/tagproperties.cpp
M +17 -17 libs/database/tagscache.cpp
M +1 -1 libs/database/thumbnaildb.cpp
M +2 -2 libs/dimg/dimg.cpp
M +1 -1 libs/dimg/filters/dimgfiltermanager.cpp
M +4 -4 libs/dimg/filters/filteractionfilter.cpp
M +2 -2 libs/dimg/filters/icc/iccprofile.cpp
M +1 -1 libs/dimg/filters/icc/iccprofilesettings.cpp
M +4 -4 libs/dimg/filters/icc/iccsettings.cpp
M +17 -17 libs/dimg/imagehistory/dimagehistory.cpp
M +2 -2 libs/dmetadata/dmetadata.cpp
M +1 -1 libs/imageproperties/imagepropertiestab.cpp
M +2 -2 libs/models/abstractalbummodel.cpp
M +2 -2 libs/models/albumfiltermodel.cpp
M +2 -2 libs/models/categorizeditemmodel.cpp
M +2 -2 libs/models/imagealbumfiltermodel.cpp
M +4 -4 libs/models/imagealbummodel.cpp
M +10 -10 libs/models/imagefiltermodel.cpp
M +2 -2 libs/models/imagefiltersettings.cpp
M +14 -14 libs/models/imagemodel.cpp
M +1 -1 libs/models/imagethumbnailmodel.cpp
M +1 -1 libs/template/templatelist.cpp
M +6 -6 libs/template/templatemanager.cpp
M +1 -1 libs/template/templateselector.cpp
M +1 -1 libs/thememanager/thememanager.cpp
M +2 -2 libs/threadimageio/loadingcache.cpp
M +1 -1 libs/threadimageio/loadsavetask.cpp
M +2 -2 libs/threadimageio/managedloadsavethread.cpp
M +1 -1 libs/threadimageio/previewtask.cpp
M +4 -4 libs/threadimageio/thumbnailloadthread.cpp
M +1 -1 libs/threads/threadmanager.cpp
M +1 -1 libs/versionmanager/versionmanager.cpp
M +1 -1 libs/widgets/common/dzoombar.cpp
M +4 -4 libs/widgets/common/sidebar.cpp
M +4 -4 libs/widgets/common/visibilitycontroller.cpp
M +1 -1 libs/widgets/graphicsview/graphicsdimgitem.cpp
M +3 -3 libs/widgets/graphicsview/imagezoomsettings.cpp
M +14 -14 libs/widgets/graphicsview/itemvisibilitycontroller.cpp
M +3 -3 libs/widgets/graphicsview/regionframeitem.cpp
M +2 -2 libs/widgets/iccprofiles/iccprofilescombobox.cpp
M +2 -2 libs/widgets/itemview/dcategorizedview.cpp
M +11 -11 libs/widgets/itemview/digikamkcategorizedview.cpp
M +6 -6 libs/widgets/itemview/imagedelegateoverlay.cpp
M +1 -1 libs/widgets/metadata/metadatalistview.cpp
M +4 -4 tests/albummodeltest.cpp
M +1 -1 tests/cameranamehelpertest.cpp
M +1 -1 tests/dimagefilteractiontest.cpp
M +4 -4 tests/dimagehistorygraphtest.cpp
M +3 -3 utilities/advancedrename/common/parseresults.cpp
M +2 -2 utilities/batch/batchfacedetector.cpp
M +1 -1 utilities/cameragui/controller/camerathumbsctrl.cpp
M +7 -7 utilities/cameragui/main/cameraui.cpp
M +7 -7 utilities/cameragui/q3support/iconview.cpp
M +1 -1 utilities/cameragui/views/cameranamehelper.cpp
M +4 -4 utilities/cameragui/widgets/filtercombo.cpp
M +4 -4 utilities/cameragui/widgets/freespacewidget.cpp
M +7 -7 utilities/facedetection/facegroup.cpp
M +6 -6 utilities/facedetection/faceiface.cpp
M +16 -16 utilities/facedetection/facepipeline.cpp
M +2 -2 utilities/fuzzysearch/findduplicatesview.cpp
M +1 -1 utilities/gpssearch/gpsmarkertiler.cpp
M +5 -5 utilities/imageeditor/canvas/imagepluginloader.cpp
M +3 -3 utilities/imageeditor/canvas/undocache.cpp
M +2 -2 utilities/imageeditor/canvas/undomanager.cpp
M +11 -11 utilities/imageeditor/editor/editorwindow.cpp
M +3 -3 utilities/imageeditor/editor/imagewindow.cpp
M +1 -1 utilities/imageeditor/widgets/previewlist.cpp
M +1 -1 utilities/imageeditor/widgets/previewtoolbar.cpp
M +1 -1 utilities/kipiiface/kipiimagecollectionselector.cpp
M +2 -2 utilities/kipiiface/kipiinterface.cpp
M +2 -2 utilities/lighttable/lighttablewindow.cpp
M +12 -12 utilities/nepomuk/digikamnepomukservice.cpp
M +5 -5 utilities/queuemanager/main/queuemgrwindow.cpp
M +1 -1 utilities/queuemanager/views/queuelist.cpp
M +1 -1 utilities/searchwindow/choicesearchutilities.h
M +4 -4 utilities/searchwindow/searchfieldgroup.cpp
M +4 -4 utilities/searchwindow/searchfields.cpp
M +4 -4 utilities/searchwindow/searchgroup.cpp
M +2 -2 utilities/searchwindow/searchview.cpp
M +3 -3 utilities/setup/cameralist.cpp
M +2 -2 utilities/setup/setupcamera.cpp
M +6 -6 utilities/setup/setupcollectionview.cpp
M +1 -1 utilities/setup/setupmime.cpp
http://commits.kde.org/digikam/4d49a9cbd9edc4e627ded4664d82af6b44a1a9de
diff --git a/databaseserver/pollthread.cpp b/databaseserver/pollthread.cpp
index 0bd62ff..3d55de9 100644
--- a/databaseserver/pollthread.cpp
+++ b/databaseserver/pollthread.cpp
@@ -81,7 +81,7 @@ bool PollThread::checkDigikamInstancesRunning()
QLatin1String digikamStartupService("org.kde.digikam.startup-");
QLatin1String digikamService("org.kde.digikam-");
QLatin1String digikamKioService("org.kde.digikam.KIO-");
- foreach (const QString& service, serviceNames)
+ foreach(const QString& service, serviceNames)
{
if (service.startsWith(digikamStartupService) ||
service.startsWith(digikamService) ||
diff --git a/digikam/album/albummanager.cpp b/digikam/album/albummanager.cpp
index 6743db0..f2eddaf 100644
--- a/digikam/album/albummanager.cpp
+++ b/digikam/album/albummanager.cpp
@@ -834,7 +834,7 @@ bool AlbumManager::setDatabase(const DatabaseParameters& params, \
bool priority,
// -- UUID Checking ---------------------------------------------------------
QList<CollectionLocation> disappearedLocations = \
CollectionManager::instance()->checkHardWiredLocations();
- foreach(const CollectionLocation & loc, disappearedLocations)
+ foreach(const CollectionLocation& loc, disappearedLocations)
{
QString locDescription;
QStringList candidateIds, candidateDescriptions;
@@ -1079,7 +1079,7 @@ void AlbumManager::startScan()
// create albums for album roots
QList<CollectionLocation> locations = \
CollectionManager::instance()->allAvailableLocations();
- foreach(const CollectionLocation & location, locations)
+ foreach(const CollectionLocation& location, locations)
{
addAlbumRoot(location);
}
@@ -1222,7 +1222,7 @@ void AlbumManager::scanPAlbums()
QList<AlbumInfo> newAlbums;
// go through all the Albums and see which ones are already present
- foreach(const AlbumInfo & info, currentAlbums)
+ foreach(const AlbumInfo& info, currentAlbums)
{
// check that location of album is available
if (CollectionManager::instance()->locationForAlbumRootId(info.albumRootId).isAvailable())
@@ -1247,7 +1247,7 @@ void AlbumManager::scanPAlbums()
// removePAlbum takes care of that.
// So we only feed it the albums from oldAlbums topmost in hierarchy.
QSet<PAlbum*> topMostOldAlbums;
- foreach(PAlbum * album, oldAlbums)
+ foreach(PAlbum* album, oldAlbums)
{
if (!album->parent() || !oldAlbums.contains(album->parent()->id()))
{
@@ -1255,7 +1255,7 @@ void AlbumManager::scanPAlbums()
}
}
- foreach(PAlbum * album, topMostOldAlbums)
+ foreach(PAlbum* album, topMostOldAlbums)
{
// recursively removes all children and the album
removePAlbum(album);
@@ -1265,7 +1265,7 @@ void AlbumManager::scanPAlbums()
qSort(newAlbums);
// create all new albums
- foreach(const AlbumInfo & info, newAlbums)
+ foreach(const AlbumInfo& info, newAlbums)
{
if (info.relativePath.isEmpty())
{
@@ -1355,7 +1355,7 @@ void AlbumManager::updateChangedPAlbums()
// Find the AlbumInfo for each id in changedPAlbums
foreach(int id, d->changedPAlbums)
{
- foreach(const AlbumInfo & info, currentAlbums)
+ foreach(const AlbumInfo& info, currentAlbums)
{
if (info.id == id)
{
@@ -1666,7 +1666,7 @@ void AlbumManager::scanSAlbums()
QList<SearchInfo> newSearches;
// go through all the Albums and see which ones are already present
- foreach(const SearchInfo & info, currentSearches)
+ foreach(const SearchInfo& info, currentSearches)
{
if (oldSearches.contains(info.id))
{
@@ -1698,7 +1698,7 @@ void AlbumManager::scanSAlbums()
}
// remove old albums that have been deleted
- foreach(SAlbum * album, oldSearches)
+ foreach(SAlbum* album, oldSearches)
{
emit signalAlbumAboutToBeDeleted(album);
d->allAlbumsIdHash.remove(album->globalID());
@@ -1708,7 +1708,7 @@ void AlbumManager::scanSAlbums()
}
// add new albums
- foreach(const SearchInfo & info, newSearches)
+ foreach(const SearchInfo& info, newSearches)
{
SAlbum* album = new SAlbum(info.name, info.id);
album->setSearch(info.type, info.query);
@@ -2967,7 +2967,7 @@ void AlbumManager::slotPeopleJobData(KIO::Job*, const \
QByteArray& data) d->fAlbumsCount.clear();
typedef QMap<int, int> IntIntMap;
- foreach(const IntIntMap & counts, facesStatMap)
+ foreach(const IntIntMap& counts, facesStatMap)
{
QMap<int, int>::const_iterator it;
diff --git a/digikam/album/albummanager.h b/digikam/album/albummanager.h
index 4710a0f..1c97263 100644
--- a/digikam/album/albummanager.h
+++ b/digikam/album/albummanager.h
@@ -829,7 +829,7 @@ public:
AlbumPointerList<T>& operator=(const QList<T*>& list)
{
- foreach (T* t, list)
+ foreach(T* t, list)
{
append(AlbumPointer<T>(t));
}
diff --git a/digikam/album/albumtreeview.cpp b/digikam/album/albumtreeview.cpp
index 38b4c28..afe4467 100644
--- a/digikam/album/albumtreeview.cpp
+++ b/digikam/album/albumtreeview.cpp
@@ -65,7 +65,7 @@ static QList<A*> selectedAlbums(QItemSelectionModel* selModel, \
AlbumFilterModel* {
QList<QModelIndex> indexes = selModel->selectedIndexes();
QList<A*> albums;
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
albums << static_cast<A*>(filterModel->albumForIndex(index));
}
@@ -376,7 +376,7 @@ void \
AbstractAlbumTreeView::slotSearchTextSettingsAboutToChange(bool searched, b
// selection is ignored here because the user may have changed this
// while searching
- foreach (const int& expandedId, expansion)
+ foreach(const int& expandedId, expansion)
{
d->searchBackup[expandedId].expanded = true;
}
@@ -686,7 +686,7 @@ void AbstractAlbumTreeView::doLoadState()
// extract the selection from the config
const QStringList selection = \
configGroup.readEntry(entryName(d->configSelectionEntry), QStringList()); //kDebug() \
<< "selection: " << selection;
- foreach (const QString& key, selection)
+ foreach(const QString& key, selection)
{
bool validId;
int id = key.toInt(&validId);
@@ -700,7 +700,7 @@ void AbstractAlbumTreeView::doLoadState()
// extract expansion state from config
const QStringList expansion = \
configGroup.readEntry(entryName(d->configExpansionEntry), QStringList()); //kDebug() \
<< "expansion: " << expansion;
- foreach (const QString& key, expansion)
+ foreach(const QString& key, expansion)
{
bool validId;
int id = key.toInt(&validId);
@@ -1029,7 +1029,7 @@ void AbstractAlbumTreeView::contextMenuEvent(QContextMenuEvent* \
event) ContextMenuHelper cmhelper(&popmenu);
addCustomContextMenuActions(cmhelper, album);
- foreach (ContextMenuElement* element, d->contextMenuElements)
+ foreach(ContextMenuElement* element, d->contextMenuElements)
{
element->addActions(this, cmhelper, album);
}
diff --git a/digikam/album/albumwatch.cpp b/digikam/album/albumwatch.cpp
index 5aca9a3..94fab7e 100644
--- a/digikam/album/albumwatch.cpp
+++ b/digikam/album/albumwatch.cpp
@@ -103,7 +103,7 @@ void AlbumWatch::AlbumWatchPriv::determineMode()
bool AlbumWatch::AlbumWatchPriv::inBlackList(const QString& path)
{
// Filter out dirty signals triggered by changes on the database file
- foreach (const QString& bannedFile, fileNameBlackList)
+ foreach(const QString& bannedFile, fileNameBlackList)
{
if (path.endsWith(bannedFile))
{
@@ -146,7 +146,7 @@ void AlbumWatch::clear()
{
if (d->dirWatch)
{
- foreach (const QString& addedDirectory, d->dirWatchAddedDirs)
+ foreach(const QString& addedDirectory, d->dirWatchAddedDirs)
{
d->dirWatch->removeDir(addedDirectory);
}
@@ -339,7 +339,7 @@ QList<QDateTime> \
AlbumWatch::AlbumWatchPriv::buildDirectoryModList(const QFileIn
QFileInfoList fileInfoList = dbFile.dir().entryInfoList(QDir::Files | \
QDir::Dirs | QDir::NoDotAndDotDot);
// build list
- foreach (const QFileInfo& info, fileInfoList)
+ foreach(const QFileInfo& info, fileInfoList)
{
// ignore digikam4.db and journal and other temporary files
if (!fileNameBlackList.contains(info.fileName()))
@@ -481,7 +481,7 @@ void AlbumWatch::slotKioFileMoved(const QString& urlFrom, const \
QString& urlTo) void AlbumWatch::slotKioFilesDeleted(const QStringList& urls)
{
kDebug() << urls;
- foreach (const QString& url, urls)
+ foreach(const QString& url, urls)
{
handleKioNotification(KUrl(url));
}
diff --git a/digikam/database/imageattributeswatch.cpp \
b/digikam/database/imageattributeswatch.cpp index b3eaffa..788a04f 100644
--- a/digikam/database/imageattributeswatch.cpp
+++ b/digikam/database/imageattributeswatch.cpp
@@ -82,7 +82,7 @@ void ImageAttributesWatch::slotImageChange(const ImageChangeset& \
changeset) (set & DatabaseFields::ModificationDate) ||
(set & DatabaseFields::Rating))
{
- foreach (const qlonglong& imageId, changeset.ids())
+ foreach(const qlonglong& imageId, changeset.ids())
{
if (set & DatabaseFields::ImageCommentsAll)
{
@@ -105,7 +105,7 @@ void ImageAttributesWatch::slotImageChange(const ImageChangeset& \
changeset)
void ImageAttributesWatch::slotImageTagChange(const ImageTagChangeset& changeset)
{
- foreach (const qlonglong& imageId, changeset.ids())
+ foreach(const qlonglong& imageId, changeset.ids())
{
emit signalImageTagsChanged(imageId);
}
diff --git a/digikam/database/scancontroller.cpp \
b/digikam/database/scancontroller.cpp index d053f62..1366da0 100644
--- a/digikam/database/scancontroller.cpp
+++ b/digikam/database/scancontroller.cpp
@@ -1066,7 +1066,7 @@ void \
ScanControllerLoadingCacheFileWatch::slotImageChanged(const ImageChangeset& {
DatabaseAccess access;
- foreach (const qlonglong& imageId, changeset.ids())
+ foreach(const qlonglong& imageId, changeset.ids())
{
DatabaseFields::Set changes = changeset.changes();
diff --git a/digikam/dragdrop/ddragobjects.cpp b/digikam/dragdrop/ddragobjects.cpp
index fe11054..35f3980 100644
--- a/digikam/dragdrop/ddragobjects.cpp
+++ b/digikam/dragdrop/ddragobjects.cpp
@@ -73,7 +73,7 @@ QStringList DItemDrag::mimeTypes()
bool DItemDrag::canDecode(const QMimeData* e)
{
- foreach (const QString& mimeType, mimeTypes())
+ foreach(const QString& mimeType, mimeTypes())
{
if (!e->hasFormat(mimeType))
{
@@ -220,7 +220,7 @@ bool DAlbumDrag::canDecode(const QMimeData* e)
return false;
}
- foreach (const QString& mimeType, mimeTypes())
+ foreach(const QString& mimeType, mimeTypes())
{
if (!e->hasFormat(mimeType))
{
diff --git a/digikam/dragdrop/imagedragdrop.cpp b/digikam/dragdrop/imagedragdrop.cpp
index 8500d24..f8b37a6 100644
--- a/digikam/dragdrop/imagedragdrop.cpp
+++ b/digikam/dragdrop/imagedragdrop.cpp
@@ -646,7 +646,7 @@ QMimeData* ImageDragDropHandler::createMimeData(const \
QList<QModelIndex>& indexe QList<int> albumIDs;
QList<qlonglong> imageIDs;
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
urls.append(info.fileUrl());
kioURLs.append(info.databaseUrl());
diff --git a/digikam/dragdrop/tagdragdrop.cpp b/digikam/dragdrop/tagdragdrop.cpp
index cefb5a6..f4c680c 100644
--- a/digikam/dragdrop/tagdragdrop.cpp
+++ b/digikam/dragdrop/tagdragdrop.cpp
@@ -294,7 +294,7 @@ QMimeData* TagDragDropHandler::createMimeData(const \
QList<Album*>& albums) {
// TODO update, supporting this sounds harder ;)
// QList<int> ids;
- // foreach (Album* album, albums)
+ // foreach(Album* album, albums)
// {
// ids << album->id();
// }
diff --git a/digikam/filters/filtersidebarwidget.cpp \
b/digikam/filters/filtersidebarwidget.cpp index dc116ef..9d28691 100644
--- a/digikam/filters/filtersidebarwidget.cpp
+++ b/digikam/filters/filtersidebarwidget.cpp
@@ -352,28 +352,28 @@ void FilterSideBarWidget::filterChanged()
if (!showUntagged || d->tagMatchCond == ImageFilterSettings::OrCondition)
{
- foreach (TAlbum* tag, d->tagFilterView->getCheckedTags())
+ foreach(TAlbum* tag, d->tagFilterView->getCheckedTags())
{
if (tag)
{
includedTagIds << tag->id();
}
}
- foreach (TAlbum* tag, d->tagFilterView->getPartiallyCheckedTags())
+ foreach(TAlbum* tag, d->tagFilterView->getPartiallyCheckedTags())
{
if (tag)
{
excludedTagIds << tag->id();
}
}
- foreach (TAlbum* tag, d->colorLabelFilter->getCheckedColorLabelTags())
+ foreach(TAlbum* tag, d->colorLabelFilter->getCheckedColorLabelTags())
{
if (tag)
{
clTagIds << tag->id();
}
}
- foreach (TAlbum* tag, d->pickLabelFilter->getCheckedPickLabelTags())
+ foreach(TAlbum* tag, d->pickLabelFilter->getCheckedPickLabelTags())
{
if (tag)
{
diff --git a/digikam/items/digikamimageview.cpp b/digikam/items/digikamimageview.cpp
index 3463bb8..ef9a09e 100644
--- a/digikam/items/digikamimageview.cpp
+++ b/digikam/items/digikamimageview.cpp
@@ -268,7 +268,7 @@ void DigikamImageView::confirmFaces(const QList<QModelIndex>& \
indexes, int tagId && imageAlbumModel()->currentAlbum()
&& tagId != imageAlbumModel()->currentAlbum()->id();
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
infos << ImageModel::retrieveImageInfo(index);
faces << d->faceDelegate->face(index);
@@ -292,7 +292,7 @@ void DigikamImageView::removeFaces(const QList<QModelIndex>& \
indexes) QList<DatabaseFace> faces;
QList<QModelIndex> sourceIndexes;
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
infos << ImageModel::retrieveImageInfo(index);
faces << d->faceDelegate->face(index);
@@ -328,7 +328,7 @@ void DigikamImageView::showContextMenuOnInfo(QContextMenuEvent* \
event, const Ima {
QList<ImageInfo> selectedInfos = selectedImageInfosCurrentFirst();
QList<qlonglong> selectedImageIDs;
- foreach (const ImageInfo& info, selectedInfos)
+ foreach(const ImageInfo& info, selectedInfos)
{
selectedImageIDs << info.id();
}
@@ -438,7 +438,7 @@ void DigikamImageView::showGroupContextMenu(const QModelIndex& \
index, QContextMe Q_UNUSED(index);
QList<ImageInfo> selectedInfos = selectedImageInfosCurrentFirst();
QList<qlonglong> selectedImageIDs;
- foreach (const ImageInfo& info, selectedInfos)
+ foreach(const ImageInfo& info, selectedInfos)
{
selectedImageIDs << info.id();
}
diff --git a/digikam/items/imagecategorizedview.cpp \
b/digikam/items/imagecategorizedview.cpp index 114481f..c9329be 100644
--- a/digikam/items/imagecategorizedview.cpp
+++ b/digikam/items/imagecategorizedview.cpp
@@ -309,7 +309,7 @@ QList<ImageInfo> \
ImageCategorizedView::selectedImageInfosCurrentFirst() const QModelIndex \
current = currentIndex(); QList<ImageInfo> infos;
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
ImageInfo info = d->filterModel->imageInfo(index);
@@ -336,7 +336,7 @@ KUrl::List ImageCategorizedView::urls() const
QList<ImageInfo> infos = imageInfos();
KUrl::List urls;
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
urls << info.fileUrl();
}
@@ -349,7 +349,7 @@ KUrl::List ImageCategorizedView::selectedUrls() const
QList<ImageInfo> infos = selectedImageInfos();
KUrl::List urls;
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
urls << info.fileUrl();
}
@@ -391,7 +391,7 @@ QModelIndex ImageCategorizedView::nextIndexHint(const \
QModelIndex& anchor, const
int minDiff = d->filterModel->rowCount();
QList<QModelIndex> indexesForImageInfo = \
d->filterModel->mapListFromSource(d->model->indexesForImageInfo(info));
- foreach (const QModelIndex& index, indexesForImageInfo)
+ foreach(const QModelIndex& index, indexesForImageInfo)
{
if (index == anchor || !index.isValid() || removed.contains(index))
{
@@ -512,7 +512,7 @@ void ImageCategorizedView::setSelectedImageInfos(const \
QList<ImageInfo>& infos) {
QItemSelection mySelection;
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
QModelIndex index = d->filterModel->indexForImageInfo(info);
mySelection.select(index, index);
diff --git a/digikam/items/imageviewutilities.cpp \
b/digikam/items/imageviewutilities.cpp index 1a80d74..1623824 100644
--- a/digikam/items/imageviewutilities.cpp
+++ b/digikam/items/imageviewutilities.cpp
@@ -131,7 +131,7 @@ bool ImageViewUtilities::deleteImages(const QList<ImageInfo>& \
infos, bool delete KUrl::List urlList;
KUrl::List kioUrlList;
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
urlList << info.fileUrl();
kioUrlList << info.databaseUrl();
@@ -177,7 +177,7 @@ void ImageViewUtilities::deleteImagesDirectly(const \
QList<ImageInfo>& infos, boo KUrl::List kioUrlList;
KUrl::List urlList;
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
urlList << info.fileUrl();
kioUrlList << info.databaseUrl();
@@ -230,7 +230,7 @@ void ImageViewUtilities::slotDIOResult(KJob* kjob)
void ImageViewUtilities::notifyFileContentChanged(const KUrl::List& urls)
{
- foreach (const KUrl& url, urls)
+ foreach(const KUrl& url, urls)
{
QString path = url.toLocalFile();
ThumbnailLoadThread::deleteThumbnail(path);
@@ -244,7 +244,7 @@ void ImageViewUtilities::createNewAlbumForInfos(const \
QList<ImageInfo>& infos, A KUrl::List kioURLs;
QList<qlonglong> imageIDs;
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
imageIDs << info.id();
kioURLs << info.databaseUrl();
diff --git a/digikam/main/digikamapp.cpp b/digikam/main/digikamapp.cpp
index b58e94d..3bfb23a 100644
--- a/digikam/main/digikamapp.cpp
+++ b/digikam/main/digikamapp.cpp
@@ -735,7 +735,7 @@ void DigikamApp::setupActions()
connect(browseActionsMapper, SIGNAL(mapped(QWidget*)),
d->view, SLOT(slotLeftSideBarActivate(QWidget*)));
- foreach (SidebarWidget* leftWidget, d->view->leftSidebarWidgets())
+ foreach(SidebarWidget* leftWidget, d->view->leftSidebarWidgets())
{
QString actionName = "browse_" +
leftWidget->objectName().remove(' \
').remove("Sidebar").remove("FolderView").remove("View").toLower(); @@ -1628,7 \
+1628,7 @@ void DigikamApp::DigikamAppPriv::updateProgressBar() else
{
bool canCancelOne = false;
- foreach (const ProgressEntry& entry, progressEntries)
+ foreach(const ProgressEntry& entry, progressEntries)
{
if (entry.canCancel)
{
@@ -1662,7 +1662,7 @@ void DigikamApp::DigikamAppPriv::updateProgressValue()
}
float progress = 0;
- foreach (const ProgressEntry& entry, progressEntries)
+ foreach(const ProgressEntry& entry, progressEntries)
{
progress += entry.progress;
}
@@ -2727,7 +2727,7 @@ void DigikamApp::slotKipiPluginPlug()
d->kipiMetadataActions.clear();
// Remove Advanced slideshow kipi-plugin action from View/Slideshow menu.
- foreach (QAction* action, d->slideShowAction->menu()->actions())
+ foreach(QAction* action, d->slideShowAction->menu()->actions())
{
if (action->objectName() == QString("advancedslideshow"))
{
@@ -2772,7 +2772,7 @@ void DigikamApp::slotKipiPluginPlug()
if (allPluginActions.count() > 3)
{
KActionCategory* category = new KActionCategory(plugin->objectName(), \
d->kipipluginsActionCollection);
- foreach (QAction* action, allPluginActions)
+ foreach(QAction* action, allPluginActions)
{
QString actionName(action->objectName());
@@ -2784,7 +2784,7 @@ void DigikamApp::slotKipiPluginPlug()
}
else
{
- foreach (QAction* action, allPluginActions)
+ foreach(QAction* action, allPluginActions)
{
QString actionName(action->objectName());
@@ -2798,7 +2798,7 @@ void DigikamApp::slotKipiPluginPlug()
// Plugin category identification using KAction method based.
QList<KAction*> actions = plugin->actions();
- foreach (KAction* action, actions)
+ foreach(KAction* action, actions)
{
QString actionName(action->objectName());
@@ -3206,16 +3206,16 @@ void DigikamApp::updateCameraMenu()
{
d->cameraMenu->menu()->clear();
- foreach (QAction* action, d->solidCameraActionGroup->actions())
+ foreach(QAction* action, d->solidCameraActionGroup->actions())
{
d->cameraMenu->addAction(action);
}
d->cameraMenu->addSeparator();
- foreach (QAction* action, d->manualCameraActionGroup->actions())
+ foreach(QAction* action, d->manualCameraActionGroup->actions())
{
// remove duplicate entries, prefer manually added cameras
- foreach (QAction* actionSolid, d->solidCameraActionGroup->actions())
+ foreach(QAction* actionSolid, d->solidCameraActionGroup->actions())
{
if (CameraNameHelper::sameDevices(actionSolid->iconText(), \
action->iconText())) {
@@ -3233,15 +3233,15 @@ void DigikamApp::updateCameraMenu()
void DigikamApp::updateQuickImportAction()
{
d->quickImportMenu->menu()->clear();
- foreach (QAction* action, d->solidCameraActionGroup->actions())
+ foreach(QAction* action, d->solidCameraActionGroup->actions())
{
d->quickImportMenu->addAction(action);
}
- foreach (QAction* action, d->solidUsmActionGroup->actions())
+ foreach(QAction* action, d->solidUsmActionGroup->actions())
{
d->quickImportMenu->addAction(action);
}
- foreach (QAction* action, d->manualCameraActionGroup->actions())
+ foreach(QAction* action, d->manualCameraActionGroup->actions())
{
d->quickImportMenu->addAction(action);
}
@@ -3256,7 +3256,7 @@ void DigikamApp::updateQuickImportAction()
QAction* primaryAction = 0;
QDateTime latest;
- foreach (QAction* action, d->quickImportMenu->menu()->actions())
+ foreach(QAction* action, d->quickImportMenu->menu()->actions())
{
QDateTime appearanceTime = \
d->cameraAppearanceTimes.value(action->data().toString());
@@ -3427,7 +3427,7 @@ void DigikamApp::slotComponentsInfo()
void DigikamApp::showToolBars(bool show)
{
QList<KToolBar*> toolbars = toolBars();
- foreach (KToolBar* toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
show ? toolbar->show() : toolbar->hide();
}
diff --git a/digikam/metadata/metadatahub.cpp b/digikam/metadata/metadatahub.cpp
index 66067be..3bb5600 100644
--- a/digikam/metadata/metadatahub.cpp
+++ b/digikam/metadata/metadatahub.cpp
@@ -264,7 +264,7 @@ void MetadataHub::loadTags(const QList<int>& loadedTags)
QSet<int> previousTags = d->tags.keys().toSet();
// first go through all tags contained in this set
- foreach (int tagId, loadedTags)
+ foreach(int tagId, loadedTags)
{
if (TagsCache::instance()->isInternalTag(tagId))
{
@@ -303,7 +303,7 @@ void MetadataHub::loadTags(const QList<int>& loadedTags)
// Those tags which had been set as MetadataAvailable before,
// but are not contained in this set, have to be set to MetadataDisjoint
- foreach (int tagId, previousTags)
+ foreach(int tagId, previousTags)
{
QMap<int, TagStatus>::iterator mapIt = d->tags.find(tagId);
@@ -1219,7 +1219,7 @@ void MetadataHubOnTheRoad::applyChangeNotifications()
d->tagIds.clear();
}
- foreach (int tagId, tagIds)
+ foreach(int tagId, tagIds)
{
notifyTagDeleted(tagId);
}
diff --git a/digikam/metadata/metadatamanager.cpp \
b/digikam/metadata/metadatamanager.cpp index 81fb8f2..9ed64a3 100644
--- a/digikam/metadata/metadatamanager.cpp
+++ b/digikam/metadata/metadatamanager.cpp
@@ -355,7 +355,7 @@ void MetadataManager::MetadataManagerPriv::setWriterAction(const \
QString& action void MetadataManager::MetadataManagerPriv::startingToWrite(const \
QList<ImageInfo>& infos) {
QMutexLocker lock(&mutex);
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
scheduledToWrite.remove(info.id());
}
@@ -508,7 +508,7 @@ void MetadataManagerDatabaseWorker::assignPickLabel(const \
QList<ImageInfo>& info //ScanController::instance()->suspendCollectionScan();
DatabaseOperationGroup group;
group.setMaximumTime(200);
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
hub.load(info);
hub.setPickLabel(pickId);
@@ -546,7 +546,7 @@ void MetadataManagerDatabaseWorker::assignColorLabel(const \
QList<ImageInfo>& inf //ScanController::instance()->suspendCollectionScan();
DatabaseOperationGroup group;
group.setMaximumTime(200);
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
hub.load(info);
hub.setColorLabel(colorId);
@@ -585,7 +585,7 @@ void MetadataManagerDatabaseWorker::assignRating(const \
QList<ImageInfo>& infos, //ScanController::instance()->suspendCollectionScan();
DatabaseOperationGroup group;
group.setMaximumTime(200);
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
hub.load(info);
hub.setRating(rating);
@@ -619,7 +619,7 @@ void MetadataManagerDatabaseWorker::editGroup(int groupAction, \
const ImageInfo& {
DatabaseOperationGroup group;
group.setMaximumTime(200);
- foreach (const ImageInfo& constInfo, infos)
+ foreach(const ImageInfo& constInfo, infos)
{
ImageInfo info(constInfo);
@@ -685,7 +685,7 @@ void MetadataManagerFileWorker::writeOrientationToFiles(const \
QList<ImageInfo>&
QStringList failedItems;
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
//kDebug() << "Setting Exif Orientation tag to " << orientation;
diff --git a/digikam/tags/addtagscompletionbox.cpp \
b/digikam/tags/addtagscompletionbox.cpp index 21a162d..266421c 100644
--- a/digikam/tags/addtagscompletionbox.cpp
+++ b/digikam/tags/addtagscompletionbox.cpp
@@ -267,12 +267,12 @@ void AddTagsCompletionBox::setItems(const QString& currentText, \
const QStringLis
AddTagsCompletionBoxItem* createItemTopLevel = \
d->createItemForNewTag(currentText, 0);
QList<AddTagsCompletionBoxItem*> assignItems;
- foreach (const QString& tagName, completionEntries)
+ foreach(const QString& tagName, completionEntries)
{
QList<int> tagIds = TagsCache::instance()->tagsForName(tagName);
bool uniqueName = tagIds.count() == 1;
- foreach (int tagId, tagIds)
+ foreach(int tagId, tagIds)
{
AddTagsCompletionBoxItem* item = \
d->createItemForExistingTag(AlbumManager::instance()->findTAlbum(tagId), uniqueName); \
@@ -292,7 +292,7 @@ void AddTagsCompletionBox::setItems(const QString& currentText, \
const QStringLis {
addItem(createItemUnderParent);
setCurrentItem(createItemUnderParent);
- foreach (AddTagsCompletionBoxItem* item, assignItems)
+ foreach(AddTagsCompletionBoxItem* item, assignItems)
{
addItem(item);
}
@@ -302,7 +302,7 @@ void AddTagsCompletionBox::setItems(const QString& currentText, \
const QStringLis {
addItem(createItemTopLevel);
setCurrentItem(createItemTopLevel);
- foreach (AddTagsCompletionBoxItem* item, assignItems)
+ foreach(AddTagsCompletionBoxItem* item, assignItems)
{
addItem(item);
}
@@ -311,7 +311,7 @@ void AddTagsCompletionBox::setItems(const QString& currentText, \
const QStringLis }
else
{
- foreach (AddTagsCompletionBoxItem* item, assignItems)
+ foreach(AddTagsCompletionBoxItem* item, assignItems)
{
addItem(item);
@@ -627,7 +627,7 @@ TaggingAction \
AddTagsCompletionBox::makeDefaultTaggingAction(const QString& text // sort lexically
QMap<QString, int> map;
- foreach (int id, tagIds)
+ foreach(int id, tagIds)
{
map[TagsCache::instance()->tagPath(id, \
TagsCache::NoLeadingSlash)] = id; }
diff --git a/digikam/tags/tagcheckview.cpp b/digikam/tags/tagcheckview.cpp
index 1a1c11a..b2ed328 100644
--- a/digikam/tags/tagcheckview.cpp
+++ b/digikam/tags/tagcheckview.cpp
@@ -159,7 +159,7 @@ void TagCheckView::doSaveState()
QList<TAlbum*> TagCheckView::getCheckedTags() const
{
QList<TAlbum*> tags;
- foreach (Album* album, albumModel()->checkedAlbums())
+ foreach(Album* album, albumModel()->checkedAlbums())
{
TAlbum* tag = dynamic_cast<TAlbum*> (album);
@@ -174,7 +174,7 @@ QList<TAlbum*> TagCheckView::getCheckedTags() const
QList<TAlbum*> TagCheckView::getPartiallyCheckedTags() const
{
QList<TAlbum*> tags;
- foreach (Album* album, albumModel()->partiallyCheckedAlbums())
+ foreach(Album* album, albumModel()->partiallyCheckedAlbums())
{
TAlbum* tag = dynamic_cast<TAlbum*> (album);
diff --git a/digikam/tags/tagsactionmngr.cpp b/digikam/tags/tagsactionmngr.cpp
index c7023c9..89d181c 100644
--- a/digikam/tags/tagsactionmngr.cpp
+++ b/digikam/tags/tagsactionmngr.cpp
@@ -144,7 +144,7 @@ void TagsActionMngr::createActions()
// Create Tags shortcuts.
QList<int> tagIds = \
TagsCache::instance()->tagsWithProperty(TagPropertyName::tagKeyboardShortcut());
- foreach (int tagId, tagIds)
+ foreach(int tagId, tagIds)
{
createTagActionShortcut(tagId);
}
diff --git a/digikam/tags/tagspopupmenu.cpp b/digikam/tags/tagspopupmenu.cpp
index d17ab10..752fcd3 100644
--- a/digikam/tags/tagspopupmenu.cpp
+++ b/digikam/tags/tagspopupmenu.cpp
@@ -827,7 +827,7 @@ void TagsPopupMenu::slotAddTag(QAction* action)
void TagsPopupMenu::slotTagThumbnail(Album* album, const QPixmap& pix)
{
QList<QAction*> actionList = actions();
- foreach (QAction* action, actionList)
+ foreach(QAction* action, actionList)
{
if (action->data().toInt() == album->id())
{
diff --git a/digikam/utils/albumsettings.cpp b/digikam/utils/albumsettings.cpp
index 6256dd0..d113da9 100644
--- a/digikam/utils/albumsettings.cpp
+++ b/digikam/utils/albumsettings.cpp
@@ -873,7 +873,7 @@ QString AlbumSettings::getImageFileFilter() const
QStringList imageSettings;
DatabaseAccess().db()->getFilterSettings(&imageSettings, 0, 0);
QStringList wildcards;
- foreach (const QString& suffix, imageSettings)
+ foreach(const QString& suffix, imageSettings)
{
wildcards << "*." + suffix;
}
@@ -885,7 +885,7 @@ QString AlbumSettings::getMovieFileFilter() const
QStringList movieSettings;
DatabaseAccess().db()->getFilterSettings(0, &movieSettings, 0);
QStringList wildcards;
- foreach (const QString& suffix, movieSettings)
+ foreach(const QString& suffix, movieSettings)
{
wildcards << "*." + suffix;
}
@@ -897,7 +897,7 @@ QString AlbumSettings::getAudioFileFilter() const
QStringList audioSettings;
DatabaseAccess().db()->getFilterSettings(0, 0, &audioSettings);
QStringList wildcards;
- foreach (const QString& suffix, audioSettings)
+ foreach(const QString& suffix, audioSettings)
{
wildcards << "*." + suffix;
}
@@ -924,7 +924,7 @@ QString AlbumSettings::getRawFileFilter() const
}
QStringList wildcards;
- foreach (const QString& suffix, supportedRaws)
+ foreach(const QString& suffix, supportedRaws)
{
wildcards << "*." + suffix;
}
@@ -936,15 +936,15 @@ QString AlbumSettings::getAllFileFilter() const
QStringList imageFilter, audioFilter, videoFilter;
DatabaseAccess().db()->getFilterSettings(&imageFilter, &audioFilter, \
&videoFilter); QStringList wildcards;
- foreach (const QString& suffix, imageFilter)
+ foreach(const QString& suffix, imageFilter)
{
wildcards << "*." + suffix;
}
- foreach (const QString& suffix, audioFilter)
+ foreach(const QString& suffix, audioFilter)
{
wildcards << "*." + suffix;
}
- foreach (const QString& suffix, videoFilter)
+ foreach(const QString& suffix, videoFilter)
{
wildcards << "*." + suffix;
}
diff --git a/digikam/utils/contextmenuhelper.cpp \
b/digikam/utils/contextmenuhelper.cpp index 3f9c0b1..bef6e2f 100644
--- a/digikam/utils/contextmenuhelper.cpp
+++ b/digikam/utils/contextmenuhelper.cpp
@@ -263,7 +263,7 @@ void ContextMenuHelper::addServicesMenu(const KUrl::List& \
selectedItems) QStringList mimeTypes;
KService::List offers;
- foreach(const KUrl & item, d->selectedItems)
+ foreach(const KUrl& item, d->selectedItems)
{
const QString mimeType = KMimeType::findByUrl(item, 0, true, true)->name();
@@ -279,7 +279,7 @@ void ContextMenuHelper::addServicesMenu(const KUrl::List& \
selectedItems) const QString firstMimeType = mimeTypes.takeFirst();
const QString constraintTemplate = "'%1' in ServiceTypes";
QStringList constraints;
- foreach(const QString & mimeType, mimeTypes)
+ foreach(const QString& mimeType, mimeTypes)
{
constraints << constraintTemplate.arg(mimeType);
}
@@ -407,14 +407,14 @@ KAction* ContextMenuHelper::kipiRotateAction()
KIPI::PluginLoader* kipiPluginLoader = KIPI::PluginLoader::instance();
KIPI::PluginLoader::PluginList pluginList = kipiPluginLoader->pluginList();
- foreach(KIPI::PluginLoader::Info * info, pluginList)
+ foreach(KIPI::PluginLoader::Info* info, pluginList)
{
KIPI::Plugin* plugin = info->plugin();
if (plugin && info->shouldLoad() && info->library() == \
"kipiplugin_jpeglossless") {
QList<KAction*> actionList = plugin->actions();
- foreach(KAction * action, actionList)
+ foreach(KAction* action, actionList)
{
if (action->objectName().toLatin1() == \
QString::fromLatin1("jpeglossless_rotate")) {
@@ -431,7 +431,7 @@ bool ContextMenuHelper::imageIdsHaveSameCategory(const imageIds& \
ids, DatabaseIt bool sameCategory = true;
QVariantList varList;
- foreach(const qlonglong & id, ids)
+ foreach(const qlonglong& id, ids)
{
varList = DatabaseAccess().db()->getImagesFields(id, \
DatabaseFields::Category);
@@ -918,7 +918,7 @@ void ContextMenuHelper::addGroupMenu(imageIds& ids)
}
KMenu* menu = new KMenu(i18n("Group"));
- foreach(QAction * action, actions)
+ foreach(QAction* action, actions)
{
menu->addAction(action);
}
@@ -927,7 +927,7 @@ void ContextMenuHelper::addGroupMenu(imageIds& ids)
void ContextMenuHelper::addGroupActions(imageIds& ids)
{
- foreach(QAction * action, groupMenuActions(ids))
+ foreach(QAction* action, groupMenuActions(ids))
{
d->parent->addAction(action);
}
diff --git a/digikam/utils/tooltipfiller.cpp b/digikam/utils/tooltipfiller.cpp
index 20826c8..eff4170 100644
--- a/digikam/utils/tooltipfiller.cpp
+++ b/digikam/utils/tooltipfiller.cpp
@@ -493,7 +493,7 @@ QString ToolTipFiller::filterActionTipContents(const \
FilterAction& action) const QHash<QString, QVariant>& params = action.parameters();
QList<QString> keys = params.keys();
qSort(keys);
- foreach (const QString& key, keys)
+ foreach(const QString& key, keys)
{
QHash<QString, QVariant>::const_iterator it;
diff --git a/digikam/views/digikamview.cpp b/digikam/views/digikamview.cpp
index ad9ceb6..75f766b 100644
--- a/digikam/views/digikamview.cpp
+++ b/digikam/views/digikamview.cpp
@@ -266,7 +266,7 @@ DigikamView::DigikamView(QWidget* parent, DigikamModelCollection* \
modelCollectio
d->leftSideBarWidgets << d->peopleSideBar;
- foreach (SidebarWidget* leftWidget, d->leftSideBarWidgets)
+ foreach(SidebarWidget* leftWidget, d->leftSideBarWidgets)
{
d->leftSideBar->appendTab(leftWidget, leftWidget->getIcon(),
leftWidget->getCaption());
@@ -309,7 +309,7 @@ DigikamView::~DigikamView()
void DigikamView::applySettings()
{
- foreach (SidebarWidget* sidebarWidget, d->leftSideBarWidgets)
+ foreach(SidebarWidget* sidebarWidget, d->leftSideBarWidgets)
{
sidebarWidget->applySettings();
}
@@ -633,7 +633,7 @@ void DigikamView::slotPopupFiltersView()
void DigikamView::loadViewState()
{
- foreach (SidebarWidget* widget, d->leftSideBarWidgets)
+ foreach(SidebarWidget* widget, d->leftSideBarWidgets)
{
widget->loadState();
}
@@ -662,7 +662,7 @@ void DigikamView::saveViewState()
KSharedConfig::Ptr config = KGlobal::config();
KConfigGroup group = config->group("MainWindow");
- foreach (SidebarWidget* widget, d->leftSideBarWidgets)
+ foreach(SidebarWidget* widget, d->leftSideBarWidgets)
{
widget->saveState();
}
@@ -1750,7 +1750,7 @@ void DigikamView::slotLeftSidebarChangedTab(QWidget* w)
{
// TODO update, temporary cast
SidebarWidget* widget = dynamic_cast<SidebarWidget*> (w);
- foreach (SidebarWidget* sideBarWidget, d->leftSideBarWidgets)
+ foreach(SidebarWidget* sideBarWidget, d->leftSideBarWidgets)
{
bool active = (widget && (widget == sideBarWidget));
sideBarWidget->setActive(active);
diff --git a/digikam/views/imagepreviewview.cpp b/digikam/views/imagepreviewview.cpp
index d4ad8a2..7b5e996 100644
--- a/digikam/views/imagepreviewview.cpp
+++ b/digikam/views/imagepreviewview.cpp
@@ -515,7 +515,7 @@ void ImagePreviewView::slotRotateLeft()
if (action)
{
QList<QAction*> list = action->menu()->actions();
- foreach(QAction * ac, list)
+ foreach(QAction* ac, list)
{
if (ac->objectName() == QString("rotate_ccw"))
{
@@ -532,7 +532,7 @@ void ImagePreviewView::slotRotateRight()
if (action)
{
QList<QAction*> list = action->menu()->actions();
- foreach(QAction * ac, list)
+ foreach(QAction* ac, list)
{
if (ac->objectName() == QString("rotate_cw"))
{
diff --git a/digikam/views/mapwidgetview.cpp b/digikam/views/mapwidgetview.cpp
index 0317d1a..1bfa3e9 100644
--- a/digikam/views/mapwidgetview.cpp
+++ b/digikam/views/mapwidgetview.cpp
@@ -312,7 +312,7 @@ QPersistentModelIndex \
MapViewModelHelper::bestRepresentativeIndexFromList(const // now get the ImageInfos \
and convert them to GPSImageInfos
const QList<ImageInfo> imageInfoList = d->model->imageInfos(indexList);
GPSImageInfo::List gpsImageInfoList;
- foreach (const ImageInfo& imageInfo, imageInfoList)
+ foreach(const ImageInfo& imageInfo, imageInfoList)
{
GPSImageInfo gpsImageInfo;
@@ -411,7 +411,7 @@ void MapViewModelHelper::slotImageChange(const ImageChangeset& \
changeset) || ( changes & DatabaseFields::Altitude ) )
{
- foreach (const qlonglong& id, changeset.ids())
+ foreach(const qlonglong& id, changeset.ids())
{
const QModelIndex index = d->model->indexForImageId(id);
diff --git a/digikam/views/stackedview.cpp b/digikam/views/stackedview.cpp
index d69f102..dcdc089 100644
--- a/digikam/views/stackedview.cpp
+++ b/digikam/views/stackedview.cpp
@@ -372,7 +372,7 @@ void StackedView::syncSelection(ImageCategorizedView* from, \
ImageCategorizedView // sync selection
QItemSelection selection = from->selectionModel()->selection();
QItemSelection newSelection;
- foreach (const QItemSelectionRange& range, selection)
+ foreach(const QItemSelectionRange& range, selection)
{
QModelIndex topLeft = \
toModel->indexForImageInfo(fromModel->imageInfo(range.topLeft()));
QModelIndex bottomRight = \
toModel->indexForImageInfo(fromModel->imageInfo(range.bottomRight()));
diff --git a/imageplugins/color/imageplugin_color.cpp \
b/imageplugins/color/imageplugin_color.cpp index a5e37b7..8cb1f95 100644
--- a/imageplugins/color/imageplugin_color.cpp
+++ b/imageplugins/color/imageplugin_color.cpp
@@ -328,7 +328,7 @@ void ImagePlugin_Color::slotUpdateColorSpaceMenu()
<< IccProfile::wideGamutRGB()
<< IccProfile::proPhotoRGB();
- foreach (IccProfile profile, standardProfiles) // krazy:exclude=foreach
+ foreach(IccProfile profile, standardProfiles) // krazy:exclude=foreach
{
d->profileMenuAction->addProfile(profile, profile.description());
standardProfilePaths << profile.filePath();
@@ -338,7 +338,7 @@ void ImagePlugin_Color::slotUpdateColorSpaceMenu()
favoriteProfilePaths = \
QSet<QString>::fromList(ProfileConversionTool::favoriteProfiles()); \
favoriteProfilePaths -= standardProfilePaths;
- foreach (const QString& path, favoriteProfilePaths)
+ foreach(const QString& path, favoriteProfilePaths)
{
favoriteProfiles << path;
}
diff --git a/imageplugins/enhance/hotpixels/hotpixelfixer.cpp \
b/imageplugins/enhance/hotpixels/hotpixelfixer.cpp index e69897c..7d750e6 100644
--- a/imageplugins/enhance/hotpixels/hotpixelfixer.cpp
+++ b/imageplugins/enhance/hotpixels/hotpixelfixer.cpp
@@ -82,7 +82,7 @@ Digikam::FilterAction HotPixelFixer::filterAction()
{
DefaultFilterAction<HotPixelFixer> action;
action.addParameter("interpolationMethod", m_interpolationMethod);
- foreach (const HotPixel& hp, m_hpList)
+ foreach(const HotPixel& hp, m_hpList)
{
QString hpString("%1-%2x%3-%4x%5");
hpString = hpString.arg(hp.luminosity)
@@ -97,7 +97,7 @@ void HotPixelFixer::readParameters(const Digikam::FilterAction& \
action) {
m_interpolationMethod = action.parameter("interpolationMethod").toInt();
QRegExp exp("(\\d+)-(\\d+)x(\\d+)-(\\d+)x(\\d+)");
- foreach (const QVariant& var, action.parameters().values("hotPixel"))
+ foreach(const QVariant& var, action.parameters().values("hotPixel"))
{
if (exp.exactMatch(var.toString()))
{
diff --git a/libs/3rdparty/kinotify/kinotify.cpp \
b/libs/3rdparty/kinotify/kinotify.cpp index ffca74c..fe48c05 100644
--- a/libs/3rdparty/kinotify/kinotify.cpp
+++ b/libs/3rdparty/kinotify/kinotify.cpp
@@ -388,7 +388,7 @@ bool KInotify::removeDirectory( const QString& path )
bool KInotify::removeAllWatches()
{
- foreach (int wd, d->pathWatchHash)
+ foreach(int wd, d->pathWatchHash)
{
d->removeWatch(wd);
}
diff --git a/libs/database/albumdb.cpp b/libs/database/albumdb.cpp
index 695395e..23422e8 100644
--- a/libs/database/albumdb.cpp
+++ b/libs/database/albumdb.cpp
@@ -756,7 +756,7 @@ QList< int > AlbumDB::getTagsWithProperty(const QString& \
property) property, &values );
QList<int> tagIds;
- foreach (const QVariant& var, values)
+ foreach(const QVariant& var, values)
{
tagIds << var.toInt();
}
@@ -907,7 +907,7 @@ static QStringList joinMainAndUserFilterString(const QString& \
filter, const QStr
filterSet = filter.split(';', QString::SkipEmptyParts).toSet();
userFilterList = userFilter.split(';', QString::SkipEmptyParts);
- foreach (const QString& userFormat, userFilterList)
+ foreach(const QString& userFormat, userFilterList)
{
if (userFormat.startsWith('-'))
{
@@ -994,7 +994,7 @@ static QStringList cleanUserFilterString(const QString& \
filterString) }
QStringList sepList = filterString.split(sep, QString::SkipEmptyParts);
- foreach (const QString& f, sepList)
+ foreach(const QString& f, sepList)
{
if (f.startsWith(wildcard))
{
@@ -1237,7 +1237,7 @@ QVector<QList<int> > AlbumDB::getItemsTagIDs(const \
QList<qlonglong> imageIds) {
d->db->execSql(query, imageIds[i], &values);
QList<int>& tagIds = results[i];
- foreach (const QVariant& v, values)
+ foreach(const QVariant& v, values)
{
tagIds << v.toInt();
}
@@ -1636,7 +1636,7 @@ QVariantList AlbumDB::getImagePositions(QList<qlonglong> \
imageIDs, DatabaseField
SqlQuery query = d->db->prepareQuery(sql);
- foreach (const qlonglong& imageid, imageIDs)
+ foreach(const qlonglong& imageid, imageIDs)
{
QVariantList singleValueList;
d->db->execSql(query, imageid, &singleValueList);
@@ -1698,7 +1698,7 @@ void AlbumDB::addImageInformation(qlonglong imageID, const \
QVariantList& infos, // Take care for datetime values
if ((fields & DatabaseFields::CreationDate) || (fields & \
DatabaseFields::DigitizationDate)) {
- foreach (const QVariant& value, infos)
+ foreach(const QVariant& value, infos)
{
if (value.type() == QVariant::DateTime || value.type() == \
QVariant::Date) {
@@ -2074,7 +2074,7 @@ QList<qlonglong> AlbumDB::findByNameAndCreationDate(const \
QString& fileName, con
fileName, creationDate.toString(Qt::ISODate), &values);
QList<qlonglong> ids;
- foreach (const QVariant& var, values)
+ foreach(const QVariant& var, values)
{
ids << var.toLongLong();
}
@@ -2457,7 +2457,7 @@ QList<qlonglong> AlbumDB::getOneRelatedImageEach(const \
QList<qlonglong>& ids, Da
QSet<qlonglong> result;
QList<QVariant> values;
- foreach (qlonglong id, ids)
+ foreach(qlonglong id, ids)
{
if (type == DatabaseRelation::UndefinedType)
{
@@ -3075,9 +3075,9 @@ void AlbumDB::addTagsToItems(QList<qlonglong> imageIDs, \
QList<int> tagIDs) QVariantList images;
QVariantList tags;
- foreach (const qlonglong& imageid, imageIDs)
+ foreach(const qlonglong& imageid, imageIDs)
{
- foreach (int tagid, tagIDs)
+ foreach(int tagid, tagIDs)
{
images << imageid;
tags << tagid;
@@ -3126,9 +3126,9 @@ void AlbumDB::removeTagsFromItems(QList<qlonglong> imageIDs, \
const QList<int>& t QVariantList images;
QVariantList tags;
- foreach (const qlonglong& imageid, imageIDs)
+ foreach(const qlonglong& imageid, imageIDs)
{
- foreach (int tagid, tagIDs)
+ foreach(int tagid, tagIDs)
{
images << imageid;
tags << tagid;
@@ -3201,7 +3201,7 @@ QList<QDateTime> AlbumDB::getAllCreationDates()
" WHERE Images.status=1;", &values );
QList<QDateTime> list;
- foreach (const QVariant& value, values)
+ foreach(const QVariant& value, values)
{
if (!value.isNull())
{
@@ -3219,7 +3219,7 @@ QMap<QDateTime, int> \
AlbumDB::getAllCreationDatesAndNumberOfImages() " WHERE Images.status=1;", &values \
);
QMap<QDateTime, int> datesStatMap;
- foreach (const QVariant& value, values)
+ foreach(const QVariant& value, values)
{
if (!value.isNull())
{
@@ -4201,7 +4201,7 @@ QDate AlbumDB::getAlbumAverageDate(int albumID)
}
qint64 julianDays = 0;
- foreach (const QDate& date, dates)
+ foreach(const QDate& date, dates)
{
julianDays += date.toJulianDay();
}
@@ -4233,7 +4233,7 @@ void AlbumDB::removeItems(QList<qlonglong> itemIDs, const \
QList<int>& albumIDs)
QVariantList imageIds;
QVariantList status;
- foreach (const qlonglong& id, itemIDs)
+ foreach(const qlonglong& id, itemIDs)
{
status << (int)DatabaseItem::Removed;
imageIds << id;
diff --git a/libs/database/collectionmanager.cpp \
b/libs/database/collectionmanager.cpp index e0234f9..04619de 100644
--- a/libs/database/collectionmanager.cpp
+++ b/libs/database/collectionmanager.cpp
@@ -297,7 +297,7 @@ QList<SolidVolumeInfo> \
CollectionManagerPrivate::actuallyListVolumes()
udisToWatch.clear();
- foreach(const Solid::Device & accessDevice, devices)
+ foreach(const Solid::Device& accessDevice, devices)
{
// check for StorageAccess
if (!accessDevice.is<Solid::StorageAccess>())
@@ -486,7 +486,7 @@ QString CollectionManagerPrivate::directoryHash(const QString& \
path) {
QStringList entries = dir.entryList(QDir::Files | QDir::Dirs | \
QDir::NoDotAndDotDot); KMD5 hash;
- foreach(const QString & entry, entries)
+ foreach(const QString& entry, entries)
{
hash.update(entry.toUtf8());
}
@@ -508,7 +508,7 @@ SolidVolumeInfo \
CollectionManagerPrivate::findVolumeForLocation(const AlbumRootL
if (!(queryItem = url.queryItem("uuid")).isNull())
{
- foreach(const SolidVolumeInfo & volume, volumes)
+ foreach(const SolidVolumeInfo& volume, volumes)
{
if (volume.uuid.compare(queryItem, Qt::CaseInsensitive) == 0)
{
@@ -524,7 +524,7 @@ SolidVolumeInfo \
CollectionManagerPrivate::findVolumeForLocation(const AlbumRootL
// find all available volumes with the given label (usually one)
QList<SolidVolumeInfo> candidateVolumes;
- foreach(const SolidVolumeInfo & volume, volumes)
+ foreach(const SolidVolumeInfo& volume, volumes)
{
if (volume.label == queryItem)
{
@@ -539,7 +539,7 @@ SolidVolumeInfo \
CollectionManagerPrivate::findVolumeForLocation(const AlbumRootL
// find out of there is another location with the same label (usually not)
bool hasOtherLocation = false;
- foreach(AlbumRootLocation * otherLocation, locations)
+ foreach(AlbumRootLocation* otherLocation, locations)
{
if (otherLocation == location)
{
@@ -575,7 +575,7 @@ SolidVolumeInfo \
CollectionManagerPrivate::findVolumeForLocation(const AlbumRootL }
// match against directory hash
- foreach(const SolidVolumeInfo & volume, candidateVolumes)
+ foreach(const SolidVolumeInfo& volume, candidateVolumes)
{
QString volumeDirHash = directoryHash(volume.path);
@@ -590,7 +590,7 @@ SolidVolumeInfo \
CollectionManagerPrivate::findVolumeForLocation(const AlbumRootL }
else if (!(queryItem = url.queryItem("mountpath")).isNull())
{
- foreach(const SolidVolumeInfo & volume, volumes)
+ foreach(const SolidVolumeInfo& volume, volumes)
{
if (volume.isMounted && volume.path == queryItem)
{
@@ -651,7 +651,7 @@ SolidVolumeInfo CollectionManagerPrivate::findVolumeForUrl(const \
KUrl& fileUrl,
//FIXME: Network shares! Here we get only the volume of the mount path...
// This is probably not really clean. But Solid does not help us.
- foreach(const SolidVolumeInfo & v, volumes)
+ foreach(const SolidVolumeInfo& v, volumes)
{
if (v.isMounted && !v.path.isEmpty() && path.startsWith(v.path))
{
@@ -678,7 +678,7 @@ bool CollectionManagerPrivate::checkIfExists(const QString& \
filePath, QList<Coll const KUrl filePathUrl = filePath;
DatabaseAccess access;
- foreach(AlbumRootLocation * location, locations)
+ foreach(AlbumRootLocation* location, locations)
{
const KUrl locationPathUrl = location->albumRootPath();
@@ -691,7 +691,7 @@ bool CollectionManagerPrivate::checkIfExists(const QString& \
filePath, QList<Coll )
{
bool isDeleted = false;
- foreach(const CollectionLocation & deletedLoc, assumeDeleted)
+ foreach(const CollectionLocation& deletedLoc, assumeDeleted)
{
if (deletedLoc.id() == location->id())
{
@@ -936,7 +936,7 @@ CollectionManager::LocationCheckResult \
CollectionManager::checkLocation(const KU if (volume.isOpticalDisc)
{
bool hasOtherLocation = false;
- foreach(AlbumRootLocation * otherLocation, d->locations)
+ foreach(AlbumRootLocation* otherLocation, d->locations)
{
KUrl otherUrl(otherLocation->identifier);
@@ -1128,7 +1128,7 @@ QList<CollectionLocation> \
CollectionManager::checkHardWiredLocations()
DatabaseAccess access;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
// Hardwired and unavailable?
if (location->type() == CollectionLocation::TypeVolumeHardWired
@@ -1163,7 +1163,7 @@ void CollectionManager::migrationCandidates(const \
CollectionLocation& location,
*description = d->technicalDescription(albumLoc);
// Find possible new volumes where the specific path is found.
- foreach(const SolidVolumeInfo & info, volumes)
+ foreach(const SolidVolumeInfo& info, volumes)
{
if (info.isMounted && !info.path.isEmpty())
{
@@ -1244,7 +1244,7 @@ QList<CollectionLocation> CollectionManager::allLocations()
{
DatabaseAccess access;
QList<CollectionLocation> list;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
list << *location;
}
@@ -1255,7 +1255,7 @@ QList<CollectionLocation> \
CollectionManager::allAvailableLocations() {
DatabaseAccess access;
QList<CollectionLocation> list;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
if (location->status() == CollectionLocation::LocationAvailable)
{
@@ -1269,7 +1269,7 @@ QStringList CollectionManager::allAvailableAlbumRootPaths()
{
DatabaseAccess access;
QStringList list;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
if (location->status() == CollectionLocation::LocationAvailable)
{
@@ -1303,7 +1303,7 @@ CollectionLocation \
CollectionManager::locationForAlbumRootPath(const QString& al {
DatabaseAccess access;
QString path = albumRootPath;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
if (location->albumRootPath() == path)
{
@@ -1321,7 +1321,7 @@ CollectionLocation CollectionManager::locationForUrl(const \
KUrl& fileUrl) CollectionLocation CollectionManager::locationForPath(const QString& \
givenPath) {
DatabaseAccess access;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
QString rootPath = location->albumRootPath();
QString filePath = QDir::fromNativeSeparators(givenPath);
@@ -1364,7 +1364,7 @@ QString CollectionManager::albumRootPath(const KUrl& fileUrl)
QString CollectionManager::albumRootPath(const QString& givenPath)
{
DatabaseAccess access;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
QString rootPath = location->albumRootPath();
QString filePath = QDir::fromNativeSeparators(givenPath);
@@ -1389,7 +1389,7 @@ bool CollectionManager::isAlbumRoot(const KUrl& fileUrl)
bool CollectionManager::isAlbumRoot(const QString& filePath)
{
DatabaseAccess access;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
if (filePath == location->albumRootPath())
{
@@ -1407,7 +1407,7 @@ QString CollectionManager::album(const KUrl& fileUrl)
QString CollectionManager::album(const QString& filePath)
{
DatabaseAccess access;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
QString absolutePath = location->albumRootPath();
@@ -1480,7 +1480,7 @@ KUrl CollectionManager::oneAlbumRoot()
QString CollectionManager::oneAlbumRootPath()
{
DatabaseAccess access;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
if (location->status() == CollectionLocation::LocationAvailable)
{
@@ -1548,7 +1548,7 @@ void CollectionManager::updateLocations()
// synchronize map with database
QMap<int, AlbumRootLocation*> locs = d->locations;
d->locations.clear();
- foreach(const AlbumRootInfo & info, infos)
+ foreach(const AlbumRootInfo& info, infos)
{
if (locs.contains(info.id))
{
@@ -1562,7 +1562,7 @@ void CollectionManager::updateLocations()
}
// delete old locations
- foreach(AlbumRootLocation * location, locs)
+ foreach(AlbumRootLocation* location, locs)
{
CollectionLocation::Status oldStatus = location->status();
location->setStatus(CollectionLocation::LocationDeleted);
@@ -1572,7 +1572,7 @@ void CollectionManager::updateLocations()
// update status with current access state, store old status in list
QList<CollectionLocation::Status> oldStatus;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
oldStatus << location->status();
bool available = false;
@@ -1580,7 +1580,7 @@ void CollectionManager::updateLocations()
if (location->type() == CollectionLocation::TypeNetwork)
{
- foreach(const QString & path, \
d->networkShareMountPathsFromIdentifier(location)) + foreach(const \
QString& path, d->networkShareMountPathsFromIdentifier(location)) {
QDir dir(path);
available = dir.isReadable()
@@ -1634,7 +1634,7 @@ void CollectionManager::updateLocations()
// emit status changes (and new locations)
int i = 0;
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
if (oldStatus.at(i) != location->status())
{
@@ -1650,7 +1650,7 @@ void CollectionManager::clear_locked()
{
// Internal method: Called with mutex locked
// Cave: Difficult recursions with DatabaseAccess constructor and setParameters
- foreach(AlbumRootLocation * location, d->locations)
+ foreach(AlbumRootLocation* location, d->locations)
{
CollectionLocation::Status oldStatus = location->status();
location->setStatus(CollectionLocation::LocationDeleted);
@@ -1685,7 +1685,7 @@ void CollectionManager::slotAlbumRootChange(const \
AlbumRootChangeset& changeset) if (location)
{
QList<AlbumRootInfo> infos = access.db()->getAlbumRoots();
- foreach(const AlbumRootInfo & info, infos)
+ foreach(const AlbumRootInfo& info, infos)
{
if (info.id == location->id())
{
diff --git a/libs/database/collectionscanner.cpp \
b/libs/database/collectionscanner.cpp index 3d3b5bf..94258c2 100644
--- a/libs/database/collectionscanner.cpp
+++ b/libs/database/collectionscanner.cpp
@@ -292,7 +292,7 @@ void CollectionScanner::completeScan()
{
// count for progress info
int count = 0;
- foreach (const CollectionLocation& location, allLocations)
+ foreach(const CollectionLocation& location, allLocations)
{
count += countItemsInFolder(location.albumRootPath());
}
@@ -325,7 +325,7 @@ void CollectionScanner::completeScan()
emit startScanningAlbumRoots();
}
- foreach (const CollectionLocation& location, allLocations)
+ foreach(const CollectionLocation& location, allLocations)
{
scanAlbumRoot(location);
}
@@ -387,7 +387,7 @@ void CollectionScanner::finishCompleteScan(const QStringList& \
albumPaths) {
// count for progress info
int count = 0;
- foreach (const QString& path, sortedPaths)
+ foreach(const QString& path, sortedPaths)
{
count += countItemsInFolder(path);
}
@@ -395,7 +395,7 @@ void CollectionScanner::finishCompleteScan(const QStringList& \
albumPaths) emit totalFilesToScan(count);
}
- foreach (const QString& path, sortedPaths)
+ foreach(const QString& path, sortedPaths)
{
CollectionLocation location = \
CollectionManager::instance()->locationForPath(path); QString album = \
CollectionManager::instance()->album(path); @@ -664,7 +664,7 @@ void \
CollectionScanner::scanAlbumRoot(const CollectionLocation& location) void \
CollectionScanner::scanForStaleAlbums(const QList<CollectionLocation>& locations) {
QList<int> locationIdsToScan;
- foreach (const CollectionLocation& location, locations)
+ foreach(const CollectionLocation& location, locations)
{
locationIdsToScan << location.id();
}
@@ -685,7 +685,7 @@ void CollectionScanner::scanForStaleAlbums(const QList<int>& \
locationIdsToScan) /*
// See B.K.O #231598
QHash<int, CollectionLocation> albumRoots;
- foreach (const CollectionLocation& location, locations)
+ foreach(const CollectionLocation& location, locations)
{
albumRoots[location.id()] = location;
}
@@ -777,7 +777,7 @@ void CollectionScanner::safelyRemoveAlbums(const QList<int>& \
albumIds)
// Make album orphan (no album root, keep entries until next application start)
DatabaseAccess access;
DatabaseTransaction transaction(&access);
- foreach (int albumId, albumIds)
+ foreach(int albumId, albumIds)
{
QList<qlonglong> ids = access.db()->getItemIDsInAlbum(albumId);
access.db()->removeItemsFromAlbum(albumId, ids);
@@ -1130,7 +1130,7 @@ void CollectionScanner::itemsWereRemoved(const QList<qlonglong> \
&removedIds)
if (d->recordHistoryIds)
{
- foreach (qlonglong id, relatedImages)
+ foreach(qlonglong id, relatedImages)
{
d->needTaggingHistorySet << id;
}
@@ -1181,7 +1181,7 @@ void CollectionScanner::finishHistoryScanning()
void CollectionScanner::historyScanningStage2(const QList<qlonglong>& ids)
{
- foreach (qlonglong id, ids)
+ foreach(qlonglong id, ids)
{
if (!d->checkObserver())
{
@@ -1194,7 +1194,7 @@ void CollectionScanner::historyScanningStage2(const \
QList<qlonglong>& ids) {
QList<qlonglong> needTaggingIds;
ImageScanner::resolveImageHistory(id, &needTaggingIds);
- foreach (qlonglong needTag, needTaggingIds)
+ foreach(qlonglong needTag, needTaggingIds)
{
d->needTaggingHistorySet << needTag;
}
@@ -1208,7 +1208,7 @@ void CollectionScanner::historyScanningStage2(const \
QList<qlonglong>& ids)
void CollectionScanner::historyScanningStage3(const QList<qlonglong>& ids)
{
- foreach (qlonglong id, ids)
+ foreach(qlonglong id, ids)
{
if (!d->checkObserver())
{
@@ -1473,7 +1473,7 @@ void CollectionScanner::scanAlbums()
QStringList fileList(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot));
DatabaseTransaction transaction;
- foreach (const QString& dir, fileList)
+ foreach(const QString& dir, fileList)
{
scanAlbum(*it, '/' + dir);
}
diff --git a/libs/database/databaseconfigelement.cpp \
b/libs/database/databaseconfigelement.cpp index 66f151a..e24fb06 100644
--- a/libs/database/databaseconfigelement.cpp
+++ b/libs/database/databaseconfigelement.cpp
@@ -296,7 +296,7 @@ bool DatabaseConfigElementLoader::readConfig()
#ifdef DATABASEPARAMETERS_DEBUG
kDebug() << "Found entries: " << databaseConfigs.size();
- foreach (const DatabaseConfigElement& configElement, databaseConfigs )
+ foreach(const DatabaseConfigElement& configElement, databaseConfigs )
{
kDebug() << "DatabaseID: " << configElement.databaseID;
kDebug() << "HostName: " << configElement.hostName;
@@ -311,11 +311,11 @@ bool DatabaseConfigElementLoader::readConfig()
/*
kDebug() << "Statements:";
- foreach (const QString actionKey, configElement.sqlStatements.keys())
+ foreach(const QString actionKey, configElement.sqlStatements.keys())
{
QList<databaseActionElement> l_DBActionElement = \
configElement.sqlStatements[actionKey].dBActionElements;
kDebug() << "DBAction [" << actionKey << "] has [" << \
l_DBActionElement.size() << "] actions";
- foreach (const databaseActionElement statement, l_DBActionElement)
+ foreach(const databaseActionElement statement, l_DBActionElement)
{
kDebug() << "\tMode ["<< statement.mode <<"] Value ["<< \
statement.statement <<"]"; }
diff --git a/libs/database/databasecopymanager.cpp \
b/libs/database/databasecopymanager.cpp index ede63f5..9f5e11b 100644
--- a/libs/database/databasecopymanager.cpp
+++ b/libs/database/databasecopymanager.cpp
@@ -242,7 +242,7 @@ bool DatabaseCopyManager::copyTable(DatabaseBackend& \
fromDBbackend, const QStrin QMap<QString, QVariant> tempBindingMap;
int i = 0;
- foreach (QString columnName, columnNames) // krazy:exclude=foreach
+ foreach(QString columnName, columnNames) // krazy:exclude=foreach
{
kDebug(50003) << "Column: ["<< columnName << "] value \
["<<result.value(i)<<"]";
tempBindingMap.insert(columnName.insert(0, ':'), result.value(i));
diff --git a/libs/database/databasecorebackend.cpp \
b/libs/database/databasecorebackend.cpp index e8495a9..d61b804 100644
--- a/libs/database/databasecorebackend.cpp
+++ b/libs/database/databasecorebackend.cpp
@@ -641,7 +641,7 @@ DatabaseCoreBackend::QueryState \
DatabaseCoreBackend::execDBAction(const Database beginTransaction();
}
- foreach (const DatabaseActionElement& actionElement, action.dbActionElements)
+ foreach(const DatabaseActionElement& actionElement, action.dbActionElements)
{
DatabaseCoreBackend::QueryState result;
@@ -701,7 +701,7 @@ QSqlQuery DatabaseCoreBackend::execDBActionQuery(const \
DatabaseAction& action, c #endif
QSqlQuery result;
- foreach (const DatabaseActionElement& actionElement, action.dbActionElements)
+ foreach(const DatabaseActionElement& actionElement, action.dbActionElements)
{
if (actionElement.mode==QString("query"))
{
@@ -1486,7 +1486,7 @@ SqlQuery DatabaseCoreBackend::copyQuery(const SqlQuery& old)
query.setForwardOnly(old.isForwardOnly());
// only for positional binding
QList<QVariant> boundValues = old.boundValues().values();
- foreach (const QVariant& value, boundValues)
+ foreach(const QVariant& value, boundValues)
{
#ifdef DATABASCOREBACKEND_DEBUG
kDebug() << "Bind value to query ["<<value<<"]";
diff --git a/libs/database/faces/facetags.cpp b/libs/database/faces/facetags.cpp
index 3049adc..932aa4b 100644
--- a/libs/database/faces/facetags.cpp
+++ b/libs/database/faces/facetags.cpp
@@ -119,7 +119,7 @@ int FaceTagsHelper::tagForName(const QString& name, int tagId, \
int parentId, con
// First attempt: Find by full name in "person" attribute
QList<int> candidates = \
TagsCache::instance()->tagsWithProperty(TagPropertyName::person(), \
fullName);
- foreach (int id, candidates)
+ foreach(int id, candidates)
{
kDebug() << "Candidate with set full name:" << id << fullName;
@@ -149,7 +149,7 @@ int FaceTagsHelper::tagForName(const QString& name, int tagId, \
int parentId, con }
}
- foreach (int id, candidates)
+ foreach(int id, candidates)
{
// Is this tag already a person tag?
if (FaceTags::isPerson(id))
@@ -287,7 +287,7 @@ int FaceTags::personParentTag()
{
// we find the most toplevel parent tag of a person tag
QMultiMap<int,int> tiers;
- foreach (int tagId, personTags)
+ foreach(int tagId, personTags)
{
tiers.insert(TagsCache::instance()->parentTags(tagId).size(), tagId);
}
diff --git a/libs/database/faces/facetagseditor.cpp \
b/libs/database/faces/facetagseditor.cpp index 1e79abe..3d76041 100644
--- a/libs/database/faces/facetagseditor.cpp
+++ b/libs/database/faces/facetagseditor.cpp
@@ -86,11 +86,11 @@ QList<DatabaseFace> FaceTagsEditor::databaseFaces(qlonglong \
imageid, DatabaseFac {
QList<DatabaseFace> faces;
QStringList attributes = DatabaseFace::attributesForFlags(flags);
- foreach (const ImageTagPair& pair, faceImageTagPairs(imageid, flags))
+ foreach(const ImageTagPair& pair, faceImageTagPairs(imageid, flags))
{
- foreach (const QString& attribute, attributes)
+ foreach(const QString& attribute, attributes)
{
- foreach (const QString& regionString, pair.values(attribute))
+ foreach(const QString& regionString, pair.values(attribute))
{
TagRegion region(regionString);
kDebug() << "rect found as "<< region << "for attribute" << \
attribute << "tag" << pair.tagId(); @@ -113,7 +113,7 @@ QList<ImageTagPair> \
FaceTagsEditor::faceImageTagPairs(qlonglong imageid, Databas QList<ImageTagPair> \
pairs;
QStringList attributes = DatabaseFace::attributesForFlags(flags);
- foreach (const ImageTagPair& pair, ImageTagPair::availablePairs(imageid))
+ foreach(const ImageTagPair& pair, ImageTagPair::availablePairs(imageid))
{
//kDebug() << pair.tagId() << pair.properties();
if (!FaceTags::isPerson(pair.tagId()))
@@ -143,10 +143,10 @@ QList< QRect > FaceTagsEditor::getTagRects(qlonglong imageid) \
const QList< QRect > rectList;
QList<ImageTagPair> pairs = ImageTagPair::availablePairs(imageid);
- foreach (const ImageTagPair& pair, pairs)
+ foreach(const ImageTagPair& pair, pairs)
{
QStringList regions = pair.values(ImageTagPropertyName::tagRegion());
- foreach (const QString& region, regions)
+ foreach(const QString& region, regions)
{
QRect rect = TagRegion(region).toRect();
@@ -166,7 +166,7 @@ int FaceTagsEditor::numberOfFaces(qlonglong imageid) const
int count = 0;
QList<ImageTagPair> pairs = ImageTagPair::availablePairs(imageid);
- foreach (const ImageTagPair& pair, pairs)
+ foreach(const ImageTagPair& pair, pairs)
{
QStringList regions = pair.values(ImageTagPropertyName::tagRegion());
count += regions.size();
@@ -259,7 +259,7 @@ void FaceTagsEditor::addFaceAndTag(ImageTagPair& pair, const \
DatabaseFace& face, FaceTags::ensureIsPerson(face.tagId());
QString region = face.region().toXml();
- foreach (const QString& property, properties)
+ foreach(const QString& property, properties)
{
pair.addProperty(property, region);
}
@@ -276,9 +276,9 @@ void FaceTagsEditor::removeAllFaces(qlonglong imageid)
{
QList<int> tagsToRemove;
QStringList attributes = \
DatabaseFace::attributesForFlags(DatabaseFace::AllTypes);
- foreach (ImageTagPair pair, faceImageTagPairs(imageid, DatabaseFace::AllTypes))
+ foreach(ImageTagPair pair, faceImageTagPairs(imageid, DatabaseFace::AllTypes))
{
- foreach (const QString& attribute, attributes)
+ foreach(const QString& attribute, attributes)
{
pair.removeProperties(attribute);
}
@@ -301,9 +301,9 @@ void FaceTagsEditor::removeFace(qlonglong imageid, const QRect& \
rect) for (int i=0; i<pairs.size(); ++i)
{
ImageTagPair& pair = pairs[i];
- foreach (const QString& attribute, attributes)
+ foreach(const QString& attribute, attributes)
{
- foreach (const QString& regionString, pair.values(attribute))
+ foreach(const QString& regionString, pair.values(attribute))
{
if (rect == TagRegion(regionString).toRect())
{
@@ -334,7 +334,7 @@ void FaceTagsEditor::removeFace(const DatabaseFace& face)
void FaceTagsEditor::removeFaces(const QList<DatabaseFace>& faces)
{
- foreach (const DatabaseFace& face, faces)
+ foreach(const DatabaseFace& face, faces)
{
if (face.isNull())
{
@@ -400,7 +400,7 @@ void FaceTagsEditor::removeNormalTags(qlonglong imageId, \
QList<int> tagIds) DatabaseOperationGroup group;
group.setMaximumTime(200);
ImageInfo info(imageId);
- foreach (int tagId, tagIds)
+ foreach(int tagId, tagIds)
{
info.removeTag(tagId);
group.allowLift();
diff --git a/libs/database/haar/haariface.cpp b/libs/database/haar/haariface.cpp
index 6fd32c2..8707a43 100644
--- a/libs/database/haar/haariface.cpp
+++ b/libs/database/haar/haariface.cpp
@@ -649,7 +649,7 @@ QMap<qlonglong, double> \
HaarIface::searchDatabase(Haar::SignatureData* querySig, // read cached signature \
map if possible else
{
- foreach (const qlonglong& imageid, signatureCache.keys())
+ foreach(const qlonglong& imageid, signatureCache.keys())
{
double& score = scores[imageid];
Haar::SignatureData& qSig = *querySig;
diff --git a/libs/database/imagecomments.cpp b/libs/database/imagecomments.cpp
index 518f382..fc5d2b6 100644
--- a/libs/database/imagecomments.cpp
+++ b/libs/database/imagecomments.cpp
@@ -121,7 +121,7 @@ public:
void adjustStoredIndexes(QSet<int> &set, int removedIndex)
{
QSet<int> newSet;
- foreach (int index, set)
+ foreach(int index, set)
{
if (index > removedIndex)
{
@@ -466,7 +466,7 @@ void ImageComments::replaceFrom(const ImageComments& source)
return;
}
- foreach (const CommentInfo& info, source.d->infos)
+ foreach(const CommentInfo& info, source.d->infos)
{
addComment(info.comment, info.language, info.author, info.date, info.type);
}
@@ -543,7 +543,7 @@ void ImageComments::removeAll()
return;
}
- foreach (const CommentInfo& info, d->infos)
+ foreach(const CommentInfo& info, d->infos)
{
d->idsToRemove << info.id;
}
@@ -655,7 +655,7 @@ CaptionsMap ImageComments::toCaptionsMap(DatabaseComment::Type \
type) const
if (d)
{
- foreach (const CommentInfo& info, d->infos)
+ foreach(const CommentInfo& info, d->infos)
{
if (info.type == type)
{
diff --git a/libs/database/imagecopyright.cpp b/libs/database/imagecopyright.cpp
index 2356b2c..9a1f1c5 100644
--- a/libs/database/imagecopyright.cpp
+++ b/libs/database/imagecopyright.cpp
@@ -111,7 +111,7 @@ void ImageCopyright::replaceFrom(const ImageCopyright& source)
}
QList<CopyrightInfo> infos = access.db()->getImageCopyright(source.m_id, \
QString());
- foreach (const CopyrightInfo& info, infos)
+ foreach(const CopyrightInfo& info, infos)
{
access.db()->setImageCopyrightProperty(m_id, info.property, info.value,
info.extraValue, \
AlbumDB::PropertyNoConstraint); @@ -352,7 +352,7 @@ CopyrightInfo \
ImageCopyright::copyrightInfo(const QString& property) const {
if (m_cache)
{
- foreach (const CopyrightInfo& info, m_cache->infos)
+ foreach(const CopyrightInfo& info, m_cache->infos)
{
if (info.property == property)
{
@@ -378,7 +378,7 @@ QList<CopyrightInfo> ImageCopyright::copyrightInfos(const \
QString& property) con if (m_cache)
{
QList<CopyrightInfo> infos;
- foreach (const CopyrightInfo& info, m_cache->infos)
+ foreach(const CopyrightInfo& info, m_cache->infos)
{
if (info.property == property)
{
@@ -422,7 +422,7 @@ KExiv2Iface::KExiv2::AltLangMap \
ImageCopyright::readLanguageProperties(const QSt {
KExiv2Iface::KExiv2::AltLangMap map;
QList<CopyrightInfo> infos = copyrightInfos(property);
- foreach (const CopyrightInfo& info, infos)
+ foreach(const CopyrightInfo& info, infos)
{
map[info.extraValue] = info.value;
}
diff --git a/libs/database/imagehistory/imagehistorygraph.cpp \
b/libs/database/imagehistory/imagehistorygraph.cpp index 700a7c4..32f9223 100644
--- a/libs/database/imagehistory/imagehistorygraph.cpp
+++ b/libs/database/imagehistory/imagehistorygraph.cpp
@@ -69,7 +69,7 @@ bool HistoryVertexProperties::markedAs(HistoryImageId::Type type) \
const return false;
}
- foreach (const HistoryImageId& ref, referredImages)
+ foreach(const HistoryImageId& ref, referredImages)
{
if (ref.m_type == type)
{
@@ -86,7 +86,7 @@ bool HistoryVertexProperties::alwaysMarkedAs(HistoryImageId::Type \
type) const return false;
}
- foreach (const HistoryImageId& ref, referredImages)
+ foreach(const HistoryImageId& ref, referredImages)
{
if (ref.m_type != type)
{
@@ -108,7 +108,7 @@ bool HistoryVertexProperties::operator==(const ImageInfo& info) \
const
bool HistoryVertexProperties::operator==(qlonglong id) const
{
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
if (info.id() == id)
{
@@ -125,7 +125,7 @@ bool HistoryVertexProperties::operator==(const HistoryImageId& \
other) const return uuid == other.m_uuid;
}
- foreach (const HistoryImageId& id, referredImages)
+ foreach(const HistoryImageId& id, referredImages)
{
if (ImageScanner::sameReferredImage(id, other))
{
@@ -179,7 +179,7 @@ HistoryVertexProperties& \
HistoryVertexProperties::operator+=(const HistoryImageI
QDebug operator<<(QDebug dbg, const HistoryVertexProperties& props)
{
- foreach (const ImageInfo& info, props.infos)
+ foreach(const ImageInfo& info, props.infos)
{
dbg.space() << info.id();
}
@@ -250,7 +250,7 @@ ImageHistoryGraphData::addVertex(const HistoryImageId& imageId)
if (v.isNull())
{
// Resolve HistoryImageId, find by ImageInfo
- foreach (qlonglong id, ImageScanner::resolveHistoryImageId(imageId))
+ foreach(qlonglong id, ImageScanner::resolveHistoryImageId(imageId))
{
ImageInfo info(id);
//kDebug() << "Found info id:" << info.id();
@@ -333,11 +333,11 @@ void ImageHistoryGraphData::applyProperties(Vertex& v, const \
QList<ImageInfo>& i HistoryVertexProperties& props = properties(v);
// adjust properties
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
props += info;
}
- foreach (const HistoryImageId& id, ids)
+ foreach(const HistoryImageId& id, ids)
{
props += id;
}
@@ -353,9 +353,9 @@ int ImageHistoryGraphData::removeNextUnresolvedVertex(int index)
if (props.infos.isEmpty())
{
- foreach (const HistoryGraph::Edge& upperEdge, edges(v, \
HistoryGraph::EdgesToRoot)) + foreach(const HistoryGraph::Edge& upperEdge, \
edges(v, HistoryGraph::EdgesToRoot)) {
- foreach (const HistoryGraph::Edge& lowerEdge, edges(v, \
HistoryGraph::EdgesToLeaf)) + foreach(const HistoryGraph::Edge& \
lowerEdge, edges(v, HistoryGraph::EdgesToLeaf)) {
HistoryEdgeProperties combinedProps;
combinedProps.actions += properties(upperEdge).actions;
@@ -374,7 +374,7 @@ int ImageHistoryGraphData::removeNextUnresolvedVertex(int index)
QHash<HistoryGraph::Vertex, HistoryImageId::Types> \
ImageHistoryGraphData::categorize() const {
QHash<Vertex, HistoryImageId::Types> types;
- foreach (const Vertex& v, vertices())
+ foreach(const Vertex& v, vertices())
{
const HistoryVertexProperties& props = properties(v);
@@ -411,7 +411,7 @@ QHash<HistoryGraph::Vertex, HistoryImageId::Types> \
ImageHistoryGraphData::catego {
// We check if all immediate actions set the ExplicitBranch flag
bool allBranches = true;
- foreach (const Edge& e, edges(v, EdgesToLeaf))
+ foreach(const Edge& e, edges(v, EdgesToLeaf))
{
const HistoryEdgeProperties& props = properties(e);
if (props.actions.isEmpty())
@@ -510,7 +510,7 @@ ImageHistoryGraph ImageHistoryGraph::fromInfo(const ImageInfo& \
info, HistoryLoad
if (loadingMode & LoadLeavesHistory)
{
- foreach (const ImageInfo& leaf, graph.leafImages())
+ foreach(const ImageInfo& leaf, graph.leafImages())
{
if (leaf != info)
{
@@ -560,7 +560,7 @@ void ImageHistoryGraphData::addHistory(const DImageHistory& \
history, qlonglong e HistoryGraph::Vertex last;
HistoryEdgeProperties edgeProps;
- foreach (const DImageHistory::Entry& entry, history.entries())
+ foreach(const DImageHistory::Entry& entry, history.entries())
{
if (!last.isNull())
{
@@ -610,7 +610,7 @@ void ImageHistoryGraph::addRelations(const QList<QPair<qlonglong, \
qlonglong> >& {
HistoryGraph::Vertex v1, v2;
typedef QPair<qlonglong, qlonglong> IdPair;
- foreach (const IdPair& pair, pairs)
+ foreach(const IdPair& pair, pairs)
{
if (pair.first < 1 || pair.second < 1)
{
@@ -644,7 +644,7 @@ void ImageHistoryGraph::reduceEdges()
return; // reduction failed, not a DAG
}
- foreach (const HistoryGraph::Edge& e, removedEgdes)
+ foreach(const HistoryGraph::Edge& e, removedEgdes)
{
if (!d->properties(e).actions.isEmpty())
{
@@ -658,7 +658,7 @@ void ImageHistoryGraph::reduceEdges()
bool ImageHistoryGraph::hasUnresolvedEntries() const
{
- foreach (const HistoryGraph::Vertex& v, d->vertices())
+ foreach(const HistoryGraph::Vertex& v, d->vertices())
{
if (d->properties(v).infos.isEmpty())
{
@@ -684,7 +684,7 @@ void ImageHistoryGraph::sortForInfo(const ImageInfo& subject)
{
// Remove nodes which could not be resolved into image infos
QList<HistoryGraph::Vertex> toRemove;
- foreach (const HistoryGraph::Vertex& v, d->vertices())
+ foreach(const HistoryGraph::Vertex& v, d->vertices())
{
HistoryVertexProperties& props = d->properties(v);
ImageScanner::sortByProximity(props.infos, subject);
@@ -703,11 +703,11 @@ QList<QPair<qlonglong, qlonglong> > \
ImageHistoryGraph::relationCloud() const QList<QPair<qlonglong, qlonglong> > pairs;
ImageHistoryGraphData closure = d->transitiveClosure();
QList<HistoryGraph::VertexPair> edges = closure.edgePairs();
- foreach (const HistoryGraph::VertexPair& edge, edges)
+ foreach(const HistoryGraph::VertexPair& edge, edges)
{
- foreach (const ImageInfo& source, closure.properties(edge.first).infos)
+ foreach(const ImageInfo& source, closure.properties(edge.first).infos)
{
- foreach (const ImageInfo& target, closure.properties(edge.second).infos)
+ foreach(const ImageInfo& target, closure.properties(edge.second).infos)
{
pairs << QPair<qlonglong, qlonglong>(source.id(), target.id());
}
@@ -721,11 +721,11 @@ QPair<QList<qlonglong>, QList<qlonglong> > \
ImageHistoryGraph::relationCloudParal QList<qlonglong> subjects, objects;
ImageHistoryGraphData closure = d->transitiveClosure();
QList<HistoryGraph::VertexPair> edges = closure.edgePairs();
- foreach (const HistoryGraph::VertexPair& edge, edges)
+ foreach(const HistoryGraph::VertexPair& edge, edges)
{
- foreach (const ImageInfo& source, closure.properties(edge.first).infos)
+ foreach(const ImageInfo& source, closure.properties(edge.first).infos)
{
- foreach (const ImageInfo& target, closure.properties(edge.second).infos)
+ foreach(const ImageInfo& target, closure.properties(edge.second).infos)
{
subjects << source.id();
objects << target.id();
@@ -743,9 +743,9 @@ QList<ImageInfo> ImageHistoryGraph::allImages() const
QList<qlonglong> ImageHistoryGraph::allImageIds() const
{
QList<qlonglong> ids;
- foreach (const HistoryGraph::Vertex& v, d->vertices())
+ foreach(const HistoryGraph::Vertex& v, d->vertices())
{
- foreach (const ImageInfo& info, d->properties(v).infos)
+ foreach(const ImageInfo& info, d->properties(v).infos)
{
ids << info.id();
}
@@ -768,7 +768,7 @@ QHash<ImageInfo, HistoryImageId::Types> \
ImageHistoryGraph::categorize() const
QHash<HistoryGraph::Vertex, HistoryImageId::Types> vertexType = d->categorize();
QHash<ImageInfo, HistoryImageId::Types> types;
- foreach (const HistoryGraph::Vertex& v, d->vertices())
+ foreach(const HistoryGraph::Vertex& v, d->vertices())
{
const HistoryVertexProperties& props = d->properties(v);
if (props.infos.isEmpty())
@@ -777,7 +777,7 @@ QHash<ImageInfo, HistoryImageId::Types> \
ImageHistoryGraph::categorize() const }
HistoryImageId::Types type = vertexType.value(v);
- foreach (const ImageInfo& info, props.infos)
+ foreach(const ImageInfo& info, props.infos)
{
types[info] = type;
}
@@ -790,7 +790,7 @@ static QString toString(const HistoryVertexProperties& props)
QString s;
s = "Ids: ";
QStringList ids;
- foreach (const ImageInfo& info, props.infos)
+ foreach(const ImageInfo& info, props.infos)
{
ids << QString::number(info.id());
}
@@ -839,12 +839,12 @@ QDebug operator<<(QDebug dbg, const ImageHistoryGraph& g)
dbg << "Graph with" << vertices.size() << "vertices:" << endl;
}
- foreach (const HistoryGraph::Vertex& target, vertices)
+ foreach(const HistoryGraph::Vertex& target, vertices)
{
QString targetString = toString(g.data().properties(target));
QStringList sourceVertexTexts;
- foreach (const HistoryGraph::Vertex& source, \
g.data().adjacentVertices(target, HistoryGraph::InboundEdges)) + foreach(const \
HistoryGraph::Vertex& source, g.data().adjacentVertices(target, \
HistoryGraph::InboundEdges)) {
sourceVertexTexts << toString(g.data().properties(source));
}
diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h \
b/libs/database/imagehistory/imagehistorygraph_boost.h index 4905d5a..6ffccce 100644
--- a/libs/database/imagehistory/imagehistorygraph_boost.h
+++ b/libs/database/imagehistory/imagehistorygraph_boost.h
@@ -884,7 +884,7 @@ public:
// remove all vertices from the DFS of v that are not in the dominated tree
QList<Vertex> orderedTree;
- foreach (const Vertex& v, presortedVertices)
+ foreach(const Vertex& v, presortedVertices)
{
if (dominatedTree.contains(v))
{
@@ -921,7 +921,7 @@ public:
GraphSearch search;
search.breadthFirstSearch(graph, vertices.first(), direction == \
ChildToParent); QList<Vertex> bfs = search.vertices;
- foreach (const Vertex& v, vertices)
+ foreach(const Vertex& v, vertices)
{
bfs.removeOne(v);
}
@@ -943,7 +943,7 @@ public:
// any item reachable from *it should come after it
int minIndex = vertices.size();
- foreach (const Vertex& c, childBfs)
+ foreach(const Vertex& c, childBfs)
{
int foundAt = vertices.indexOf(c);
if (foundAt == -1)
@@ -955,7 +955,7 @@ public:
minIndex = qMin(foundAt, minIndex);
}
}
- foreach (const Vertex& c, toInsert)
+ foreach(const Vertex& c, toInsert)
{
vertices.insert(minIndex++, c);
}
@@ -993,7 +993,7 @@ public:
GraphSearch search;
search.depthFirstSearchSorted(graph, vertices.first(), direction == \
ChildToParent, lessThan); QList<Vertex> dfs = search.vertices;
- foreach (const Vertex& v, vertices)
+ foreach(const Vertex& v, vertices)
{
dfs.removeOne(v);
}
@@ -1016,7 +1016,7 @@ protected:
{
QList<Vertex> children = predecessors.keys(v);
vertices << children;
- foreach (const Vertex& child, children)
+ foreach(const Vertex& child, children)
{
treeFromPredecessorsRecursive(child, vertices, predecessors);
}
@@ -1170,7 +1170,7 @@ protected:
search.breadthFirstSearch(graph, v, invertGraph);
QList<Vertex> vertices;
- foreach (const Vertex& candidate, search.vertices)
+ foreach(const Vertex& candidate, search.vertices)
{
if ( (inOrOut ? in_degree(candidate, graph) : out_degree(candidate, \
graph)) == 0) {
@@ -1413,7 +1413,7 @@ protected:
// maps the given edges to their targets, and calls our vertex lessThan.
qSort(outEdges.begin(), outEdges.end(), \
lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
- foreach (const Edge& e, outEdges)
+ foreach(const Edge& e, outEdges)
{
Vertex v = boost::target(e.toEdge(), g);
vis.examine_edge(e, g);
diff --git a/libs/database/imagehistory/imagehistorygraphdata.h \
b/libs/database/imagehistory/imagehistorygraphdata.h index 7467b9b..00d1c37 100644
--- a/libs/database/imagehistory/imagehistorygraphdata.h
+++ b/libs/database/imagehistory/imagehistorygraphdata.h
@@ -131,7 +131,7 @@ public:
inline QList<ImageInfo> toInfoList(const QList<Vertex>& vertices) const
{
QList<ImageInfo> infos;
- foreach (const HistoryGraph::Vertex& v, vertices)
+ foreach(const HistoryGraph::Vertex& v, vertices)
{
infos << properties(v).infos;
}
diff --git a/libs/database/imagehistory/imagehistorygraphmodel.cpp \
b/libs/database/imagehistory/imagehistorygraphmodel.cpp index 9242c66..d7005c9 100644
--- a/libs/database/imagehistory/imagehistorygraphmodel.cpp
+++ b/libs/database/imagehistory/imagehistorygraphmodel.cpp
@@ -332,7 +332,7 @@ void \
ImageHistoryGraphModel::ImageHistoryGraphModelPriv::buildImagesList()
QList<HistoryGraph::Vertex> verticesOrdered = \
graph().verticesDepthFirstSorted(path.first(),
\
sortBy(oldestInfoFirst));
- foreach (const HistoryGraph::Vertex& v, verticesOrdered)
+ foreach(const HistoryGraph::Vertex& v, verticesOrdered)
{
rootItem->addItem(createVertexItem(v));
}
@@ -350,7 +350,7 @@ void \
ImageHistoryGraphModel::ImageHistoryGraphModelPriv::buildImagesTree() VertexItem* \
item = 0; VertexItem* previousItem = 0;
- foreach (const HistoryGraph::Vertex& v, verticesOrdered)
+ foreach(const HistoryGraph::Vertex& v, verticesOrdered)
{
int currentLevel = distances.value(v);
if (currentLevel == -1)
@@ -422,7 +422,7 @@ void \
ImageHistoryGraphModel::ImageHistoryGraphModelPriv::buildCombinedTree(const
// any extra sources?
QList<HistoryGraph::Vertex> sources = graph().adjacentVertices(item->vertex, \
HistoryGraph::EdgesToRoot);
- foreach (const HistoryGraph::Vertex& source, sources)
+ foreach(const HistoryGraph::Vertex& source, sources)
{
if (source != previous)
{
@@ -434,7 +434,7 @@ void \
ImageHistoryGraphModel::ImageHistoryGraphModelPriv::buildCombinedTree(const // Any \
other egdes off the main path?
QList<HistoryGraph::Vertex> branches = graph().adjacentVertices(v, \
HistoryGraph::EdgesToLeaf); QList<HistoryGraph::Vertex> subgraph;
- foreach (const HistoryGraph::Vertex& branch, branches)
+ foreach(const HistoryGraph::Vertex& branch, branches)
{
if (branch != next)
{
@@ -446,7 +446,7 @@ void \
ImageHistoryGraphModel::ImageHistoryGraphModelPriv::buildCombinedTree(const
// Add filter actions above item
HistoryEdgeProperties props = graph().properties(v, previous);
- foreach (const FilterAction& action, props.actions)
+ foreach(const FilterAction& action, props.actions)
{
rootItem->addItem(createFilterActionItem(action));
}
@@ -460,7 +460,7 @@ void \
ImageHistoryGraphModel::ImageHistoryGraphModelPriv::buildCombinedTree(const break;
}
- foreach (const HistoryGraph::Vertex& v, added)
+ foreach(const HistoryGraph::Vertex& v, added)
{
leavesFromRef.removeOne(v);
}
@@ -470,7 +470,7 @@ void \
ImageHistoryGraphModel::ImageHistoryGraphModelPriv::buildCombinedTree(const
addCombinedItemCategory(rootItem, leavesFromRef, i18nc("@title", "Derived \
Images"), ref, added); }
- foreach (const HistoryGraph::Vertex& v, added)
+ foreach(const HistoryGraph::Vertex& v, added)
{
currentVersions.removeOne(v);
}
@@ -498,7 +498,7 @@ void ImageHistoryGraphModel::ImageHistoryGraphModelPriv::
bool isFirst = true;
VertexItem* item = 0;
- foreach (const HistoryGraph::Vertex& v, vertices)
+ foreach(const HistoryGraph::Vertex& v, vertices)
{
if (isFirst)
{
@@ -516,7 +516,7 @@ void ImageHistoryGraphModel::ImageHistoryGraphModelPriv::
for (int i=1; i<shortestPath.size(); ++i)
{
HistoryEdgeProperties props = graph().properties(shortestPath.at(i), \
shortestPath.at(i-1));
- foreach (const FilterAction& action, props.actions)
+ foreach(const FilterAction& action, props.actions)
{
parentItem->addItem(createFilterActionItem(action));
}
@@ -528,7 +528,7 @@ void ImageHistoryGraphModel::ImageHistoryGraphModelPriv::
// Provide access to intermediates
shortestPath.removeOne(showActionsFrom);
shortestPath.removeOne(v);
- foreach (const HistoryGraph::Vertex& addedVertex, added)
+ foreach(const HistoryGraph::Vertex& addedVertex, added)
{
shortestPath.removeOne(addedVertex);
}
@@ -544,7 +544,7 @@ void ImageHistoryGraphModel::ImageHistoryGraphModelPriv::
HeaderItem* header = new HeaderItem(title);
parent->addItem(header);
HistoryTreeItem* addToItem = flat ? static_cast<HistoryTreeItem*>(parent) : \
static_cast<HistoryTreeItem*>(header);
- foreach (const HistoryGraph::Vertex& v, vertices)
+ foreach(const HistoryGraph::Vertex& v, vertices)
{
addToItem->addItem(createVertexItem(v));
}
@@ -673,7 +673,7 @@ QModelIndex ImageHistoryGraphModel::indexForInfo(const ImageInfo& \
info) const return QModelIndex();
}
// try with primary info
- foreach (VertexItem* item, d->vertexItems)
+ foreach(VertexItem* item, d->vertexItems)
{
if (ImageModel::retrieveImageInfo(item->index) == info)
{
@@ -681,7 +681,7 @@ QModelIndex ImageHistoryGraphModel::indexForInfo(const ImageInfo& \
info) const }
}
// try all associated infos
- foreach (VertexItem* item, d->vertexItems)
+ foreach(VertexItem* item, d->vertexItems)
{
if (d->graph().properties(item->vertex).infos.contains(info))
{
diff --git a/libs/database/imageinfo.cpp b/libs/database/imageinfo.cpp
index 0bc28d9..cacbd8c 100644
--- a/libs/database/imageinfo.cpp
+++ b/libs/database/imageinfo.cpp
@@ -826,7 +826,7 @@ void ImageInfo::addToGroup(const ImageInfo& leader)
}
QList<ImageInfo> ownGroup = groupedImages();
- foreach (const ImageInfo& info, ownGroup)
+ foreach(const ImageInfo& info, ownGroup)
{
ImageInfo(info).addToGroup(leader);
}
@@ -1197,7 +1197,7 @@ void ImageInfo::setPickLabel(int pickId)
// Perform "switch" operation atomic
{
DatabaseAccess access;
- foreach (int tagId, currentTagIds)
+ foreach(int tagId, currentTagIds)
{
if (pickLabelTags.contains(tagId))
{
@@ -1226,7 +1226,7 @@ void ImageInfo::setColorLabel(int colorId)
// Perform "switch" operation atomic
{
DatabaseAccess access;
- foreach (int tagId, currentTagIds)
+ foreach(int tagId, currentTagIds)
{
if (colorLabelTags.contains(tagId))
{
diff --git a/libs/database/imageinfocache.cpp b/libs/database/imageinfocache.cpp
index c01b29f..d3c44f9 100644
--- a/libs/database/imageinfocache.cpp
+++ b/libs/database/imageinfocache.cpp
@@ -230,7 +230,7 @@ void ImageInfoCache::invalidate()
void ImageInfoCache::slotImageChanged(const ImageChangeset& changeset)
{
ImageInfoWriteLocker lock;
- foreach (const qlonglong& imageId, changeset.ids())
+ foreach(const qlonglong& imageId, changeset.ids())
{
QHash<qlonglong, ImageInfoData*>::iterator it = m_infos.find(imageId);
@@ -314,7 +314,7 @@ void ImageInfoCache::slotImageTagChanged(const ImageTagChangeset& \
changeset) }
ImageInfoWriteLocker lock;
- foreach (const qlonglong& imageId, changeset.ids())
+ foreach(const qlonglong& imageId, changeset.ids())
{
QHash<qlonglong, ImageInfoData*>::iterator it = m_infos.find(imageId);
diff --git a/libs/database/imageinfolist.cpp b/libs/database/imageinfolist.cpp
index be12492..87766bc 100644
--- a/libs/database/imageinfolist.cpp
+++ b/libs/database/imageinfolist.cpp
@@ -32,7 +32,7 @@ namespace Digikam
ImageInfoList::ImageInfoList(const QList<qlonglong>& idList)
{
- foreach (qlonglong id, idList)
+ foreach(qlonglong id, idList)
{
append(ImageInfo(id));
}
@@ -41,7 +41,7 @@ ImageInfoList::ImageInfoList(const QList<qlonglong>& idList)
QList<qlonglong> ImageInfoList::toImageIdList() const
{
QList<qlonglong> idList;
- foreach (const ImageInfo& info, *this)
+ foreach(const ImageInfo& info, *this)
{
idList << info.id();
}
diff --git a/libs/database/imagelister.cpp b/libs/database/imagelister.cpp
index 2058772..0b12890 100644
--- a/libs/database/imagelister.cpp
+++ b/libs/database/imagelister.cpp
@@ -162,7 +162,7 @@ void ImageLister::listAlbum(ImageListerReceiver* receiver,
return;
}
- foreach (int id, intAlbumIds)
+ foreach(int id, intAlbumIds)
{
albumIds << id;
}
@@ -788,7 +788,7 @@ void ImageLister::listFromIdList(ImageListerReceiver* receiver, \
QList<qlonglong> /*
// Unfortunately, we need to convert to QVariant
QList<QVariant> variantIdList;
- foreach (const qlonglong& id, imageIds)
+ foreach(const qlonglong& id, imageIds)
{
variantIdList << id;
}
@@ -821,7 +821,7 @@ void ImageLister::listFromIdList(ImageListerReceiver* receiver, \
QList<qlonglong> " WHERE Images.status=1 AND Images.id = ?;"
));
- foreach (const qlonglong& id, imageIds)
+ foreach(const qlonglong& id, imageIds)
{
query.bindValue(0, id);
executionSuccess = access.backend()->exec(query);
@@ -892,7 +892,7 @@ QSet<int> ImageLister::albumRootsToList()
QList<CollectionLocation> locations = \
CollectionManager::instance()->allAvailableLocations(); QSet<int> ids;
- foreach (const CollectionLocation& location, locations)
+ foreach(const CollectionLocation& location, locations)
{
ids << location.id();
}
@@ -914,7 +914,7 @@ QString ImageLister::tagSearchXml(const DatabaseUrl& url, const \
QString& type, b properties << "autodetectedFace";
properties << "tagRegion";
- foreach (const QString& property, properties)
+ foreach(const QString& property, properties)
{
writer.writeField("imagetagproperty", includeChildTags ? \
SearchXml::InTree : SearchXml::Equal);
diff --git a/libs/database/imagequerybuilder.cpp \
b/libs/database/imagequerybuilder.cpp index ca97112..d187885 100644
--- a/libs/database/imagequerybuilder.cpp
+++ b/libs/database/imagequerybuilder.cpp
@@ -70,7 +70,7 @@ public:
ImageQueryPostHooks::~ImageQueryPostHooks()
{
- foreach (ImageQueryPostHook* hook, m_postHooks)
+ foreach(ImageQueryPostHook* hook, m_postHooks)
{
delete hook;
}
@@ -83,7 +83,7 @@ void ImageQueryPostHooks::addHook(ImageQueryPostHook* hook)
bool ImageQueryPostHooks::checkPosition(double latitudeNumber, double \
longitudeNumber) {
- foreach (ImageQueryPostHook* hook, m_postHooks)
+ foreach(ImageQueryPostHook* hook, m_postHooks)
{
if (!hook->checkPosition(latitudeNumber, longitudeNumber))
{
@@ -425,7 +425,7 @@ public:
sql += ") ";
}
- foreach (int v, values)
+ foreach(int v, values)
{
*boundValues << v;
}
@@ -445,7 +445,7 @@ public:
sql += " (" + name + " IN (";
AlbumDB::addBoundValuePlaceholders(sql, values.size());
sql += ") ";
- foreach (const qlonglong& v, values)
+ foreach(const qlonglong& v, values)
{
*boundValues << v;
}
@@ -482,7 +482,7 @@ public:
sql += "OR " + name + " IS NULL ";
}
- foreach (int v, values)
+ foreach(int v, values)
{
*boundValues << v;
}
diff --git a/libs/database/imagescanner.cpp b/libs/database/imagescanner.cpp
index ac1e2ef..14c135d 100644
--- a/libs/database/imagescanner.cpp
+++ b/libs/database/imagescanner.cpp
@@ -784,19 +784,19 @@ void ImageScanner::tagImageHistoryGraph(qlonglong id)
DImageHistory ImageScanner::resolvedImageHistory(const DImageHistory& history, bool \
mustBeAvailable) {
DImageHistory h;
- foreach (const DImageHistory::Entry& e, history.entries())
+ foreach(const DImageHistory::Entry& e, history.entries())
{
// Copy entry, without referredImages
DImageHistory::Entry entry;
entry.action = e.action;
// resolve referredImages
- foreach (const HistoryImageId& id, e.referredImages)
+ foreach(const HistoryImageId& id, e.referredImages)
{
QList<qlonglong> imageIds = resolveHistoryImageId(id);
// append each image found in collection to referredImages
- foreach (qlonglong imageId, imageIds)
+ foreach(qlonglong imageId, imageIds)
{
ImageInfo info(imageId);
@@ -893,7 +893,7 @@ static QList<qlonglong> mergedIdLists(const HistoryImageId& \
referenceId,
// Add a candidate if it has the same UUID, or either reference or candidate \
have a UUID
// (other way round: do not add a candidate which positively has a different \
UUID)
- foreach (qlonglong candidate, candidates)
+ foreach(qlonglong candidate, candidates)
{
if (results.contains(candidate))
{
@@ -933,7 +933,7 @@ QList<qlonglong> ImageScanner::resolveHistoryImageId(const \
HistoryImageId& histo if (!infos.isEmpty())
{
QList<qlonglong> ids;
- foreach (const ItemScanInfo& info, infos)
+ foreach(const ItemScanInfo& info, infos)
{
if (info.status != DatabaseItem::Removed)
{
@@ -1121,7 +1121,7 @@ void ImageScanner::scanVideoFile()
if (metaInfo.isValid())
{
QStringList keys = metaInfo.keys();
- foreach (const QString& key, keys)
+ foreach(const QString& key, keys)
{
KFileMetaInfoItem item = metaInfo.item(key);
kDebug() << item.name() << item.value();
diff --git a/libs/database/imagetagpair.cpp b/libs/database/imagetagpair.cpp
index bdca7dc..a30d68b 100644
--- a/libs/database/imagetagpair.cpp
+++ b/libs/database/imagetagpair.cpp
@@ -100,7 +100,7 @@ void ImageTagPairPriv::checkProperties()
if (!isNull() && !propertiesLoaded)
{
QList<ImageTagProperty> props = \
DatabaseAccess().db()->getImageTagProperties(info.id(), tagId);
- foreach (const ImageTagProperty& p, props)
+ foreach(const ImageTagProperty& p, props)
{
properties.insert(p.property, p.value);
}
@@ -165,7 +165,7 @@ QList<ImageTagPair> ImageTagPair::availablePairs(const ImageInfo& \
info) }
QList<int> tagIds = DatabaseAccess().db()->getTagIdsWithProperties(info.id());
- foreach (int tagId, tagIds)
+ foreach(int tagId, tagIds)
{
pairs << ImageTagPair(info, tagId);
}
@@ -214,7 +214,7 @@ bool ImageTagPair::hasProperty(const QString& key) const
bool ImageTagPair::hasAnyProperty(const QStringList& keys) const
{
d->checkProperties();
- foreach (const QString& key, keys)
+ foreach(const QString& key, keys)
{
if (d->properties.contains(key))
{
@@ -240,7 +240,7 @@ QStringList ImageTagPair::allValues(const QStringList& keys) \
const {
d->checkProperties();
QStringList values;
- foreach (const QString& key, keys)
+ foreach(const QString& key, keys)
{
values << d->properties.values(key);
}
diff --git a/libs/database/schemaupdater.cpp b/libs/database/schemaupdater.cpp
index 98af2be..4a81211 100644
--- a/libs/database/schemaupdater.cpp
+++ b/libs/database/schemaupdater.cpp
@@ -724,7 +724,7 @@ static QStringList cleanUserFilterString(const QString& \
filterString) }
QStringList sepList = filterString.split(sep, QString::SkipEmptyParts);
- foreach (const QString& f, sepList)
+ foreach(const QString& f, sepList)
{
if (f.startsWith(wildcard))
{
diff --git a/libs/database/searchxml.cpp b/libs/database/searchxml.cpp
index b929a34..661bc5b 100644
--- a/libs/database/searchxml.cpp
+++ b/libs/database/searchxml.cpp
@@ -782,7 +782,7 @@ QStringList KeywordSearch::split(const QString& keywords)
// split down to single words
QStringList keywordList;
int quotationMarkCount = (keywords.startsWith('"') ? 1 : 0);
- foreach (const QString& group, quotationMarkList)
+ foreach(const QString& group, quotationMarkList)
{
if (quotationMarkCount % 2)
{
@@ -988,7 +988,7 @@ KeywordSearchWriter::KeywordSearchWriter()
QString KeywordSearchWriter::xml(const QStringList& keywordList)
{
writeGroup();
- foreach (const QString& keyword, keywordList)
+ foreach(const QString& keyword, keywordList)
{
writeField("keyword", SearchXml::Like);
writeValue(keyword);
@@ -1115,7 +1115,7 @@ QList<int> SearchXmlCachingReader::valueToIntList()
// we convert here from string list (equivalent result)
QStringList list = valueToStringList();
QList<int> intList;
- foreach (const QString& s, list)
+ foreach(const QString& s, list)
{
intList << s.toInt();
}
@@ -1128,7 +1128,7 @@ QList<qlonglong> SearchXmlCachingReader::valueToLongLongList()
// we convert here from string list (equivalent result)
QStringList list = valueToStringList();
QList<qlonglong> qlonglongList;
- foreach (const QString& s, list)
+ foreach(const QString& s, list)
{
qlonglongList << s.toLongLong();
}
@@ -1141,7 +1141,7 @@ QList<double> SearchXmlCachingReader::valueToDoubleList()
// we convert here from string list (equivalent result)
QStringList list = valueToStringList();
QList<double> doubleList;
- foreach (const QString& s, list)
+ foreach(const QString& s, list)
{
doubleList << s.toDouble();
}
@@ -1154,7 +1154,7 @@ QList<QDateTime> SearchXmlCachingReader::valueToDateTimeList()
// we convert here from string list (equivalent result)
QStringList list = valueToStringList();
QList<QDateTime> doubleList;
- foreach (const QString& s, list)
+ foreach(const QString& s, list)
{
doubleList << QDateTime::fromString(s, Qt::ISODate);
}
@@ -1189,7 +1189,7 @@ QList<int> SearchXmlCachingReader::valueToIntOrIntList()
QList<int> intList;
QList<QVariant> varList = m_value.toList();
- foreach (const QVariant& var, varList)
+ foreach(const QVariant& var, varList)
{
intList << var.toInt();
}
@@ -1213,7 +1213,7 @@ QList<double> \
SearchXmlCachingReader::valueToDoubleOrDoubleList()
QList<double> doubleList;
QList<QVariant> varList = m_value.toList();
- foreach (const QVariant& var, varList)
+ foreach(const QVariant& var, varList)
{
doubleList << var.toDouble();
}
@@ -1237,7 +1237,7 @@ QList<QString> \
SearchXmlCachingReader::valueToStringOrStringList()
QList<QString> QStringList;
QList<QVariant> varList = m_value.toList();
- foreach (const QVariant& var, varList)
+ foreach(const QVariant& var, varList)
{
QStringList << var.toString();
}
diff --git a/libs/database/tagproperties.cpp b/libs/database/tagproperties.cpp
index 9f57177..bf90e18 100644
--- a/libs/database/tagproperties.cpp
+++ b/libs/database/tagproperties.cpp
@@ -105,7 +105,7 @@ TagProperties::TagProperties(int tagId)
d->tagId = tagId;
QList<TagProperty> properties = DatabaseAccess().db()->getTagProperties(tagId);
- foreach (const TagProperty& p, properties)
+ foreach(const TagProperty& p, properties)
{
d->properties.insert(p.property, p.value);
}
diff --git a/libs/database/tagscache.cpp b/libs/database/tagscache.cpp
index 9187c41..7126e90 100644
--- a/libs/database/tagscache.cpp
+++ b/libs/database/tagscache.cpp
@@ -116,7 +116,7 @@ public:
{
QWriteLocker locker(&lock);
nameHash.clear();
- foreach (const TagShortInfo& info, infos)
+ foreach(const TagShortInfo& info, infos)
{
nameHash.insert(info.name, info.id);
}
@@ -138,7 +138,7 @@ public:
tagsWithProperty.clear();
QLatin1String internalProp = \
TagsCache::propertyNameDigikamInternalTag();
- foreach (const TagProperty& property, tagProperties)
+ foreach(const TagProperty& property, tagProperties)
{
if (property.property == internalProp)
{
@@ -342,7 +342,7 @@ QStringList TagsCache::tagNames(const QList<int>& ids, \
HiddenTagsPolicy hiddenTa
if (!ids.isEmpty())
{
- foreach (int id, ids)
+ foreach(int id, ids)
{
if (hiddenTagsPolicy == IncludeHiddenTags || !isInternalTag(id))
{
@@ -389,7 +389,7 @@ QStringList TagsCache::tagPaths(const QList<int>& ids, \
LeadingSlashPolicy slashP
if (!ids.isEmpty())
{
- foreach (int id, ids)
+ foreach(int id, ids)
{
if (hiddenTagsPolicy == IncludeHiddenTags || !isInternalTag(id))
{
@@ -433,7 +433,7 @@ int TagsCache::tagForName(const QString& tagName, int parentId) \
const QReadLocker locker(&d->lock);
QList<TagShortInfo>::const_iterator tag;
- foreach (int id, d->nameHash.values(tagName))
+ foreach(int id, d->nameHash.values(tagName))
{
tag = d->find(id);
@@ -510,7 +510,7 @@ int TagsCache::tagForPath(const QString& tagPath) const
QReadLocker locker(&d->lock);
// There might be multiple tags with the same name, but in different
// hierarchies. We must check them all until we find the correct hierarchy
- foreach (int id, d->nameHash.values(tagName))
+ foreach(int id, d->nameHash.values(tagName))
{
tag = d->find(id);
@@ -564,7 +564,7 @@ QList<int> TagsCache::tagsForPaths(const QStringList& tagPaths) \
const
if (!tagPaths.isEmpty())
{
- foreach (const QString& tagPath, tagPaths)
+ foreach(const QString& tagPath, tagPaths)
{
ids << tagForPath(tagPath);
}
@@ -596,7 +596,7 @@ int TagsCache::createTag(const QString& tagPathToCreate)
QReadLocker locker(&d->lock);
// Traverse hierarchy from top to bottom
- foreach (const QString& tagName, tagHierarchy)
+ foreach(const QString& tagName, tagHierarchy)
{
tagID = 0;
@@ -607,7 +607,7 @@ int TagsCache::createTag(const QString& tagPathToCreate)
// find the tag with tag name according to tagHierarchy,
// and parent ID identical to the ID of the tag we found in
// the previous run.
- foreach (int id, d->nameHash.values(tagName))
+ foreach(int id, d->nameHash.values(tagName))
{
tag = d->find(id);
@@ -643,7 +643,7 @@ int TagsCache::createTag(const QString& tagPathToCreate)
{
DatabaseAccess access;
- foreach (const QString& tagName, tagsToCreate)
+ foreach(const QString& tagName, tagsToCreate)
{
tagID = access.db()->addTag(parentTagIDForCreation, tagName, QString(), \
0);
@@ -671,7 +671,7 @@ QList<int> TagsCache::createTags(const QStringList& tagPaths)
if (!tagPaths.isEmpty())
{
- foreach (const QString& tagPath, tagPaths)
+ foreach(const QString& tagPath, tagPaths)
{
ids << createTag(tagPath);
}
@@ -686,7 +686,7 @@ QList<int> TagsCache::getOrCreateTags(const QStringList& \
tagPaths)
if (!tagPaths.isEmpty())
{
- foreach (const QString& tagPath, tagPaths)
+ foreach(const QString& tagPath, tagPaths)
{
ids << getOrCreateTag(tagPath);
}
@@ -900,7 +900,7 @@ bool TagsCache::containsPublicTags(const QList<int>& tagIds) \
const d->checkProperties();
QReadLocker locker(&d->lock);
- foreach (int id, tagIds)
+ foreach(int id, tagIds)
{
if (!d->internalTags.contains(id))
{
@@ -981,7 +981,7 @@ int TagsCache::colorLabelFromTags(QList<int> tagIds)
{
d->checkLabelTags();
QReadLocker locker(&d->lock);
- foreach (int tagId, tagIds)
+ foreach(int tagId, tagIds)
{
for (int i=FirstColorLabel; i<=LastColorLabel; i++)
{
@@ -1022,7 +1022,7 @@ int TagsCache::pickLabelFromTags(QList<int> tagIds)
{
d->checkLabelTags();
QReadLocker locker(&d->lock);
- foreach (int tagId, tagIds)
+ foreach(int tagId, tagIds)
{
for (int i=FirstPickLabel; i<=LastPickLabel; i++)
{
@@ -1042,7 +1042,7 @@ QStringList TagsCache::shortenedTagPaths(const QList<int>& ids, \
QList<int>* sort QList<QVariant> variantIds;
// duplicates tagPath(), but we need the additional list of tag ids
- foreach (int id, ids)
+ foreach(int id, ids)
{
if (hiddenTagsPolicy == IncludeHiddenTags || !isInternalTag(id))
{
@@ -1054,7 +1054,7 @@ QStringList TagsCache::shortenedTagPaths(const QList<int>& ids, \
QList<int>* sort
// The code is needed in libdigikamcore, so it cannot be moved here. TODO: Find \
a good place
QStringList shortenedPaths = ImagePropertiesTab::shortenedTagPaths(paths, \
&variantIds);
- foreach (const QVariant& var, variantIds)
+ foreach(const QVariant& var, variantIds)
{
(*sortedIds) << var.toInt();
}
diff --git a/libs/database/thumbnaildb.cpp b/libs/database/thumbnaildb.cpp
index 9bf648d..e7340c7 100644
--- a/libs/database/thumbnaildb.cpp
+++ b/libs/database/thumbnaildb.cpp
@@ -160,7 +160,7 @@ DatabaseThumbnailInfo ThumbnailDB::findByFilePath(const QString& \
path, const QSt }
else
{
- foreach (const QVariant& hash, values)
+ foreach(const QVariant& hash, values)
{
if (hash == uniqueHash)
{
diff --git a/libs/dimg/dimg.cpp b/libs/dimg/dimg.cpp
index a206ff9..117414f 100644
--- a/libs/dimg/dimg.cpp
+++ b/libs/dimg/dimg.cpp
@@ -1102,7 +1102,7 @@ QStringList DImgPrivate::fileOriginAttributes()
QVariant DImg::fileOriginData() const
{
QVariantMap map;
- foreach(const QString & key, m_priv->fileOriginAttributes())
+ foreach(const QString& key, m_priv->fileOriginAttributes())
{
QVariant attr = attribute(key);
@@ -1158,7 +1158,7 @@ QVariant DImg::lastSavedFileOriginData() const
void DImg::setFileOriginData(const QVariant& data)
{
QVariantMap map = data.toMap();
- foreach(const QString & key, m_priv->fileOriginAttributes())
+ foreach(const QString& key, m_priv->fileOriginAttributes())
{
removeAttribute(key);
QVariant attr = map.value(key);
diff --git a/libs/dimg/filters/dimgfiltermanager.cpp \
b/libs/dimg/filters/dimgfiltermanager.cpp index 699fd7a..08228af 100644
--- a/libs/dimg/filters/dimgfiltermanager.cpp
+++ b/libs/dimg/filters/dimgfiltermanager.cpp
@@ -228,7 +228,7 @@ void DImgFilterManager::DImgFilterManagerPriv::setupI18nStrings()
void DImgFilterManager::DImgFilterManagerPriv::addGenerator(const ImgFilterPtr& \
generator) {
QMutexLocker lock(&mutex);
- foreach(const QString & id, generator->supportedFilters())
+ foreach(const QString& id, generator->supportedFilters())
{
if (filterMap.contains(id))
{
diff --git a/libs/dimg/filters/filteractionfilter.cpp \
b/libs/dimg/filters/filteractionfilter.cpp index cd678f9..3289387 100644
--- a/libs/dimg/filters/filteractionfilter.cpp
+++ b/libs/dimg/filters/filteractionfilter.cpp
@@ -104,7 +104,7 @@ QList<FilterAction> FilterActionFilter::filterActions() const
bool FilterActionFilter::isReproducible() const
{
- foreach(const FilterAction & action, d->actions)
+ foreach(const FilterAction& action, d->actions)
{
if (!action.isNull() && action.category() != \
FilterAction::ReproducibleFilter) {
@@ -116,7 +116,7 @@ bool FilterActionFilter::isReproducible() const
bool FilterActionFilter::isComplexAction() const
{
- foreach(const FilterAction & action, d->actions)
+ foreach(const FilterAction& action, d->actions)
{
if (!action.isNull() && action.category() != \
FilterAction::ReproducibleFilter && action.category() != \
FilterAction::ComplexFilter) @@ -129,7 +129,7 @@ bool \
FilterActionFilter::isComplexAction() const
bool FilterActionFilter::isSupported() const
{
- foreach(const FilterAction & action, d->actions)
+ foreach(const FilterAction& action, d->actions)
{
if (!action.isNull() && \
!DImgFilterManager::instance()->isSupported(action.identifier(), action.version())) \
{ @@ -180,7 +180,7 @@ void FilterActionFilter::filterImage()
DImg img = m_orgImage;
- foreach(const FilterAction & action, d->actions)
+ foreach(const FilterAction& action, d->actions)
{
kDebug() << "Replaying action" << action.identifier();
diff --git a/libs/dimg/filters/icc/iccprofile.cpp \
b/libs/dimg/filters/icc/iccprofile.cpp index 176fe49..421473c 100644
--- a/libs/dimg/filters/icc/iccprofile.cpp
+++ b/libs/dimg/filters/icc/iccprofile.cpp
@@ -516,7 +516,7 @@ QStringList IccProfile::defaultSearchPaths()
dataDirs << "/usr/local/share";
}
- foreach(const QString & dataDir, dataDirs)
+ foreach(const QString& dataDir, dataDirs)
{
candidates << dataDir + "/color/icc";
}
@@ -537,7 +537,7 @@ QStringList IccProfile::defaultSearchPaths()
#endif
- foreach(const QString & candidate, candidates)
+ foreach(const QString& candidate, candidates)
{
QDir dir(candidate);
diff --git a/libs/dimg/filters/icc/iccprofilesettings.cpp \
b/libs/dimg/filters/icc/iccprofilesettings.cpp index eddaa92..85b2e47 100644
--- a/libs/dimg/filters/icc/iccprofilesettings.cpp
+++ b/libs/dimg/filters/icc/iccprofilesettings.cpp
@@ -146,7 +146,7 @@ void IccProfilesSettings::readSettings(KConfigGroup& group)
{
QStringList lastProfiles = \
group.readPathEntry(d->configRecentlyUsedProfilesEntry, QStringList());
- foreach(const QString & path, lastProfiles)
+ foreach(const QString& path, lastProfiles)
{
d->favoriteProfiles.insert(path, new bool(true));
}
diff --git a/libs/dimg/filters/icc/iccsettings.cpp \
b/libs/dimg/filters/icc/iccsettings.cpp index cf69f3a..bf49616 100644
--- a/libs/dimg/filters/icc/iccsettings.cpp
+++ b/libs/dimg/filters/icc/iccsettings.cpp
@@ -155,7 +155,7 @@ bool IccSettings::monitorProfileFromSystem()
{
QMutexLocker lock(&d->mutex);
- foreach(const IccProfile & profile, d->screenProfiles)
+ foreach(const IccProfile& profile, d->screenProfiles)
{
if (!profile.isNull())
{
@@ -167,7 +167,7 @@ bool IccSettings::monitorProfileFromSystem()
// Second, check all toplevel widgets
QList<QWidget*> topLevels = qApp->topLevelWidgets();
- foreach(QWidget * widget, topLevels)
+ foreach(QWidget* widget, topLevels)
{
if (!d->profileFromWindowSystem(widget).isNull())
{
@@ -385,7 +385,7 @@ QList<IccProfile> \
IccSettings::IccSettingsPriv::scanDirectories(const QStringLis filters << "*.icc" << \
"*.icm"; kDebug() << dirs;
- foreach(const QString & dirPath, dirs)
+ foreach(const QString& dirPath, dirs)
{
QDir dir(dirPath);
@@ -407,7 +407,7 @@ void IccSettings::IccSettingsPriv::scanDirectory(const QString& \
path, const QStr infos << dir.entryInfoList(filter, QDir::Files | QDir::Readable);
infos << dir.entryInfoList(QDir::Dirs | QDir::Readable | QDir::NoDotAndDotDot);
- foreach(const QFileInfo & info, infos)
+ foreach(const QFileInfo& info, infos)
{
if (info.isFile())
{
diff --git a/libs/dimg/imagehistory/dimagehistory.cpp \
b/libs/dimg/imagehistory/dimagehistory.cpp index b9493c0..ee59cd6 100644
--- a/libs/dimg/imagehistory/dimagehistory.cpp
+++ b/libs/dimg/imagehistory/dimagehistory.cpp
@@ -109,13 +109,13 @@ bool DImageHistory::isValid() const
}
else
{
- foreach (const Entry& e, d->entries)
+ foreach(const Entry& e, d->entries)
{
if (!e.action.isNull())
{
return true;
}
- foreach (const HistoryImageId& id, e.referredImages)
+ foreach(const HistoryImageId& id, e.referredImages)
{
if (id.isValid() && !id.isCurrentFile())
{
@@ -248,7 +248,7 @@ const FilterAction& DImageHistory::action(int i) const
QList<FilterAction> DImageHistory::allActions() const
{
QList<FilterAction> actions;
- foreach (const Entry& entry, d->entries)
+ foreach(const Entry& entry, d->entries)
{
if (!entry.action.isNull())
{
@@ -261,7 +261,7 @@ QList<FilterAction> DImageHistory::allActions() const
int DImageHistory::actionCount() const
{
int count = 0;
- foreach (const Entry& entry, d->entries)
+ foreach(const Entry& entry, d->entries)
{
if (!entry.action.isNull())
{
@@ -274,7 +274,7 @@ int DImageHistory::actionCount() const
bool DImageHistory::hasActions() const
{
- foreach (const Entry& entry, d->entries)
+ foreach(const Entry& entry, d->entries)
{
if (!entry.action.isNull())
{
@@ -298,7 +298,7 @@ const QList<HistoryImageId> &DImageHistory::referredImages(int i) \
const QList<HistoryImageId> DImageHistory::allReferredImages() const
{
QList<HistoryImageId> ids;
- foreach (const Entry& entry, d->entries)
+ foreach(const Entry& entry, d->entries)
{
ids << entry.referredImages;
}
@@ -307,7 +307,7 @@ QList<HistoryImageId> DImageHistory::allReferredImages() const
bool DImageHistory::hasReferredImages() const
{
- foreach (const Entry& entry, d->entries)
+ foreach(const Entry& entry, d->entries)
{
if (!entry.referredImages.isEmpty())
{
@@ -320,9 +320,9 @@ bool DImageHistory::hasReferredImages() const
bool DImageHistory::hasReferredImageOfType(HistoryImageId::Type type) const
{
- foreach (const Entry& entry, d->entries)
+ foreach(const Entry& entry, d->entries)
{
- foreach (const HistoryImageId& id, entry.referredImages)
+ foreach(const HistoryImageId& id, entry.referredImages)
{
if (id.m_type == type)
{
@@ -346,9 +346,9 @@ bool DImageHistory::hasOriginalReferredImage() const
QList<HistoryImageId> DImageHistory::referredImagesOfType(HistoryImageId::Type type) \
const {
QList<HistoryImageId> ids;
- foreach (const Entry& entry, d->entries)
+ foreach(const Entry& entry, d->entries)
{
- foreach (const HistoryImageId& id, entry.referredImages)
+ foreach(const HistoryImageId& id, entry.referredImages)
{
if (id.m_type == type)
{
@@ -361,9 +361,9 @@ QList<HistoryImageId> \
DImageHistory::referredImagesOfType(HistoryImageId::Type t
HistoryImageId DImageHistory::currentReferredImage() const
{
- foreach (const Entry& entry, d->entries)
+ foreach(const Entry& entry, d->entries)
{
- foreach (const HistoryImageId& id, entry.referredImages)
+ foreach(const HistoryImageId& id, entry.referredImages)
{
if (id.isCurrentFile())
{
@@ -376,9 +376,9 @@ HistoryImageId DImageHistory::currentReferredImage() const
HistoryImageId DImageHistory::originalReferredImage() const
{
- foreach (const Entry& entry, d->entries)
+ foreach(const Entry& entry, d->entries)
{
- foreach (const HistoryImageId& id, entry.referredImages)
+ foreach(const HistoryImageId& id, entry.referredImages)
{
if (id.isOriginalFile())
{
@@ -523,7 +523,7 @@ QString DImageHistory::toXml() const
{
QList<QString> keys = params.keys();
qSort(keys);
- foreach (const QString& key, keys)
+ foreach(const QString& key, keys)
{
QHash<QString, QVariant>::const_iterator it;
@@ -543,7 +543,7 @@ QString DImageHistory::toXml() const
if (!step.referredImages.isEmpty())
{
- foreach (const HistoryImageId& imageId, step.referredImages)
+ foreach(const HistoryImageId& imageId, step.referredImages)
{
if (!imageId.isValid())
{
diff --git a/libs/dmetadata/dmetadata.cpp b/libs/dmetadata/dmetadata.cpp
index ecd2e1c..2454ef1 100644
--- a/libs/dmetadata/dmetadata.cpp
+++ b/libs/dmetadata/dmetadata.cpp
@@ -2204,7 +2204,7 @@ QVariant DMetadata::getMetadataField(MetadataInfo::Field field) \
const QVariantList DMetadata::getMetadataFields(const MetadataFields& fields) const
{
QVariantList list;
- foreach (MetadataInfo::Field field, fields) // krazy:exclude=foreach
+ foreach(MetadataInfo::Field field, fields) // krazy:exclude=foreach
{
list << getMetadataField(field);
}
@@ -2829,7 +2829,7 @@ bool DMetadata::removeExifColorSpace() const
QString DMetadata::getExifTagStringFromTagsList(const QStringList& tagsList) const
{
QString val;
- foreach (QString tag, tagsList)
+ foreach(QString tag, tagsList)
{
val = getExifTagString(tag.toAscii());
if (!val.isEmpty())
diff --git a/libs/imageproperties/imagepropertiestab.cpp \
b/libs/imageproperties/imagepropertiestab.cpp index eaa87a2..551240d 100644
--- a/libs/imageproperties/imagepropertiestab.cpp
+++ b/libs/imageproperties/imagepropertiestab.cpp
@@ -601,7 +601,7 @@ QStringList ImagePropertiesTab::shortenedTagPaths(const \
QStringList& tagPaths, Q
QStringList tagsShortened;
QString previous;
- foreach (const PathValuePair& pair, tagsSorted)
+ foreach(const PathValuePair& pair, tagsSorted)
{
const QString& tagPath = pair.first;
QString shortenedPath = tagPath;
diff --git a/libs/models/abstractalbummodel.cpp b/libs/models/abstractalbummodel.cpp
index d6fa32a..4a91f7d 100644
--- a/libs/models/abstractalbummodel.cpp
+++ b/libs/models/abstractalbummodel.cpp
@@ -284,7 +284,7 @@ QMimeData* AbstractAlbumModel::mimeData(const QModelIndexList& \
indexes) const }
QList<Album*> albums;
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
Album* a = albumForIndex(index);
@@ -949,7 +949,7 @@ void AbstractCheckableAlbumModel::resetAllCheckedAlbums()
QList<Album*> oldChecked = d->checkedAlbums.keys();
d->checkedAlbums.clear();
- foreach (Album* album, oldChecked)
+ foreach(Album* album, oldChecked)
{
QModelIndex index = indexForAlbum(album);
emit dataChanged(index, index);
diff --git a/libs/models/albumfiltermodel.cpp b/libs/models/albumfiltermodel.cpp
index f5dc5d6..45c2572 100644
--- a/libs/models/albumfiltermodel.cpp
+++ b/libs/models/albumfiltermodel.cpp
@@ -634,7 +634,7 @@ bool TagPropertiesFilterModel::matches(Album* album) const
TAlbum* talbum = static_cast<TAlbum*>(album);
- foreach (const QString& prop, m_propertiesBlackList)
+ foreach(const QString& prop, m_propertiesBlackList)
{
if (talbum->hasProperty(prop))
{
@@ -642,7 +642,7 @@ bool TagPropertiesFilterModel::matches(Album* album) const
}
}
- foreach (const QString& prop, m_propertiesWhiteList)
+ foreach(const QString& prop, m_propertiesWhiteList)
{
if (!talbum->hasProperty(prop))
{
diff --git a/libs/models/categorizeditemmodel.cpp \
b/libs/models/categorizeditemmodel.cpp index e7bbc70..f69e368 100644
--- a/libs/models/categorizeditemmodel.cpp
+++ b/libs/models/categorizeditemmodel.cpp
@@ -112,7 +112,7 @@ public:
{
int categorySortStartIndex = model->rowCount();
- foreach (QAction* a, actions)
+ foreach(QAction* a, actions)
{
QAction* categoryAction = 0;
if (mode & ActionItemModel::ToplevelMenuCategory)
@@ -146,7 +146,7 @@ protected:
void enumerateActions(const QWidget* w, QAction* widgetAction)
{
- foreach (QAction *a, w->actions())
+ foreach(QAction *a, w->actions())
{
if (a->menu())
{
diff --git a/libs/models/imagealbumfiltermodel.cpp \
b/libs/models/imagealbumfiltermodel.cpp index 3c82c46..cc855b3 100644
--- a/libs/models/imagealbumfiltermodel.cpp
+++ b/libs/models/imagealbumfiltermodel.cpp
@@ -63,12 +63,12 @@ ImageAlbumFilterModel::ImageAlbumFilterModel(QObject* parent)
connect(AlbumManager::instance(), SIGNAL(signalAlbumRenamed(Album*)),
this, SLOT(slotAlbumRenamed(Album*)));
- foreach (Album* a, AlbumManager::instance()->allPAlbums())
+ foreach(Album* a, AlbumManager::instance()->allPAlbums())
{
albumChange(a);
}
- foreach (Album* a, AlbumManager::instance()->allTAlbums())
+ foreach(Album* a, AlbumManager::instance()->allTAlbums())
{
albumChange(a);
}
diff --git a/libs/models/imagealbummodel.cpp b/libs/models/imagealbummodel.cpp
index 013b4ea..7f73e4d 100644
--- a/libs/models/imagealbummodel.cpp
+++ b/libs/models/imagealbummodel.cpp
@@ -430,7 +430,7 @@ void ImageAlbumModel::slotImageChange(const ImageChangeset& \
changeset)
if (needCheckRefresh)
{
- foreach (const qlonglong& id, changeset.ids())
+ foreach(const qlonglong& id, changeset.ids())
{
// if one matching image id is found, trigger a refresh
if (hasImage(id))
@@ -460,7 +460,7 @@ void ImageAlbumModel::slotImageTagChange(const ImageTagChangeset& \
changeset)
if (!doRefresh && d->recurseTags)
{
- foreach (int tagId, changeset.tags())
+ foreach(int tagId, changeset.tags())
{
Album* a = AlbumManager::instance()->findTAlbum(tagId);
@@ -508,7 +508,7 @@ void ImageAlbumModel::slotCollectionImageChange(const \
CollectionImageChangeset&
if (!doRefresh && d->recurseAlbums)
{
- foreach (int albumId, changeset.albums())
+ foreach(int albumId, changeset.albums())
{
Album* a = \
AlbumManager::instance()->findPAlbum(albumId);
@@ -531,7 +531,7 @@ void ImageAlbumModel::slotCollectionImageChange(const \
CollectionImageChangeset& case CollectionImageChangeset::Removed:
case CollectionImageChangeset::RemovedAll:
// is one of our images affected?
- foreach (const qlonglong& id, changeset.ids())
+ foreach(const qlonglong& id, changeset.ids())
{
// if one matching image id is found, trigger a refresh
if (hasImage(id))
diff --git a/libs/models/imagefiltermodel.cpp b/libs/models/imagefiltermodel.cpp
index 81601a0..1bc5309 100644
--- a/libs/models/imagefiltermodel.cpp
+++ b/libs/models/imagefiltermodel.cpp
@@ -152,7 +152,7 @@ QModelIndex \
ImageSortFilterModel::mapFromDirectSourceToSourceImageModel(const QM \
QList<QModelIndex> ImageSortFilterModel::mapListToSource(const QList<QModelIndex>& \
indexes) const {
QList<QModelIndex> sourceIndexes;
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
sourceIndexes << mapToSourceImageModel(index);
}
@@ -162,7 +162,7 @@ QList<QModelIndex> ImageSortFilterModel::mapListToSource(const \
QList<QModelIndex QList<QModelIndex> ImageSortFilterModel::mapListFromSource(const \
QList<QModelIndex>& sourceIndexes) const {
QList<QModelIndex> indexes;
- foreach (const QModelIndex& index, sourceIndexes)
+ foreach(const QModelIndex& index, sourceIndexes)
{
indexes << mapFromSourceImageModel(index);
}
@@ -183,7 +183,7 @@ QList<ImageInfo> ImageSortFilterModel::imageInfos(const \
QList<QModelIndex>& inde {
QList<ImageInfo> infos;
ImageModel* model = sourceImageModel();
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
infos << model->imageInfo(mapToSourceImageModel(index));
}
@@ -194,7 +194,7 @@ QList<qlonglong> ImageSortFilterModel::imageIds(const \
QList<QModelIndex>& indexe {
QList<qlonglong> ids;
ImageModel* model = sourceImageModel();
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
ids << model->imageId(mapToSourceImageModel(index));
}
@@ -908,7 +908,7 @@ void \
ImageFilterModelPreparer::process(ImageFilterModelTodoPackage package) \
infoList.loadGroupImageIds(); }
- foreach (ImageFilterModelPrepareHook* hook, prepareHooks)
+ foreach(ImageFilterModelPrepareHook* hook, prepareHooks)
{
hook->prepare(package.infos);
}
@@ -942,7 +942,7 @@ void \
ImageFilterModelFilterer::process(ImageFilterModelTodoPackage \
package)
// Actual filtering. The variants to spare checking hasOneMatch over and over \
again. if (hasOneMatch && hasOneMatchForText)
{
- foreach (const ImageInfo& info, package.infos)
+ foreach(const ImageInfo& info, package.infos)
{
package.filterResults[info.id()] = localFilter.matches(info) &&
localVersionFilter.matches(info) &&
@@ -952,7 +952,7 @@ void \
ImageFilterModelFilterer::process(ImageFilterModelTodoPackage package) else if \
(hasOneMatch) {
bool matchForText;
- foreach (const ImageInfo& info, package.infos)
+ foreach(const ImageInfo& info, package.infos)
{
package.filterResults[info.id()] = localFilter.matches(info, \
&matchForText) &&
localVersionFilter.matches(info) &&
@@ -967,7 +967,7 @@ void \
ImageFilterModelFilterer::process(ImageFilterModelTodoPackage package) else
{
bool result, matchForText;
- foreach (const ImageInfo& info, package.infos)
+ foreach(const ImageInfo& info, package.infos)
{
result = localFilter.matches(info, \
&matchForText) &&
localVersionFilter.matches(info) &&
@@ -1151,7 +1151,7 @@ void ImageFilterModel::slotImageTagChange(const \
ImageTagChangeset& changeset) }
// is one of our images affected?
- foreach (const qlonglong& id, changeset.ids())
+ foreach(const qlonglong& id, changeset.ids())
{
// if one matching image id is found, trigger a refresh
if (d->imageModel->hasImage(id))
@@ -1189,7 +1189,7 @@ void ImageFilterModel::slotImageChange(const ImageChangeset& \
changeset)
// is one of our images affected?
bool imageAffected = false;
- foreach (const qlonglong& id, changeset.ids())
+ foreach(const qlonglong& id, changeset.ids())
{
// if one matching image id is found, trigger a refresh
if (d->imageModel->hasImage(id))
diff --git a/libs/models/imagefiltersettings.cpp \
b/libs/models/imagefiltersettings.cpp index 54593bd..6052f7f 100644
--- a/libs/models/imagefiltersettings.cpp
+++ b/libs/models/imagefiltersettings.cpp
@@ -581,7 +581,7 @@ bool ImageFilterSettings::matches(const ImageInfo& info, bool* \
foundText) const }
// Tag names
- foreach (int id, info.tagIds())
+ foreach(int id, info.tagIds())
{
if (m_textFilterSettings.textFields & SearchTextFilterSettings::TagName \
&&
m_tagNameHash.value(id).contains(m_textFilterSettings.text, \
m_textFilterSettings.caseSensitive)) @@ -709,7 +709,7 @@ bool \
VersionImageFilterSettings::isHiddenBySettings(const ImageInfo& info) const {
QList<int> tagIds = info.tagIds();
- foreach (int tagId, m_excludeTagFilter)
+ foreach(int tagId, m_excludeTagFilter)
{
if (tagIds.contains(tagId))
{
diff --git a/libs/models/imagemodel.cpp b/libs/models/imagemodel.cpp
index 81a6a4d..4aab46c 100644
--- a/libs/models/imagemodel.cpp
+++ b/libs/models/imagemodel.cpp
@@ -174,7 +174,7 @@ qlonglong ImageModel::imageId(const QModelIndex& index) const
QList<ImageInfo> ImageModel::imageInfos(const QList<QModelIndex>& indexes) const
{
QList<ImageInfo> infos;
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
infos << imageInfo(index);
}
@@ -184,7 +184,7 @@ QList<ImageInfo> ImageModel::imageInfos(const QList<QModelIndex>& \
indexes) const QList<qlonglong> ImageModel::imageIds(const QList<QModelIndex>& \
indexes) const {
QList<qlonglong> ids;
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
ids << imageId(index);
}
@@ -394,7 +394,7 @@ ImageInfo ImageModel::imageInfo(const QString& filePath) const
}
else
{
- foreach (const ImageInfo& info, d->infos)
+ foreach(const ImageInfo& info, d->infos)
{
if (info.filePath() == filePath)
{
@@ -416,7 +416,7 @@ QList<ImageInfo> ImageModel::imageInfos(const QString& filePath) \
const
if (id)
{
- foreach (int index, d->idHash.values(id))
+ foreach(int index, d->idHash.values(id))
{
infos << d->infos.at(index);
}
@@ -424,7 +424,7 @@ QList<ImageInfo> ImageModel::imageInfos(const QString& filePath) \
const }
else
{
- foreach (const ImageInfo& info, d->infos)
+ foreach(const ImageInfo& info, d->infos)
{
if (info.filePath() == filePath)
{
@@ -562,7 +562,7 @@ void ImageModel::emitDataChangedForSelection(const \
QItemSelection& selection) {
if (!selection.isEmpty())
{
- foreach (const QItemSelectionRange& range, selection)
+ foreach(const QItemSelectionRange& range, selection)
{
emit dataChanged(range.topLeft(), range.bottomRight());
}
@@ -734,7 +734,7 @@ void ImageModel::removeIndex(const QModelIndex& index)
void ImageModel::removeIndexes(const QList<QModelIndex>& indexes)
{
QList<int> listIndexes;
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
if (d->isValid(index))
{
@@ -758,7 +758,7 @@ void ImageModel::removeImageInfo(const ImageInfo& info)
void ImageModel::removeImageInfos(const QList<ImageInfo>& infos)
{
QList<int> listIndexes;
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
QModelIndex index = indexForImageId(info.id());
if (index.isValid())
@@ -852,7 +852,7 @@ void ImageModel::removeRowPairs(const QList<QPair<int, int> >& \
toRemove) int removedRows = 0, offset = 0;
typedef QPair<int, int> IntPair; // to make foreach macro happy
- foreach (const IntPair& pair, toRemove)
+ foreach(const IntPair& pair, toRemove)
{
const int begin = pair.first - offset;
const int end = pair.second - offset; // inclusive
@@ -937,7 +937,7 @@ void ImageModelIncrementalUpdater::appendInfos(const \
QList<ImageInfo>& infos, co {
if (extraValues.isEmpty())
{
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
QHash<qlonglong,int>::iterator it = oldIds.find(info.id());
@@ -992,11 +992,11 @@ QList<QPair<int, int> > \
ImageModelIncrementalUpdater::oldIndexes() {
// first, apply all changes to indexes by direct removal in model
// while the updater was active
- foreach (const IntPairList& list, modelRemovals)
+ foreach(const IntPairList& list, modelRemovals)
{
int removedRows = 0, offset = 0;
- foreach (const IntPair& pair, list)
+ foreach(const IntPair& pair, list)
{
const int begin = pair.first - offset;
const int end = pair.second - offset; // inclusive
@@ -1169,7 +1169,7 @@ void ImageModel::slotImageChange(const ImageChangeset& \
changeset) if (d->watchFlags & changeset.changes())
{
QItemSelection items;
- foreach (const qlonglong& id, changeset.ids())
+ foreach(const qlonglong& id, changeset.ids())
{
QModelIndex index = indexForImageId(id);
@@ -1195,7 +1195,7 @@ void ImageModel::slotImageTagChange(const ImageTagChangeset& \
changeset) }
QItemSelection items;
- foreach (const qlonglong& id, changeset.ids())
+ foreach(const qlonglong& id, changeset.ids())
{
QModelIndex index = indexForImageId(id);
diff --git a/libs/models/imagethumbnailmodel.cpp \
b/libs/models/imagethumbnailmodel.cpp index b056397..8226121 100644
--- a/libs/models/imagethumbnailmodel.cpp
+++ b/libs/models/imagethumbnailmodel.cpp
@@ -312,7 +312,7 @@ void ImageThumbnailModel::slotThumbnailLoaded(const \
LoadingDescription& loadingD }
// In case of multiple occurrence, we currently do not know which thumbnail is \
this. Signal change on all.
- foreach (const QModelIndex& index, indexesForPath(loadingDescription.filePath))
+ foreach(const QModelIndex& index, indexesForPath(loadingDescription.filePath))
{
if (thumb.isNull())
{
diff --git a/libs/template/templatelist.cpp b/libs/template/templatelist.cpp
index 6be2f51..8d5f965 100644
--- a/libs/template/templatelist.cpp
+++ b/libs/template/templatelist.cpp
@@ -98,7 +98,7 @@ void TemplateList::readSettings()
if (tm)
{
QList<Template> list = tm->templateList();
- foreach (const Template& t, list)
+ foreach(const Template& t, list)
{
new TemplateListItem(this, t);
}
diff --git a/libs/template/templatemanager.cpp b/libs/template/templatemanager.cpp
index bef0173..7c0b93f 100644
--- a/libs/template/templatemanager.cpp
+++ b/libs/template/templatemanager.cpp
@@ -317,7 +317,7 @@ bool TemplateManager::save()
{
QMutexLocker lock(&d->mutex);
- foreach (const Template& t, d->pList)
+ foreach(const Template& t, d->pList)
{
QDomElement elem = doc.createElement("template");
@@ -343,7 +343,7 @@ bool TemplateManager::save()
QDomElement authors = doc.createElement(QString::fromLatin1("authors"));
elem.appendChild(authors);
- foreach (const QString& name, t.authors())
+ foreach(const QString& name, t.authors())
{
QDomElement e = doc.createElement(QString::fromLatin1("name"));
e.setAttribute(QString::fromLatin1("value"), name);
@@ -430,7 +430,7 @@ bool TemplateManager::save()
QDomElement subjects = \
doc.createElement(QString::fromLatin1("subjects")); elem.appendChild(subjects);
- foreach (const QString& subject, t.IptcSubjects())
+ foreach(const QString& subject, t.IptcSubjects())
{
QDomElement e = doc.createElement(QString::fromLatin1("subject"));
e.setAttribute(QString::fromLatin1("value"), subject);
@@ -524,7 +524,7 @@ void TemplateManager::clear()
d->pList.clear();
}
- foreach (const Template& t, d->pList)
+ foreach(const Template& t, d->pList)
{
emit signalTemplateRemoved(t);
}
@@ -539,7 +539,7 @@ Template TemplateManager::findByTitle(const QString& title) const
{
QMutexLocker lock(&d->mutex);
- foreach (const Template& t, d->pList)
+ foreach(const Template& t, d->pList)
{
if (t.templateTitle() == title)
{
@@ -553,7 +553,7 @@ Template TemplateManager::findByContents(const Template& tref) \
const {
QMutexLocker lock(&d->mutex);
- foreach (const Template& t, d->pList)
+ foreach(const Template& t, d->pList)
{
if (t == tref)
{
diff --git a/libs/template/templateselector.cpp b/libs/template/templateselector.cpp
index e8d8579..868825c 100644
--- a/libs/template/templateselector.cpp
+++ b/libs/template/templateselector.cpp
@@ -129,7 +129,7 @@ void TemplateSelector::populateTemplates()
int i = DONTCHANGE + 2;
QList<Template> list = tm->templateList();
- foreach(const Template & t, list)
+ foreach(const Template& t, list)
{
d->templateCombo->insertSqueezedItem(t.templateTitle(), i);
++i;
diff --git a/libs/thememanager/thememanager.cpp b/libs/thememanager/thememanager.cpp
index 28a1e57..d0a1f70 100644
--- a/libs/thememanager/thememanager.cpp
+++ b/libs/thememanager/thememanager.cpp
@@ -242,7 +242,7 @@ void ThemeManager::populateThemeMenu()
QStringList actionMapKeys = actionMap.keys();
actionMapKeys.sort();
- foreach (const QString& name, actionMapKeys)
+ foreach(const QString& name, actionMapKeys)
{
d->themeMenuAction->addAction(actionMap.value(name));
}
diff --git a/libs/threadimageio/loadingcache.cpp \
b/libs/threadimageio/loadingcache.cpp index fa8b919..b2b7ca3 100644
--- a/libs/threadimageio/loadingcache.cpp
+++ b/libs/threadimageio/loadingcache.cpp
@@ -476,14 +476,14 @@ void ClassicLoadingCacheFileWatch::slotUpdateDirWatch()
}
}
- foreach (const QString& watchedItem, toBeRemoved)
+ foreach(const QString& watchedItem, toBeRemoved)
{
//kDebug() << "removing m_watch for " << *it;
m_watch->removeFile(watchedItem);
m_watchedFiles.remove(watchedItem);
}
- foreach (const QString& watchedItem, toBeAdded)
+ foreach(const QString& watchedItem, toBeAdded)
{
//kDebug() << "adding m_watch for " << *it;
m_watch->addFile(watchedItem);
diff --git a/libs/threadimageio/loadsavetask.cpp \
b/libs/threadimageio/loadsavetask.cpp index c2ffb4d..269a4ad 100644
--- a/libs/threadimageio/loadsavetask.cpp
+++ b/libs/threadimageio/loadsavetask.cpp
@@ -113,7 +113,7 @@ void SharedLoadingTask::execute()
DImg* cachedImg = 0;
QStringList lookupKeys = m_loadingDescription.lookupCacheKeys();
- foreach (const QString& key, lookupKeys)
+ foreach(const QString& key, lookupKeys)
{
if ( (cachedImg = cache->retrieveImage(key)) )
{
diff --git a/libs/threadimageio/managedloadsavethread.cpp \
b/libs/threadimageio/managedloadsavethread.cpp index e8aaecec..bfa23b1 100644
--- a/libs/threadimageio/managedloadsavethread.cpp
+++ b/libs/threadimageio/managedloadsavethread.cpp
@@ -390,7 +390,7 @@ void ManagedLoadSaveThread::preloadThumbnailGroup(const \
QList<LoadingDescription QMutexLocker lock(threadMutex());
QList<LoadSaveTask*> todo;
- foreach(const LoadingDescription & description, descriptions)
+ foreach(const LoadingDescription& description, descriptions)
{
LoadingTask* existingTask = findExistingTask(description);
@@ -513,7 +513,7 @@ void ManagedLoadSaveThread::stopAllTasks()
}
}
- foreach(LoadSaveTask * task, m_todo)
+ foreach(LoadSaveTask* task, m_todo)
{
delete task;
}
diff --git a/libs/threadimageio/previewtask.cpp b/libs/threadimageio/previewtask.cpp
index 5f0c3ba..6c5e615 100644
--- a/libs/threadimageio/previewtask.cpp
+++ b/libs/threadimageio/previewtask.cpp
@@ -76,7 +76,7 @@ void PreviewLoadingTask::execute()
// Scaling a full version takes longer!
lookupKeys.push_front(m_loadingDescription.cacheKey());
- foreach (const QString& key, lookupKeys)
+ foreach(const QString& key, lookupKeys)
{
if ( (cachedImg = cache->retrieveImage(key)) )
{
diff --git a/libs/threadimageio/thumbnailloadthread.cpp \
b/libs/threadimageio/thumbnailloadthread.cpp index 56e13a6..26976d9 100644
--- a/libs/threadimageio/thumbnailloadthread.cpp
+++ b/libs/threadimageio/thumbnailloadthread.cpp
@@ -784,7 +784,7 @@ void ThumbnailLoadThread::startKdePreviewJob()
d->kdeJobHash.clear();
KUrl::List list;
- foreach (const LoadingDescription& description, d->kdeTodo)
+ foreach(const LoadingDescription& description, d->kdeTodo)
{
KUrl url = KUrl::fromPath(description.filePath);
list << url;
@@ -1153,7 +1153,7 @@ int ThumbnailImageCatcher::enqueue()
QList<LoadingDescription> descriptions = d->thread->lastDescriptions();
QMutexLocker(&d->mutex);
- foreach (const LoadingDescription& description, descriptions)
+ foreach(const LoadingDescription& description, descriptions)
{
d->tasks << description;
}
@@ -1172,7 +1172,7 @@ QList<QImage> ThumbnailImageCatcher::waitForThumbnails()
d->state = Waiting;
// first, handle results received between request and calling this method
- foreach (const ThumbnailImageCatcherResult& result, d->intermediate)
+ foreach(const ThumbnailImageCatcherResult& result, d->intermediate)
{
d->harvest(result.description, result.image);
}
@@ -1185,7 +1185,7 @@ QList<QImage> ThumbnailImageCatcher::waitForThumbnails()
}
QList<QImage> result;
- foreach (const ThumbnailImageCatcherResult& task, d->tasks)
+ foreach(const ThumbnailImageCatcherResult& task, d->tasks)
{
result << task.image;
}
diff --git a/libs/threads/threadmanager.cpp b/libs/threads/threadmanager.cpp
index 393a81d..7ae409c 100644
--- a/libs/threads/threadmanager.cpp
+++ b/libs/threads/threadmanager.cpp
@@ -125,7 +125,7 @@ public:
todo.clear();
}
}
- foreach (const TodoPair& pair, copyTodo)
+ foreach(const TodoPair& pair, copyTodo)
{
pair.first->moveToThread(pair.second);
}
diff --git a/libs/versionmanager/versionmanager.cpp \
b/libs/versionmanager/versionmanager.cpp index c036ef9..9217adef 100644
--- a/libs/versionmanager/versionmanager.cpp
+++ b/libs/versionmanager/versionmanager.cpp
@@ -612,7 +612,7 @@ QStringList VersionFileOperation::allFilePaths() const
if (!intermediateForLoadedFile.isNull())
paths << intermediateForLoadedFile.filePath();
- foreach (const VersionFileInfo& intermediate, intermediates)
+ foreach(const VersionFileInfo& intermediate, intermediates)
{
paths << intermediate.filePath();
}
diff --git a/libs/widgets/common/dzoombar.cpp b/libs/widgets/common/dzoombar.cpp
index 56cfde3..75429df 100644
--- a/libs/widgets/common/dzoombar.cpp
+++ b/libs/widgets/common/dzoombar.cpp
@@ -133,7 +133,7 @@ DZoomBar::DZoomBar(QWidget* parent)
zoomLevels << 800.0;
zoomLevels << 1200.0;
- foreach (const double zoom, zoomLevels)
+ foreach(const double zoom, zoomLevels)
{
d->zoomCombo->addItem(QString("%1%").arg((int)zoom), QVariant(zoom));
}
diff --git a/libs/widgets/common/sidebar.cpp b/libs/widgets/common/sidebar.cpp
index 9963024..ef1187c 100644
--- a/libs/widgets/common/sidebar.cpp
+++ b/libs/widgets/common/sidebar.cpp
@@ -195,7 +195,7 @@ void Sidebar::backup()
void Sidebar::backup(const QList<QWidget*> thirdWidgetsToBackup, QList<int> *sizes)
{
sizes->clear();
- foreach (QWidget* widget, thirdWidgetsToBackup)
+ foreach(QWidget* widget, thirdWidgetsToBackup)
{
*sizes << d->splitter->size(widget);
}
@@ -494,7 +494,7 @@ SidebarSplitter::SidebarSplitter(Qt::Orientation orientation, \
QWidget* parent) SidebarSplitter::~SidebarSplitter()
{
// retreat cautiously from sidebars that live longer
- foreach (Sidebar* sidebar, d->sidebars)
+ foreach(Sidebar* sidebar, d->sidebars)
{
sidebar->d->splitter = 0;
}
@@ -597,7 +597,7 @@ void SidebarSplitter::slotSplitterMoved(int pos, int index)
if (index > 0 && sizeList.at(index-1) == 0)
{
QWidget* w = widget(index-1);
- foreach (Sidebar* sidebar, d->sidebars)
+ foreach(Sidebar* sidebar, d->sidebars)
{
if (w == sidebar->d->stack)
{
@@ -616,7 +616,7 @@ void SidebarSplitter::slotSplitterMoved(int pos, int index)
if (sizeList.at(index) == 0)
{
QWidget* w = widget(index);
- foreach (Sidebar* sidebar, d->sidebars)
+ foreach(Sidebar* sidebar, d->sidebars)
{
if (w == sidebar->d->stack)
{
diff --git a/libs/widgets/common/visibilitycontroller.cpp \
b/libs/widgets/common/visibilitycontroller.cpp index 17f075b..3ba26b2 100644
--- a/libs/widgets/common/visibilitycontroller.cpp
+++ b/libs/widgets/common/visibilitycontroller.cpp
@@ -173,7 +173,7 @@ void VisibilityController::step()
{
if (d->status == Showing)
{
- foreach (VisibilityObject* o, d->objects)
+ foreach(VisibilityObject* o, d->objects)
{
if (!o->isVisible())
{
@@ -184,7 +184,7 @@ void VisibilityController::step()
}
else if (d->status == Hiding)
{
- foreach (VisibilityObject* o, d->objects)
+ foreach(VisibilityObject* o, d->objects)
{
if (o->isVisible())
{
@@ -204,7 +204,7 @@ void VisibilityController::allSteps()
d->containerWidget->setUpdatesEnabled(false);
}
- foreach (VisibilityObject* o, d->objects)
+ foreach(VisibilityObject* o, d->objects)
{
o->setVisible(true);
}
@@ -221,7 +221,7 @@ void VisibilityController::allSteps()
d->containerWidget->setUpdatesEnabled(false);
}
- foreach (VisibilityObject* o, d->objects)
+ foreach(VisibilityObject* o, d->objects)
{
o->setVisible(false);
}
diff --git a/libs/widgets/graphicsview/graphicsdimgitem.cpp \
b/libs/widgets/graphicsview/graphicsdimgitem.cpp index 155b9fb..a72256f 100644
--- a/libs/widgets/graphicsview/graphicsdimgitem.cpp
+++ b/libs/widgets/graphicsview/graphicsdimgitem.cpp
@@ -61,7 +61,7 @@ void CachedPixmaps::setMaxCount(int count)
void CachedPixmaps::clear()
{
- foreach (const CachedPixmapKey& key, keys)
+ foreach(const CachedPixmapKey& key, keys)
{
QPixmapCache::remove(key.key);
}
diff --git a/libs/widgets/graphicsview/imagezoomsettings.cpp \
b/libs/widgets/graphicsview/imagezoomsettings.cpp index d0abdc2..26d1587 100644
--- a/libs/widgets/graphicsview/imagezoomsettings.cpp
+++ b/libs/widgets/graphicsview/imagezoomsettings.cpp
@@ -176,7 +176,7 @@ double ImageZoomSettings::snappedZoomStep(double nextZoom, const \
QSizeF& frameSi
if (currentZoom < nextZoom)
{
- foreach (double z, snapValues)
+ foreach(double z, snapValues)
{
if (lessThanLimitedPrecision(currentZoom, z) && \
lessThanLimitedPrecision(z, nextZoom)) {
@@ -186,7 +186,7 @@ double ImageZoomSettings::snappedZoomStep(double nextZoom, const \
QSizeF& frameSi }
else
{
- foreach (double z, snapValues)
+ foreach(double z, snapValues)
{
if (lessThanLimitedPrecision(z, currentZoom) && \
lessThanLimitedPrecision(nextZoom, z)) {
@@ -209,7 +209,7 @@ double ImageZoomSettings::snappedZoomFactor(double zoom, const \
QSizeF& frameSize snapValues << fitToSizeZoomFactor(frameSize);
}
- foreach (double z, snapValues)
+ foreach(double z, snapValues)
{
if (fabs(zoom - z) < 0.05)
{
diff --git a/libs/widgets/graphicsview/itemvisibilitycontroller.cpp \
b/libs/widgets/graphicsview/itemvisibilitycontroller.cpp index f308594..a0b320e \
100644
--- a/libs/widgets/graphicsview/itemvisibilitycontroller.cpp
+++ b/libs/widgets/graphicsview/itemvisibilitycontroller.cpp
@@ -227,7 +227,7 @@ void AnimationControl::clear()
animation = 0;
animationGroup = 0; // the same pointer as animation
- foreach (QObject* item, items)
+ foreach(QObject* item, items)
{
disconnect(item);
}
@@ -329,7 +329,7 @@ void AnimationControl::moveTo(AnimationControl* other, QObject* \
item)
void AnimationControl::moveAllTo(AnimationControl* other)
{
- foreach (QObject* item, items)
+ foreach(QObject* item, items)
{
moveTo(other, item);
}
@@ -359,7 +359,7 @@ bool \
AnimationControl::hasVisibleItems(ItemVisibilityController::IncludeFadingOu
void AnimationControl::setVisibleProperty(bool value)
{
- foreach (QObject* o, items)
+ foreach(QObject* o, items)
{
o->setProperty("visible", value);
}
@@ -519,7 +519,7 @@ public:
AnimationControl* ItemVisibilityController::ItemVisibilityControllerPriv::findInChildren(QObject* \
item) const {
- foreach (AnimationControl* child, childControls)
+ foreach(AnimationControl* child, childControls)
{
if (child->hasItem(item))
{
@@ -565,7 +565,7 @@ void \
ItemVisibilityController::ItemVisibilityControllerPriv::cleanupChildren(QAb }
else if (child->animation == finishedAnimation && child->situation == \
AnimationControl::RemovingControl) {
- foreach (QObject* item, child->items)
+ foreach(QObject* item, child->items)
{
emit q->hiddenAndRemoved(item);
}
@@ -589,7 +589,7 @@ void \
ItemVisibilityController::ItemVisibilityControllerPriv::setVisible(bool \
v,
control->transitionToVisible(shallBeShown && visible, immediately);
}
- foreach (AnimationControl* child, childControls)
+ foreach(AnimationControl* child, childControls)
{
if (child->situation == AnimationControl::IndependentControl)
{
@@ -690,7 +690,7 @@ void ItemVisibilityController::clear()
d->control->clear();
}
- foreach (AnimationControl* child, d->childControls)
+ foreach(AnimationControl* child, d->childControls)
{
child->clear();
}
@@ -708,7 +708,7 @@ QList<QObject*> ItemVisibilityController::items() const
items = d->control->items;
}
- foreach (AnimationControl* child, d->childControls)
+ foreach(AnimationControl* child, d->childControls)
{
items += child->items;
}
@@ -724,7 +724,7 @@ QList<QObject*> \
ItemVisibilityController::visibleItems(IncludeFadingOutMode mode items = \
d->control->items; }
- foreach (AnimationControl* child, d->childControls)
+ foreach(AnimationControl* child, d->childControls)
{
if (child->hasVisibleItems(mode))
{
@@ -756,7 +756,7 @@ bool \
ItemVisibilityController::hasVisibleItems(IncludeFadingOutMode mode) const return \
true; }
- foreach (AnimationControl* child, d->childControls)
+ foreach(AnimationControl* child, d->childControls)
{
if (child->hasVisibleItems(mode))
{
@@ -775,7 +775,7 @@ void ItemVisibilityController::setEasingCurve(const QEasingCurve& \
easing) d->control->setEasingCurve(easing);
}
- foreach (AnimationControl* child, d->childControls)
+ foreach(AnimationControl* child, d->childControls)
{
child->setEasingCurve(easing);
}
@@ -790,7 +790,7 @@ void ItemVisibilityController::setAnimationDuration(int msecs)
d->control->setAnimationDuration(msecs);
}
- foreach (AnimationControl* child, d->childControls)
+ foreach(AnimationControl* child, d->childControls)
{
child->setAnimationDuration(msecs);
}
@@ -884,12 +884,12 @@ void ItemVisibilityController::animationFinished()
emit propertiesAssigned(d->control->state == Visible);
}
- foreach (AnimationControl* child, d->childControls)
+ foreach(AnimationControl* child, d->childControls)
{
if (child->animation == animation)
{
child->animationFinished();
- foreach (QObject* item, child->items)
+ foreach(QObject* item, child->items)
{
emit propertiesAssigned(item, d->control->state == Visible);
}
diff --git a/libs/widgets/graphicsview/regionframeitem.cpp \
b/libs/widgets/graphicsview/regionframeitem.cpp index 13dd15a..c4fe767 100644
--- a/libs/widgets/graphicsview/regionframeitem.cpp
+++ b/libs/widgets/graphicsview/regionframeitem.cpp
@@ -189,7 +189,7 @@ CropHandle RegionFrameItem::RegionFrameItemPriv::handleAt(const \
QPointF& pos) co {
if (flags & ShowResizeHandles)
{
- foreach (const CropHandle& handle, cropHandleList)
+ foreach(const CropHandle& handle, cropHandleList)
{
QRectF rect = handleRect(handle);
@@ -548,7 +548,7 @@ void RegionFrameItem::paint(QPainter* painter, const \
QStyleOptionGraphicsItem*, static const QColor outerColor = QColor::fromHsvF(0, 0, \
0, 0.5);
QRegion outerRegion = QRegion(imageRect) - QRegion(rect);
- foreach (const QRect& outerRect, outerRegion.rects())
+ foreach(const QRect& outerRect, outerRegion.rects())
{
painter->fillRect(outerRect, outerColor);
}
@@ -570,7 +570,7 @@ void RegionFrameItem::paint(QPainter* painter, const \
QStyleOptionGraphicsItem*, {
painter->setOpacity(d->resizeHandleVisibility->opacity());
painter->setBrush(fillColor);
- foreach (const CropHandle& handle, d->cropHandleList)
+ foreach(const CropHandle& handle, d->cropHandleList)
{
QRectF rect = d->handleRect(handle);
painter->drawRect(rect);
diff --git a/libs/widgets/iccprofiles/iccprofilescombobox.cpp \
b/libs/widgets/iccprofiles/iccprofilescombobox.cpp index a488a22..d9e8938 100644
--- a/libs/widgets/iccprofiles/iccprofilescombobox.cpp
+++ b/libs/widgets/iccprofiles/iccprofilescombobox.cpp
@@ -84,7 +84,7 @@ static void formatProfiles(const QList<IccProfile>& givenProfiles, \
QList<IccProf {
QList<IccProfile> profiles;
QSet<QString> filePaths;
- foreach (IccProfile profile, givenProfiles) // krazy:exclude=foreach
+ foreach(IccProfile profile, givenProfiles) // krazy:exclude=foreach
{
QString filePath = profile.filePath();
@@ -97,7 +97,7 @@ static void formatProfiles(const QList<IccProfile>& givenProfiles, \
QList<IccProf
qSort(profiles.begin(), profiles.end(), iccProfileLessThan);
- foreach (IccProfile profile, profiles) // krazy:exclude=foreach
+ foreach(IccProfile profile, profiles) // krazy:exclude=foreach
{
QString description = profileUserString(profile);
diff --git a/libs/widgets/itemview/dcategorizedview.cpp \
b/libs/widgets/itemview/dcategorizedview.cpp index 80d4242..559c668 100644
--- a/libs/widgets/itemview/dcategorizedview.cpp
+++ b/libs/widgets/itemview/dcategorizedview.cpp
@@ -287,7 +287,7 @@ void DCategorizedView::setSelectedIndexes(const \
QList<QModelIndex>& indexes)
QItemSelection mySelection;
- foreach (const QModelIndex& index, indexes)
+ foreach(const QModelIndex& index, indexes)
{
mySelection.select(index, index);
}
@@ -891,7 +891,7 @@ void DCategorizedView::keyPressEvent(QKeyEvent* event)
if (trigger)
{
const QModelIndexList indexList = selModel->selectedIndexes();
- foreach (const QModelIndex& index, indexList)
+ foreach(const QModelIndex& index, indexList)
{
emit itemTriggered(itemForIndex(index));
}
diff --git a/libs/widgets/itemview/digikamkcategorizedview.cpp \
b/libs/widgets/itemview/digikamkcategorizedview.cpp index 62049a9..58a6b02 100644
--- a/libs/widgets/itemview/digikamkcategorizedview.cpp
+++ b/libs/widgets/itemview/digikamkcategorizedview.cpp
@@ -230,7 +230,7 @@ QRect \
DigikamKCategorizedView::Private::visualRectInViewport(const \
QModelIndex&
row = elementsInfo[index.row()].relativeOffsetToCategory / \
elementsPerRow; }
- foreach (const QString& category, categories)
+ foreach(const QString& category, categories)
{
if (category == curCategory)
{
@@ -335,7 +335,7 @@ QRect \
DigikamKCategorizedView::Private::visualCategoryRectInViewport(const QStri \
elementsPerRow = 1; }
- foreach (const QString& itCategory, categories)
+ foreach(const QString& itCategory, categories)
{
if (itCategory == category)
{
@@ -510,7 +510,7 @@ void DigikamKCategorizedView::Private::drawDraggedItems(QPainter* \
painter) {
QStyleOptionViewItemV4 option = listView->viewOptions();
option.state &= ~QStyle::State_MouseOver;
- foreach (const QModelIndex& index, \
listView->selectionModel()->selectedIndexes()) + foreach(const QModelIndex& index, \
listView->selectionModel()->selectedIndexes()) {
const int dx = mousePosition.x() - initialPressPosition.x() + \
listView->horizontalOffset();
const int dy = mousePosition.y() - initialPressPosition.y() + \
listView->verticalOffset(); @@ -529,7 +529,7 @@ void \
DigikamKCategorizedView::Private::drawDraggedItems() QRect rectToUpdate;
QRect currentRect;
- foreach (const QModelIndex& index, \
listView->selectionModel()->selectedIndexes()) + foreach(const QModelIndex& index, \
listView->selectionModel()->selectedIndexes()) {
int dx = mousePosition.x() - initialPressPosition.x() + \
listView->horizontalOffset();
int dy = mousePosition.y() - initialPressPosition.y() + \
listView->verticalOffset(); @@ -649,7 +649,7 @@ QModelIndex \
DigikamKCategorizedView::categoryAt(const QPoint& point) const
// We traverse the categories and find the first where point.y() is below the \
visualRect int y = 0, lastY = 0;
QString lastCategory;
- foreach (const QString& category, d->categories)
+ foreach(const QString& category, d->categories)
{
y = d->categoryVisualRect(category).top();
@@ -811,7 +811,7 @@ void DigikamKCategorizedView::paintEvent(QPaintEvent* event)
alternate = dirtyIndexes[0].row() % 2;
}
- foreach (const QModelIndex& index, dirtyIndexes)
+ foreach(const QModelIndex& index, dirtyIndexes)
{
if (alternatingRows && alternate)
{
@@ -875,7 +875,7 @@ void DigikamKCategorizedView::paintEvent(QPaintEvent* event)
QStyleOptionViewItemV4 otherOption;
bool intersectedInThePast = false;
- foreach (const QString& category, d->categories)
+ foreach(const QString& category, d->categories)
{
otherOption = option;
otherOption.rect = d->categoryVisualRect(category);
@@ -1245,7 +1245,7 @@ void DigikamKCategorizedView::mouseMoveEvent(QMouseEvent* \
event) d->hoveredCategory.clear();
// Redraw categories
- foreach (const QString& category, d->categories)
+ foreach(const QString& category, d->categories)
{
if (d->categoryVisualRect(category).intersects(QRect(event->pos(), \
event->pos()))) {
@@ -1335,7 +1335,7 @@ void DigikamKCategorizedView::mouseReleaseEvent(QMouseEvent* \
event)
if ((selectionMode() != SingleSelection) && (selectionMode() != NoSelection) &&
(initialPressPosition == d->initialPressPosition))
{
- foreach (const QString& category, d->categories)
+ foreach(const QString& category, d->categories)
{
if (d->categoryVisualRect(category).contains(event->pos()) &&
selectionModel())
@@ -1343,7 +1343,7 @@ void DigikamKCategorizedView::mouseReleaseEvent(QMouseEvent* \
event)
QItemSelection selection = selectionModel()->selection();
const QVector<int> &indexList = d->categoriesIndexes[category];
- foreach (int row, indexList)
+ foreach(int row, indexList)
{
QModelIndex selectIndex = d->proxyModel->index(row, 0);
@@ -1524,7 +1524,7 @@ QModelIndex DigikamKCategorizedView::moveCursor(CursorAction \
cursorAction, QString afterCategory = d->categories.first();
bool hasToBreak = false;
- foreach (const QString& category, d->categories)
+ foreach(const QString& category, d->categories)
{
if (hasToBreak)
{
diff --git a/libs/widgets/itemview/imagedelegateoverlay.cpp \
b/libs/widgets/itemview/imagedelegateoverlay.cpp index 9d29db8..c575891 100644
--- a/libs/widgets/itemview/imagedelegateoverlay.cpp
+++ b/libs/widgets/itemview/imagedelegateoverlay.cpp
@@ -162,7 +162,7 @@ int ImageDelegateOverlay::numberOfAffectedIndexes(const \
QModelIndex& index) cons
// scales better than selectedIndexes().count()
int count = 0;
- foreach (const QItemSelectionRange& range, \
view()->selectionModel()->selection()) + foreach(const QItemSelectionRange& range, \
view()->selectionModel()->selection()) {
count += range.height();
}
@@ -697,7 +697,7 @@ void \
ImageDelegateOverlayContainer::removeOverlay(ImageDelegateOverlay* overlay)
void ImageDelegateOverlayContainer::setAllOverlaysActive(bool active)
{
- foreach (ImageDelegateOverlay* overlay, m_overlays)
+ foreach(ImageDelegateOverlay* overlay, m_overlays)
{
overlay->setActive(active);
}
@@ -705,7 +705,7 @@ void ImageDelegateOverlayContainer::setAllOverlaysActive(bool \
active)
void ImageDelegateOverlayContainer::setViewOnAllOverlays(QAbstractItemView* view)
{
- foreach (ImageDelegateOverlay* overlay, m_overlays)
+ foreach(ImageDelegateOverlay* overlay, m_overlays)
{
overlay->setView(view);
}
@@ -713,7 +713,7 @@ void \
ImageDelegateOverlayContainer::setViewOnAllOverlays(QAbstractItemView* view
void ImageDelegateOverlayContainer::removeAllOverlays()
{
- foreach (ImageDelegateOverlay* overlay, m_overlays)
+ foreach(ImageDelegateOverlay* overlay, m_overlays)
{
overlay->setActive(false);
overlay->setDelegate(0);
@@ -733,7 +733,7 @@ void ImageDelegateOverlayContainer::overlayDestroyed(QObject* o)
void ImageDelegateOverlayContainer::mouseMoved(QMouseEvent* e, const QRect& \
visualRect, const QModelIndex& index) {
- foreach (ImageDelegateOverlay* overlay, m_overlays)
+ foreach(ImageDelegateOverlay* overlay, m_overlays)
{
overlay->mouseMoved(e, visualRect, index);
}
@@ -742,7 +742,7 @@ void ImageDelegateOverlayContainer::mouseMoved(QMouseEvent* e, \
const QRect& visu void ImageDelegateOverlayContainer::drawOverlays(QPainter* p, \
const QStyleOptionViewItem& option,
const QModelIndex& index) const
{
- foreach (ImageDelegateOverlay* overlay, m_overlays)
+ foreach(ImageDelegateOverlay* overlay, m_overlays)
{
overlay->paint(p, option, index);
}
diff --git a/libs/widgets/metadata/metadatalistview.cpp \
b/libs/widgets/metadata/metadatalistview.cpp index 70d7a1e..7c84a03 100644
--- a/libs/widgets/metadata/metadatalistview.cpp
+++ b/libs/widgets/metadata/metadatalistview.cpp
@@ -303,7 +303,7 @@ void MetadataListView::setIfdList(const DMetadata::MetaDataMap& \
ifds, const QStr // Add not found tags from filter as grey items.
if (!filters.isEmpty() && filters.at(0) != QString("FULL") && \
filters.at(0).contains(".")) {
- foreach (const QString& key, filters)
+ foreach(const QString& key, filters)
{
MdKeyListViewItem* pitem = findMdKeyItem(key);
diff --git a/tests/albummodeltest.cpp b/tests/albummodeltest.cpp
index c0e4bdd..0887367 100644
--- a/tests/albummodeltest.cpp
+++ b/tests/albummodeltest.cpp
@@ -200,7 +200,7 @@ void AlbumModelTest::init()
safeCreatePAlbum(palbumRoot1, sameName, palbumChild0Root1);
kDebug() << "AlbumManager now knows these PAlbums:";
- foreach (Album* a, AlbumManager::instance()->allPAlbums())
+ foreach(Album* a, AlbumManager::instance()->allPAlbums())
{
kDebug() << "\t" << a->title();
}
@@ -231,7 +231,7 @@ void AlbumModelTest::init()
kDebug() << "copying images " << imageFiles << " to "
<< palbumChild0Root0->fileUrl();
- foreach (const QString& imageFile, imageFiles)
+ foreach(const QString& imageFile, imageFiles)
{
QString src = IMAGE_PATH + '/' + imageFile;
QString dst = palbumChild0Root0->fileUrl().toLocalFile() + '/' + imageFile;
@@ -254,7 +254,7 @@ void AlbumModelTest::init()
DAlbum* rootFromAlbumManager = AlbumManager::instance()->findDAlbum(0);
QVERIFY(rootFromAlbumManager);
DAlbum* rootFromList = 0;
- foreach (Album* album, AlbumManager::instance()->allDAlbums())
+ foreach(Album* album, AlbumManager::instance()->allDAlbums())
{
DAlbum* dAlbum = dynamic_cast<DAlbum*> (album);
QVERIFY(dAlbum);
@@ -505,7 +505,7 @@ void AlbumModelTest::testDAlbumContainsAlbums()
QVERIFY(albumModel->rootAlbum());
- foreach (Album* album, AlbumManager::instance()->allDAlbums())
+ foreach(Album* album, AlbumManager::instance()->allDAlbums())
{
DAlbum* dAlbum = dynamic_cast<DAlbum*> (album);
diff --git a/tests/cameranamehelpertest.cpp b/tests/cameranamehelpertest.cpp
index 9780e44..6fab316 100644
--- a/tests/cameranamehelpertest.cpp
+++ b/tests/cameranamehelpertest.cpp
@@ -84,7 +84,7 @@ void CameraNameHelperTest::testCameraNameFromGPCamera()
GPCamera::getSupportedCameras(count, clist);
// test if all camera names stay intact
- foreach (const QString& camera, clist)
+ foreach(const QString& camera, clist)
{
QCOMPARE(CameraNameHelper::formattedFullCameraName(camera), \
camera.simplified()); }
diff --git a/tests/dimagefilteractiontest.cpp b/tests/dimagefilteractiontest.cpp
index d2584c7..9a8bc68 100644
--- a/tests/dimagefilteractiontest.cpp
+++ b/tests/dimagefilteractiontest.cpp
@@ -79,7 +79,7 @@ void DImageFilterActionTest::testActions()
DImg original(imagePath() + originalImage());
QVERIFY(!original.isNull());
- foreach (const QString& fileName, files)
+ foreach(const QString& fileName, files)
{
DImg ref(imagePath() + fileName);
QVERIFY(!ref.isNull());
diff --git a/tests/dimagehistorygraphtest.cpp b/tests/dimagehistorygraphtest.cpp
index d928a3e..ebe4341 100644
--- a/tests/dimagehistorygraphtest.cpp
+++ b/tests/dimagehistorygraphtest.cpp
@@ -83,7 +83,7 @@ void DImageHistoryGraphTest::initTestCase()
QList<AlbumShortInfo> albums = DatabaseAccess().db()->getAlbumShortInfos();
QVERIFY(albums.size() >= 2);
- foreach (const AlbumShortInfo& album, albums)
+ foreach(const AlbumShortInfo& album, albums)
{
//qDebug() << album.relativePath << album.id;
//qDebug() << \
CollectionManager::instance()->albumRootPath(album.albumRootId); @@ -91,7 +91,7 @@ \
void DImageHistoryGraphTest::initTestCase()
readOnlyImages << DatabaseAccess().db()->getItemURLsInAlbum(album.id);
}
- foreach (const QString& file, readOnlyImages)
+ foreach(const QString& file, readOnlyImages)
{
ids << ImageInfo(file).id();
}
@@ -119,7 +119,7 @@ template <typename from, typename to>
QList<to> mapList(const QList<from>& l, const QMap<from,to> map)
{
QList<to> r;
- foreach (const from& f, l)
+ foreach(const from& f, l)
{
r << map.value(f);
}
@@ -414,7 +414,7 @@ void DImageHistoryGraphTest::testGraph()
QMap<qlonglong,HistoryGraph::Vertex> idToVertex;
QMap<HistoryGraph::Vertex, qlonglong> vertexToId;
- foreach (const HistoryGraph::Vertex& v, graph.data().vertices())
+ foreach(const HistoryGraph::Vertex& v, graph.data().vertices())
{
HistoryVertexProperties props = graph.data().properties(v);
idToVertex[props.infos.first().id()] = v;
diff --git a/utilities/advancedrename/common/parseresults.cpp \
b/utilities/advancedrename/common/parseresults.cpp index 026bb8d..3cbb5c5 100644
--- a/utilities/advancedrename/common/parseresults.cpp
+++ b/utilities/advancedrename/common/parseresults.cpp
@@ -102,7 +102,7 @@ int ParseResults::offset(const ResultsKey& key) const
ParseResults::ResultsKey ParseResults::keyAtPosition(int pos) const
{
- foreach(const ResultsKey & key, m_results.keys())
+ foreach(const ResultsKey& key, m_results.keys())
{
if (pos == key.first)
{
@@ -121,7 +121,7 @@ bool ParseResults::hasKeyAtPosition(int pos) const
ParseResults::ResultsKey ParseResults::keyAtApproximatePosition(int pos) const
{
- foreach(const ResultsKey & key, m_results.keys())
+ foreach(const ResultsKey& key, m_results.keys())
{
int start = key.first;
int length = key.second;
@@ -190,7 +190,7 @@ QString ParseResults::replaceTokens(const QString& markedString) \
const
void ParseResults::debug() const
{
- foreach(const ResultsKey & key, m_results.keys())
+ foreach(const ResultsKey& key, m_results.keys())
{
QString _token = token(key);
QString _result = result(key);
diff --git a/utilities/batch/batchfacedetector.cpp \
b/utilities/batch/batchfacedetector.cpp index 0d0a69f..c0837f8 100644
--- a/utilities/batch/batchfacedetector.cpp
+++ b/utilities/batch/batchfacedetector.cpp
@@ -205,7 +205,7 @@ void BatchFaceDetector::startAlbumListing()
QMap<int, int> palbumCounts, talbumCounts;
bool hasPAlbums = false, hasTAlbums = false;
- foreach (Album* album, d->albumTodoList)
+ foreach(Album* album, d->albumTodoList)
{
if (album->type() == Album::PHYSICAL)
{
@@ -235,7 +235,7 @@ void BatchFaceDetector::startAlbumListing()
}
d->total = 0;
- foreach (Album* album, d->albumTodoList)
+ foreach(Album* album, d->albumTodoList)
{
if (album->type() == Album::PHYSICAL)
{
diff --git a/utilities/cameragui/controller/camerathumbsctrl.cpp \
b/utilities/cameragui/controller/camerathumbsctrl.cpp index d044971..ab4f110 100644
--- a/utilities/cameragui/controller/camerathumbsctrl.cpp
+++ b/utilities/cameragui/controller/camerathumbsctrl.cpp
@@ -153,7 +153,7 @@ void CameraThumbsCtrl::startKdePreviewJob()
d->kdeJobHash.clear();
KUrl::List list;
- foreach (const CamItemInfo& info, d->kdeTodo)
+ foreach(const CamItemInfo& info, d->kdeTodo)
{
KUrl url = info.url();
list << url;
diff --git a/utilities/cameragui/main/cameraui.cpp \
b/utilities/cameragui/main/cameraui.cpp index 27de3d4..267e627 100644
--- a/utilities/cameragui/main/cameraui.cpp
+++ b/utilities/cameragui/main/cameraui.cpp
@@ -836,7 +836,7 @@ void CameraUI::finishDialog()
d->statusProgressBar->progressBarMode(StatusProgressBar::TextMode,
i18n("Scanning for new files, please \
wait..."));
- foreach (const QString& folder, d->foldersToScan)
+ foreach(const QString& folder, d->foldersToScan)
{
ScanController::instance()->scheduleCollectionScan(folder);
}
@@ -1725,7 +1725,7 @@ void CameraUI::slotMarkAsDownloaded()
{
CamItemInfoList list = d->view->selectedItems();
- foreach (CamItemInfo info, list)
+ foreach(CamItemInfo info, list)
{
d->view->setDownloaded(info, CamItemInfo::DownloadedYes);
@@ -1741,7 +1741,7 @@ void CameraUI::slotToggleLock()
CamItemInfoList list = d->view->selectedItems();
int count = list.count();
- foreach (CamItemInfo info, list)
+ foreach(CamItemInfo info, list)
{
QString folder = info.folder;
QString file = info.name;
@@ -2078,7 +2078,7 @@ void CameraUI::slotToggleFullScreen()
if (d->removeFullScreenButton)
{
QList<KToolBar*> toolbars = toolBars();
- foreach (KToolBar* toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
// name is set in ui.rc XML file
if (toolbar->objectName() == "ToolBar")
@@ -2109,7 +2109,7 @@ void CameraUI::slotToggleFullScreen()
QList<KToolBar*> toolbars = toolBars();
KToolBar* mainToolbar = 0;
- foreach (KToolBar* toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
if (toolbar->objectName() == "ToolBar")
{
@@ -2150,7 +2150,7 @@ void CameraUI::slotEscapePressed()
void CameraUI::showToolBars()
{
QList<KToolBar*> toolbars = toolBars();
- foreach (KToolBar* toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
toolbar->show();
}
@@ -2159,7 +2159,7 @@ void CameraUI::showToolBars()
void CameraUI::hideToolBars()
{
QList<KToolBar*> toolbars = toolBars();
- foreach (KToolBar* toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
toolbar->hide();
}
diff --git a/utilities/cameragui/q3support/iconview.cpp \
b/utilities/cameragui/q3support/iconview.cpp index becd6e5..c417169 100644
--- a/utilities/cameragui/q3support/iconview.cpp
+++ b/utilities/cameragui/q3support/iconview.cpp
@@ -270,7 +270,7 @@ IconItem* IconView::findItem(const QPoint& pos)
{
if (c->rect.contains(pos))
{
- foreach(IconItem * item, c->items)
+ foreach(IconItem* item, c->items)
{
if (item->rect().contains(pos))
{
@@ -412,7 +412,7 @@ void IconView::clearSelection()
}
QSet<IconItem*> selItems = d->selectedItems;
- foreach(IconItem * item, selItems)
+ foreach(IconItem* item, selItems)
{
item->setSelected(false, false);
}
@@ -948,7 +948,7 @@ void IconView::viewportPaintEvent(QPaintEvent* pe)
{
if (contentsPaintRect.intersects(c->rect))
{
- foreach(IconItem * item, c->items)
+ foreach(IconItem* item, c->items)
{
if (contentsPaintRect.intersects(item->rect()))
{
@@ -958,7 +958,7 @@ void IconView::viewportPaintEvent(QPaintEvent* pe)
}
}
- foreach(IconItem * item, itemsToRepaint)
+ foreach(IconItem* item, itemsToRepaint)
{
QRect viewportRect = contentsRectToViewport(item->rect());
//painter.save();
@@ -1404,7 +1404,7 @@ void IconView::contentsMouseMoveEvent(QMouseEvent* e)
{
if (rubberUnion.intersects(c->rect))
{
- foreach(IconItem * item, c->items)
+ foreach(IconItem* item, c->items)
{
if (newArea.intersects(item->rect()))
{
@@ -2191,7 +2191,7 @@ IconItem* IconView::findFirstVisibleItem(const QRect& r, bool \
useThumbnailRect) if (c->rect.intersects(r))
{
alreadyIntersected = true;
- foreach(IconItem * item, c->items)
+ foreach(IconItem* item, c->items)
{
// if useThumbnailRect, we only check for the clickToOpenRect, which \
is the thumbnail, // otherwise, we take the whole item rect
@@ -2242,7 +2242,7 @@ IconItem* IconView::findLastVisibleItem(const QRect& r, bool \
useThumbnailRect) c if (c->rect.intersects(r))
{
alreadyIntersected = true;
- foreach(IconItem * item, c->items)
+ foreach(IconItem* item, c->items)
{
if (r.intersects(useThumbnailRect ? item->clickToOpenRect() : \
item->rect())) {
diff --git a/utilities/cameragui/views/cameranamehelper.cpp \
b/utilities/cameragui/views/cameranamehelper.cpp index 0e4317b..d00a945 100644
--- a/utilities/cameragui/views/cameranamehelper.cpp
+++ b/utilities/cameragui/views/cameranamehelper.cpp
@@ -150,7 +150,7 @@ QString CameraNameHelper::extractCameraNameToken(const QString& \
cameraName, int QStringList words = tmp.split((' '));
tmp.clear();
- foreach (const QString& word, words)
+ foreach(const QString& word, words)
{
tmp.append(word.simplified());
tmp.append(' ');
diff --git a/utilities/cameragui/widgets/filtercombo.cpp \
b/utilities/cameragui/widgets/filtercombo.cpp index 919f2fa..d3f816e 100644
--- a/utilities/cameragui/widgets/filtercombo.cpp
+++ b/utilities/cameragui/widgets/filtercombo.cpp
@@ -178,7 +178,7 @@ void FilterComboBox::fillCombo()
removeItem(0);
}
- foreach (Filter* f, d->filters)
+ foreach(Filter* f, d->filters)
{
addItem(f->name);
}
@@ -219,7 +219,7 @@ bool FilterComboBox::match(const QStringList& wildcards, const \
QString& name) {
bool match = false;
- foreach (const QString& wildcard, wildcards)
+ foreach(const QString& wildcard, wildcards)
{
match = regexp(wildcard).exactMatch(name);
//kDebug() << "**" << wildcard << name << match;
@@ -238,10 +238,10 @@ const QStringList& FilterComboBox::mimeWildcards(const QString& \
mime) {
QStringList& wc = d->mimeHash[mime];
QStringList list = mime.split(';');
- foreach (const QString& m, list)
+ foreach(const QString& m, list)
{
KMimeType::Ptr mime = KMimeType::mimeType(m);
- foreach (const QString& pattern, mime->patterns())
+ foreach(const QString& pattern, mime->patterns())
{
wc.append(pattern);
}
diff --git a/utilities/cameragui/widgets/freespacewidget.cpp \
b/utilities/cameragui/widgets/freespacewidget.cpp index be939f0..fa93eda 100644
--- a/utilities/cameragui/widgets/freespacewidget.cpp
+++ b/utilities/cameragui/widgets/freespacewidget.cpp
@@ -196,7 +196,7 @@ void FreeSpaceWidget::addInformation(unsigned long kBSize,
d->kBUsed = 0;
d->kBAvail = 0;
d->isValid = false;
- foreach (const MountPointInfo& info, d->infos)
+ foreach(const MountPointInfo& info, d->infos)
{
if (info.isValid)
{
@@ -255,7 +255,7 @@ unsigned long FreeSpaceWidget::kBAvail(const QString& path) const
int mountPointMatch = 0;
MountPointInfo selectedInfo;
- foreach (const MountPointInfo& info, d->infos)
+ foreach(const MountPointInfo& info, d->infos)
{
if (info.isValid && !info.mountPoint.isEmpty() && \
path.startsWith(info.mountPoint)) {
@@ -383,7 +383,7 @@ void FreeSpaceWidget::leaveEvent(QEvent* e)
#if KDE_IS_VERSION(4,1,68)
void FreeSpaceWidget::slotTimeout()
{
- foreach (const QString& path, d->paths)
+ foreach(const QString& path, d->paths)
{
KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(path);
@@ -402,7 +402,7 @@ void FreeSpaceWidget::slotTimeout()
{
KMountPoint::List list = KMountPoint::currentMountPoints();
- foreach (const QString& path, d->paths)
+ foreach(const QString& path, d->paths)
{
KMountPoint::Ptr mp = list.findByPath(path);
diff --git a/utilities/facedetection/facegroup.cpp \
b/utilities/facedetection/facegroup.cpp index ccb677f..4b77e5d 100644
--- a/utilities/facedetection/facegroup.cpp
+++ b/utilities/facedetection/facegroup.cpp
@@ -274,7 +274,7 @@ ImageInfo FaceGroup::info() const
QList<RegionFrameItem*> FaceGroup::items() const
{
QList<RegionFrameItem*> items;
- foreach (FaceItem* item, d->items)
+ foreach(FaceItem* item, d->items)
{
items << item;
}
@@ -394,7 +394,7 @@ RegionFrameItem* FaceGroup::closestItem(const QPointF& p, qreal* \
manhattanLength qreal minDistance = 0;
qreal minCenterDistance = 0;
- foreach (RegionFrameItem* item, d->items)
+ foreach(RegionFrameItem* item, d->items)
{
QRectF r = item->boundingRect().translated(item->pos());
qreal distance = (p - closestPointOfRect(p, r)).manhattanLength();
@@ -471,9 +471,9 @@ void FaceGroup::itemHoverMoveEvent(QGraphicsSceneHoverEvent* e)
QList<QGraphicsItem*> hotItems = d->hotItems(e->scenePos());
// this will be the one item shown by mouse over
QList<QObject*> visible = \
d->visibilityController->visibleItems(ItemVisibilityController::ExcludeFadingOut);
- foreach (QGraphicsItem* item, hotItems)
+ foreach(QGraphicsItem* item, hotItems)
{
- foreach (QObject* parent, visible)
+ foreach(QObject* parent, visible)
{
if (static_cast<QGraphicsObject*>(parent)->isAncestorOf(item))
{
@@ -607,7 +607,7 @@ void FaceGroup::load()
QList<DatabaseFace> faces = FaceTagsEditor().databaseFaces(d->info.id());
- foreach (const DatabaseFace& face, faces)
+ foreach(const DatabaseFace& face, faces)
{
d->addItem(face);
}
@@ -624,7 +624,7 @@ void FaceGroup::clear()
{
cancelAddItem();
d->visibilityController->clear();
- foreach (RegionFrameItem* item, d->items)
+ foreach(RegionFrameItem* item, d->items)
{
delete item;
}
@@ -774,7 +774,7 @@ void FaceGroup::cancelAddItem()
void FaceGroup::applyItemGeometryChanges()
{
- foreach (FaceItem* item, d->items)
+ foreach(FaceItem* item, d->items)
{
if (item->face().isNull())
{
diff --git a/utilities/facedetection/faceiface.cpp \
b/utilities/facedetection/faceiface.cpp index 902f6d2..b95528e 100644
--- a/utilities/facedetection/faceiface.cpp
+++ b/utilities/facedetection/faceiface.cpp
@@ -110,7 +110,7 @@ QList<KFaceIface::Face> \
FaceIface::unconfirmedFacesFromTags(qlonglong imageId) c QList<KFaceIface::Face> \
FaceIface::toFaces(const QList<DatabaseFace>& databaseFaces) const {
QList<KFaceIface::Face> faceList;
- foreach (const DatabaseFace& databaseFace, databaseFaces)
+ foreach(const DatabaseFace& databaseFace, databaseFaces)
{
QRect rect = databaseFace.region().toRect();
@@ -137,7 +137,7 @@ QList<DatabaseFace> FaceIface::toDatabaseFaces(const DImg& image, \
qlonglong imag
const QList<KFaceIface::Face>& faceList) const
{
QList<DatabaseFace> faces;
- foreach (const KFaceIface::Face& face, faceList)
+ foreach(const KFaceIface::Face& face, faceList)
{
// We'll get the unknownPersonTagId if face.name() is null
int tagId = FaceTags::tagForFaceName(face.name());
@@ -185,7 +185,7 @@ void FaceIface::fillImageInFace(const DImg& image, \
KFaceIface::Face& face, const void \
FaceIface::fillImageInFaces(ThumbnailImageCatcher* catcher, const \
QString& filePath,
QList<KFaceIface::Face>& faces, const QSize& \
scaleSize) const {
- foreach (const KFaceIface::Face& face, faces)
+ foreach(const KFaceIface::Face& face, faces)
{
QRect rect = face.toRect();
@@ -226,14 +226,14 @@ KFaceIface::Image FaceIface::toImage(const DImg& image)
void FaceIface::storeThumbnails(ThumbnailLoadThread* thread, const QString& \
filePath,
const QList<DatabaseFace>& databaseFaces, const \
DImg& image) {
- foreach (const DatabaseFace& face, databaseFaces)
+ foreach(const DatabaseFace& face, databaseFaces)
{
QList<QRect> rects;
rects << face.region().toRect();
const int margin = faceRectDisplayMargin();
rects << face.region().toRect().adjusted(-margin, -margin, margin, margin);
- foreach (const QRect& rect, rects)
+ foreach(const QRect& rect, rects)
{
QRect mapped = TagRegion::mapFromOriginalSize(image, rect);
QImage detail = image.copyQImage(mapped);
@@ -264,7 +264,7 @@ QList<DatabaseFace> FaceIface::writeUnconfirmedResults(const \
DImg& image, qlongl DatabaseFace& newFace = newFaces[i];
QList<DatabaseFace> overlappingEntries;
- foreach (const DatabaseFace& oldFace, currentFaces)
+ foreach(const DatabaseFace& oldFace, currentFaces)
{
double minOverlap = oldFace.isConfirmedName() ? 0.25 : 0.5;
diff --git a/utilities/facedetection/facepipeline.cpp \
b/utilities/facedetection/facepipeline.cpp index 0e542cc..9dd39fa 100644
--- a/utilities/facedetection/facepipeline.cpp
+++ b/utilities/facedetection/facepipeline.cpp
@@ -64,7 +64,7 @@ FacePipelineDatabaseFaceList::FacePipelineDatabaseFaceList(const \
QList<DatabaseF
FacePipelineDatabaseFaceList& FacePipelineDatabaseFaceList::operator=(const \
QList<DatabaseFace>& faces) {
- foreach (const DatabaseFace& face, faces)
+ foreach(const DatabaseFace& face, faces)
{
operator<<(face);
}
@@ -153,7 +153,7 @@ ParallelPipes::ParallelPipes()
ParallelPipes::~ParallelPipes()
{
- foreach (WorkerObject* object, m_workers)
+ foreach(WorkerObject* object, m_workers)
{
delete object;
}
@@ -161,7 +161,7 @@ ParallelPipes::~ParallelPipes()
void ParallelPipes::schedule()
{
- foreach (WorkerObject* object, m_workers)
+ foreach(WorkerObject* object, m_workers)
{
object->schedule();
}
@@ -169,7 +169,7 @@ void ParallelPipes::schedule()
void ParallelPipes::deactivate(WorkerObject::DeactivatingMode mode)
{
- foreach (WorkerObject* object, m_workers)
+ foreach(WorkerObject* object, m_workers)
{
object->deactivate(mode);
}
@@ -177,7 +177,7 @@ void ParallelPipes::deactivate(WorkerObject::DeactivatingMode \
mode)
void ParallelPipes::setPriority(QThread::Priority priority)
{
- foreach (WorkerObject* object, m_workers)
+ foreach(WorkerObject* object, m_workers)
{
object->setPriority(priority);
}
@@ -323,7 +323,7 @@ void ScanStateFilter::run()
{
QList<FacePipelineExtendedPackage::Ptr> send;
QList<ImageInfo> skip;
- foreach (const ImageInfo& info, todo)
+ foreach(const ImageInfo& info, todo)
{
FacePipelineExtendedPackage::Ptr package = filter(info);
@@ -668,13 +668,13 @@ void Benchmarker::process(FacePipelineExtendedPackage::Ptr \
package) faces += trueFaces;
totalPixels += package->detectionImage.originalSize().width() * \
package->detectionImage.originalSize().height();
- foreach (const DatabaseFace& trueFace, groundTruth)
+ foreach(const DatabaseFace& trueFace, groundTruth)
{
++faces;
QRect rect = trueFace.region().toRect();
facePixels += rect.width() * rect.height();
- foreach (const DatabaseFace& testedFace, testedFaces)
+ foreach(const DatabaseFace& testedFace, testedFaces)
{
if (trueFace.region().intersects(testedFace.region(), minOverlap))
{
@@ -684,9 +684,9 @@ void Benchmarker::process(FacePipelineExtendedPackage::Ptr \
package) }
}
}
- foreach (const DatabaseFace& testedFace, testedFaces)
+ foreach(const DatabaseFace& testedFace, testedFaces)
{
- foreach (const DatabaseFace& trueFace, groundTruth)
+ foreach(const DatabaseFace& trueFace, groundTruth)
{
if (trueFace.region().intersects(testedFace.region(), minOverlap))
{
@@ -802,7 +802,7 @@ void Trainer::process(FacePipelineExtendedPackage::Ptr package)
//kDebug() << "Trainer: processing one package";
// Get a list of faces with type FaceForTraining (probably type is \
ConfirmedFace) QList<DatabaseFace> toTrain;
- foreach (const FacePipelineDatabaseFace& face, package->databaseFaces)
+ foreach(const FacePipelineDatabaseFace& face, package->databaseFaces)
{
if (face.roles & FacePipelineDatabaseFace::ForTraining)
{
@@ -894,7 +894,7 @@ void FacePipeline::FacePipelinePriv::processBatch(const \
QList<ImageInfo>& infos) }
else
{
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
send(buildPackage(info));
}
@@ -905,7 +905,7 @@ void FacePipeline::FacePipelinePriv::processBatch(const \
QList<ImageInfo>& infos) void FacePipeline::FacePipelinePriv::sendFromFilter(const \
QList<FacePipelineExtendedPackage::Ptr>& packages) {
infosForFiltering -= packages.size();
- foreach (const FacePipelineExtendedPackage::Ptr& package, packages)
+ foreach(const FacePipelineExtendedPackage::Ptr& package, packages)
{
send(package);
}
@@ -1034,7 +1034,7 @@ void FacePipeline::FacePipelinePriv::start()
WorkerObject* workerObject;
ParallelPipes* pipes;
- foreach (QObject* element, pipeline)
+ foreach(QObject* element, pipeline)
{
if ( (workerObject = qobject_cast<WorkerObject*>(element)) )
{
@@ -1066,7 +1066,7 @@ void FacePipeline::FacePipelinePriv::stop()
ParallelPipes* pipes = 0;
DynamicThread* thread = 0;
- foreach (QObject* element, pipeline)
+ foreach(QObject* element, pipeline)
{
if ( (workerObject = qobject_cast<WorkerObject*>(element)) )
{
@@ -1089,7 +1089,7 @@ void FacePipeline::FacePipelinePriv::applyPriority()
{
WorkerObject* workerObject;
ParallelPipes* pipes;
- foreach (QObject* element, pipeline)
+ foreach(QObject* element, pipeline)
{
if ( (workerObject = qobject_cast<WorkerObject*>(element)) )
{
diff --git a/utilities/fuzzysearch/findduplicatesview.cpp \
b/utilities/fuzzysearch/findduplicatesview.cpp index 786875e..0a92f2b 100644
--- a/utilities/fuzzysearch/findduplicatesview.cpp
+++ b/utilities/fuzzysearch/findduplicatesview.cpp
@@ -442,11 +442,11 @@ void FindDuplicatesView::slotFindDuplicates()
QStringList albumsIdList;
QStringList tagsIdList;
- foreach(const Album * album, d->albumModel->checkedAlbums())
+ foreach(const Album* album, d->albumModel->checkedAlbums())
{
albumsIdList << QString::number(album->id());
}
- foreach(const Album * album, d->tagModel->checkedAlbums())
+ foreach(const Album* album, d->tagModel->checkedAlbums())
{
tagsIdList << QString::number(album->id());
}
diff --git a/utilities/gpssearch/gpsmarkertiler.cpp \
b/utilities/gpssearch/gpsmarkertiler.cpp index 49e374e..718e551 100644
--- a/utilities/gpssearch/gpsmarkertiler.cpp
+++ b/utilities/gpssearch/gpsmarkertiler.cpp
@@ -658,7 +658,7 @@ void GPSMarkerTiler::slotImageChange(const ImageChangeset& \
changeset) return;
}
- foreach (const qlonglong& id, changeset.ids())
+ foreach(const qlonglong& id, changeset.ids())
{
const ImageInfo newImageInfo(id);
diff --git a/utilities/imageeditor/canvas/imagepluginloader.cpp \
b/utilities/imageeditor/canvas/imagepluginloader.cpp index 80b65eb..92469e3 100644
--- a/utilities/imageeditor/canvas/imagepluginloader.cpp
+++ b/utilities/imageeditor/canvas/imagepluginloader.cpp
@@ -128,7 +128,7 @@ ImagePluginLoader::ImagePluginLoader(QObject* parent, \
SplashScreen* splash) QStringList imagePluginsList2Load;
const KService::List offers = \
KServiceTypeTrader::self()->query("Digikam/ImagePlugin");
- foreach (const KService::Ptr& service, offers)
+ foreach(const KService::Ptr& service, offers)
{
if (service)
{
@@ -136,7 +136,7 @@ ImagePluginLoader::ImagePluginLoader(QObject* parent, \
SplashScreen* splash) }
}
- foreach (const KService::Ptr& service, d->pluginServiceMap)
+ foreach(const KService::Ptr& service, d->pluginServiceMap)
{
if (!d->obsoleteImagePluginsList.contains(service->library()))
{
@@ -169,7 +169,7 @@ void ImagePluginLoader::loadPluginsFromList(const QStringList& \
pluginsToLoad)
int cpt = 0;
- foreach (const QString& name, pluginsToLoad)
+ foreach(const QString& name, pluginsToLoad)
{
KService::Ptr service = d->pluginServiceMap.value(name);
ImagePlugin* plugin;
@@ -226,7 +226,7 @@ ImagePlugin* ImagePluginLoader::pluginIsLoaded(const QString& \
name) const
ImagePlugin* ImagePluginLoader::pluginInstance(const QString& libraryName) const
{
- foreach (const KService::Ptr& service, d->pluginServiceMap)
+ foreach(const KService::Ptr& service, d->pluginServiceMap)
{
if (service->library() == libraryName)
{
@@ -239,7 +239,7 @@ ImagePlugin* ImagePluginLoader::pluginInstance(const QString& \
libraryName) const
bool ImagePluginLoader::pluginLibraryIsLoaded(const QString& libraryName) const
{
- foreach (const KService::Ptr& service, d->pluginServiceMap)
+ foreach(const KService::Ptr& service, d->pluginServiceMap)
{
if (service->library() == libraryName)
{
diff --git a/utilities/imageeditor/canvas/undocache.cpp \
b/utilities/imageeditor/canvas/undocache.cpp index c3e3068..6c6a90c 100644
--- a/utilities/imageeditor/canvas/undocache.cpp
+++ b/utilities/imageeditor/canvas/undocache.cpp
@@ -72,7 +72,7 @@ UndoCache::UndoCache()
// remove any remnants
QDir dir(cacheDir);
- foreach (const QFileInfo& info, dir.entryInfoList(QStringList() << \
(d->cachePrefix + '*'))) + foreach(const QFileInfo& info, \
dir.entryInfoList(QStringList() << (d->cachePrefix + '*'))) {
QFile(info.filePath()).remove();
}
@@ -86,7 +86,7 @@ UndoCache::~UndoCache()
void UndoCache::clear()
{
- foreach (int level, d->cachedLevels)
+ foreach(int level, d->cachedLevels)
{
QFile(d->cacheFile(level)).remove();
}
@@ -95,7 +95,7 @@ void UndoCache::clear()
void UndoCache::clearFrom(int fromLevel)
{
- foreach (int level, d->cachedLevels)
+ foreach(int level, d->cachedLevels)
{
if (level >= fromLevel)
{
diff --git a/utilities/imageeditor/canvas/undomanager.cpp \
b/utilities/imageeditor/canvas/undomanager.cpp index 5f296ee..f6f3943 100644
--- a/utilities/imageeditor/canvas/undomanager.cpp
+++ b/utilities/imageeditor/canvas/undomanager.cpp
@@ -525,7 +525,7 @@ int UndoManager::availableRedoSteps() const
QStringList UndoManager::getUndoHistory() const
{
QStringList titles;
- foreach (UndoAction* action, d->undoActions)
+ foreach(UndoAction* action, d->undoActions)
titles << action->getTitle();
return titles;
}
@@ -533,7 +533,7 @@ QStringList UndoManager::getUndoHistory() const
QStringList UndoManager::getRedoHistory() const
{
QStringList titles;
- foreach (UndoAction* action, d->redoActions)
+ foreach(UndoAction* action, d->redoActions)
titles.prepend(action->getTitle());
return titles;
}
diff --git a/utilities/imageeditor/editor/editorwindow.cpp \
b/utilities/imageeditor/editor/editorwindow.cpp index a5d8003..dfc2195 100644
--- a/utilities/imageeditor/editor/editorwindow.cpp
+++ b/utilities/imageeditor/editor/editorwindow.cpp
@@ -874,7 +874,7 @@ void EditorWindow::loadImagePlugins()
QList<ImagePlugin*> pluginList = m_imagePluginLoader->pluginList();
- foreach(ImagePlugin * plugin, pluginList)
+ foreach(ImagePlugin* plugin, pluginList)
{
if (plugin)
{
@@ -887,14 +887,14 @@ void EditorWindow::loadImagePlugins()
if (categoryStr != QString("__INVALID__") && !categoryStr.isEmpty())
{
KActionCategory* category = new KActionCategory(categoryStr, \
d->imagepluginsActionCollection);
- foreach(QAction * action, plugin->actionCollection()->actions())
+ foreach(QAction* action, plugin->actionCollection()->actions())
{
category->addAction(action->objectName(), action);
}
}
else
{
- foreach(QAction * action, plugin->actionCollection()->actions())
+ foreach(QAction* action, plugin->actionCollection()->actions())
{
d->imagepluginsActionCollection->addAction(action->objectName(), \
action); }
@@ -920,7 +920,7 @@ void EditorWindow::unLoadImagePlugins()
QList<ImagePlugin*> pluginList = m_imagePluginLoader->pluginList();
- foreach(ImagePlugin * plugin, pluginList)
+ foreach(ImagePlugin* plugin, pluginList)
{
if (plugin)
{
@@ -1159,7 +1159,7 @@ void EditorWindow::toggleStandardActions(bool val)
QList<ImagePlugin*> pluginList = m_imagePluginLoader->pluginList();
- foreach(ImagePlugin * plugin, pluginList)
+ foreach(ImagePlugin* plugin, pluginList)
{
if (plugin)
{
@@ -1212,7 +1212,7 @@ void EditorWindow::slotToggleFullScreen()
if (d->removeFullScreenButton)
{
QList<KToolBar*> toolbars = toolBars();
- foreach(KToolBar * toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
// name is set in ui.rc XML file
if (toolbar->objectName() == "ToolBar")
@@ -1244,7 +1244,7 @@ void EditorWindow::slotToggleFullScreen()
QList<KToolBar*> toolbars = toolBars();
KToolBar* mainToolbar = 0;
- foreach(KToolBar * toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
if (toolbar->objectName() == "ToolBar")
{
@@ -1682,7 +1682,7 @@ void EditorWindow::slotSelected(bool val)
d->copyAction->setEnabled(val);
QList<ImagePlugin*> pluginList = m_imagePluginLoader->pluginList();
- foreach(ImagePlugin * plugin, pluginList)
+ foreach(ImagePlugin* plugin, pluginList)
{
if (plugin)
{
@@ -1708,7 +1708,7 @@ void EditorWindow::slotSelected(bool val)
void EditorWindow::hideToolBars()
{
QList<KToolBar*> toolbars = toolBars();
- foreach(KToolBar * toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
toolbar->hide();
}
@@ -1717,7 +1717,7 @@ void EditorWindow::hideToolBars()
void EditorWindow::showToolBars()
{
QList<KToolBar*> toolbars = toolBars();
- foreach(KToolBar * toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
toolbar->show();
}
@@ -2209,7 +2209,7 @@ QString EditorWindow::findFilterByExtension(const QStringList& \
allFilters, const
const QString filterExtension = QString("*.%1").arg(extension.toLower());
- foreach(const QString & filter, allFilters)
+ foreach(const QString& filter, allFilters)
{
if (filter.contains(filterExtension))
diff --git a/utilities/imageeditor/editor/imagewindow.cpp \
b/utilities/imageeditor/editor/imagewindow.cpp index cc78c7f..e157dfa 100644
--- a/utilities/imageeditor/editor/imagewindow.cpp
+++ b/utilities/imageeditor/editor/imagewindow.cpp
@@ -1124,7 +1124,7 @@ void ImageWindow::saveAsIsComplete()
// copy the metadata of the original file to the new file
if (m_savingContext.executedOperation == \
SavingContextContainer::SavingStateVersion) {
- foreach (const QString& path, \
m_savingContext.versionFileOperation.allFilePaths()) + foreach(const QString& \
path, m_savingContext.versionFileOperation.allFilePaths()) {
ScanController::instance()->scanFileDirectlyCopyAttributes(path, \
d->currentImageInfo.id()); }
@@ -1502,7 +1502,7 @@ void ImageWindow::slideShow(SlideShowSettings& settings)
cnt = (float)d->imageInfoModel->rowCount();
- foreach (const ImageInfo& info, d->imageInfoModel->imageInfos())
+ foreach(const ImageInfo& info, d->imageInfoModel->imageInfos())
{
SlidePictureInfo pictInfo;
pictInfo.comment = info.comment();
@@ -1722,7 +1722,7 @@ void ImageWindow::slotOpenOriginal()
}
QList<ImageInfo> imageInfos;
- foreach (const HistoryImageId& id, originals)
+ foreach(const HistoryImageId& id, originals)
{
KUrl url;
url.addPath(id.m_filePath);
diff --git a/utilities/imageeditor/widgets/previewlist.cpp \
b/utilities/imageeditor/widgets/previewlist.cpp index ee5d70f..079509e 100644
--- a/utilities/imageeditor/widgets/previewlist.cpp
+++ b/utilities/imageeditor/widgets/previewlist.cpp
@@ -66,7 +66,7 @@ PreviewThreadWrapper::PreviewThreadWrapper(QObject* parent)
PreviewThreadWrapper::~PreviewThreadWrapper()
{
- foreach (DImgThreadedFilter* const filter, d->map.values())
+ foreach(DImgThreadedFilter* const filter, d->map.values())
{
delete filter;
}
diff --git a/utilities/imageeditor/widgets/previewtoolbar.cpp \
b/utilities/imageeditor/widgets/previewtoolbar.cpp index e8ac163..e83f336 100644
--- a/utilities/imageeditor/widgets/previewtoolbar.cpp
+++ b/utilities/imageeditor/widgets/previewtoolbar.cpp
@@ -189,7 +189,7 @@ void PreviewToolBar::setPreviewModeMask(int mask)
if (!d->previewButtons->button(mode)->isEnabled())
{
QList<QAbstractButton*> btns = d->previewButtons->buttons();
- foreach (QAbstractButton* btn, btns)
+ foreach(QAbstractButton* btn, btns)
{
if (btn && btn->isEnabled())
{
diff --git a/utilities/kipiiface/kipiimagecollectionselector.cpp \
b/utilities/kipiiface/kipiimagecollectionselector.cpp index 4853056..24d827c 100644
--- a/utilities/kipiiface/kipiimagecollectionselector.cpp
+++ b/utilities/kipiiface/kipiimagecollectionselector.cpp
@@ -104,7 +104,7 @@ public:
AbstractCheckableAlbumModel* model,
const QString& ext)
{
- foreach (Album* album, model->checkedAlbums())
+ foreach(Album* album, model->checkedAlbums())
{
if (!album)
{
diff --git a/utilities/kipiiface/kipiinterface.cpp \
b/utilities/kipiiface/kipiinterface.cpp index c1e96dd..c28e785 100644
--- a/utilities/kipiiface/kipiinterface.cpp
+++ b/utilities/kipiiface/kipiinterface.cpp
@@ -172,7 +172,7 @@ void KipiInterface::refreshImages(const KUrl::List& urls)
// Hard Refresh
QSet<QString> dirs;
QList<qlonglong> ids;
- foreach (const KUrl& url, urls)
+ foreach(const KUrl& url, urls)
{
ImageInfo info(url);
@@ -188,7 +188,7 @@ void KipiInterface::refreshImages(const KUrl::List& urls)
dirs << url.directory();
}
ScanController::instance()->hintAtModificationOfItems(ids);
- foreach (const QString& dir, dirs)
+ foreach(const QString& dir, dirs)
{
ScanController::instance()->scheduleCollectionScan(dir);
}
diff --git a/utilities/lighttable/lighttablewindow.cpp \
b/utilities/lighttable/lighttablewindow.cpp index 276ab50..9124354b 100644
--- a/utilities/lighttable/lighttablewindow.cpp
+++ b/utilities/lighttable/lighttablewindow.cpp
@@ -1453,7 +1453,7 @@ void LightTableWindow::slotToggleFullScreen()
if (d->removeFullScreenButton)
{
QList<KToolBar*> toolbars = toolBars();
- foreach (KToolBar* toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
// name is set in ui.rc XML file
if (toolbar->objectName() == "ToolBar")
@@ -1485,7 +1485,7 @@ void LightTableWindow::slotToggleFullScreen()
QList<KToolBar*> toolbars = toolBars();
KToolBar* mainToolbar = 0;
- foreach (KToolBar* toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
if (toolbar->objectName() == "ToolBar")
{
diff --git a/utilities/nepomuk/digikamnepomukservice.cpp \
b/utilities/nepomuk/digikamnepomukservice.cpp index d6f43d9..c5e952e 100644
--- a/utilities/nepomuk/digikamnepomukservice.cpp
+++ b/utilities/nepomuk/digikamnepomukservice.cpp
@@ -442,7 +442,7 @@ void NepomukService::fullSyncDigikamToNepomuk()
{
// List album root albums of all available collections recursively
QList<CollectionLocation> collections = \
CollectionManager::instance()->allAvailableLocations();
- foreach (const CollectionLocation& location, collections)
+ foreach(const CollectionLocation& location, collections)
{
DatabaseUrl url = DatabaseUrl::fromAlbumAndName(QString(), "/", \
location.albumRootPath(), location.id()); KIO::Job* job = \
ImageLister::startListJob(url); @@ -525,7 +525,7 @@ static int \
digikamToNepomukRating(int digikamRating) void NepomukService::syncToNepomuk(const \
QList<qlonglong>& imageIds, SyncToNepomukSettings syncSettings) {
QList<ImageInfo> infos;
- foreach (const qlonglong& imageid, imageIds)
+ foreach(const qlonglong& imageid, imageIds)
{
ImageInfo info(imageid);
@@ -539,7 +539,7 @@ void NepomukService::syncToNepomuk(const QList<qlonglong>& \
imageIds, SyncToNepom
void NepomukService::syncToNepomuk(const QList<ImageInfo>& infos, \
SyncToNepomukSettings syncSettings) {
- foreach (const ImageInfo& info, infos)
+ foreach(const ImageInfo& info, infos)
{
ChangingNepomuk changing(d);
@@ -620,7 +620,7 @@ static Nepomuk::Tag nepomukForDigikamTag(int tagId)
void NepomukService::syncTagsToNepomuk(const QList<qlonglong>& imageIds, const \
QList<int>& tagIds, bool addOrRemove) {
- foreach (int tagId, tagIds)
+ foreach(int tagId, tagIds)
{
ChangingNepomuk changing(d);
Nepomuk::Tag tag = nepomukForDigikamTag(tagId);
@@ -628,7 +628,7 @@ void NepomukService::syncTagsToNepomuk(const QList<qlonglong>& \
imageIds, const Q
if (tag.isValid())
{
- foreach (const qlonglong& imageId, imageIds)
+ foreach(const qlonglong& imageId, imageIds)
{
ImageInfo info(imageId);
@@ -656,13 +656,13 @@ void NepomukService::syncTagsToNepomuk(const QList<qlonglong>& \
imageIds, const Q
void NepomukService::pushTagsToNepomuk(const QList<ImageInfo>& imageInfos)
{
- foreach (const ImageInfo& info, imageInfos)
+ foreach(const ImageInfo& info, imageInfos)
{
ChangingNepomuk changing(d);
if (!info.isNull())
{
- foreach (int tagId, info.tagIds())
+ foreach(int tagId, info.tagIds())
{
Nepomuk::Tag tag = nepomukForDigikamTag(tagId);
@@ -878,7 +878,7 @@ void NepomukService::syncNepomukToDigikam()
TODO: Integrate to ImageScanner
void NepomukService::syncAddedImagesToDigikam(const QList<qlonglong> &ids)
{
- foreach (qlonglong id, ids)
+ foreach(qlonglong id, ids)
{
ImageInfo info(id);
if (info.isNull())
@@ -900,7 +900,7 @@ void NepomukService::syncAddedImagesToDigikam(const \
QList<qlonglong> &ids) }
QList<Nepomuk::Tag> tags = res.tags();
- foreach (const Nepomuk::Tag& tag, tags)
+ foreach(const Nepomuk::Tag& tag, tags)
{
int id = bestDigikamTagForTagName(info, tag.genericLabel());
if (id)
@@ -1062,7 +1062,7 @@ void NepomukService::removeTagInDigikam(const KUrl& fileUrl, \
const QUrl& tag) return;
}
- foreach (int candidate, candidates)
+ foreach(int candidate, candidates)
{
if (tags.contains(candidate))
{
@@ -1094,7 +1094,7 @@ int NepomukService::bestDigikamTagForTagName(const ImageInfo& \
info, const QStrin int currentCandidate = 0;
int currentMinimumScore = 0;
QList<int> assignedTags = info.tagIds();
- foreach (int tagId, candidates)
+ foreach(int tagId, candidates)
{
// already assigned one of the candidates?
if (assignedTags.contains(tagId))
@@ -1189,7 +1189,7 @@ DatabaseParameters NepomukService::databaseParameters() const
{
QStringList serviceNames = reply.value();
QLatin1String digikamService("org.kde.digikam-");
- foreach (const QString& service, serviceNames)
+ foreach(const QString& service, serviceNames)
{
if (service.startsWith(digikamService))
{
diff --git a/utilities/queuemanager/main/queuemgrwindow.cpp \
b/utilities/queuemanager/main/queuemgrwindow.cpp index a43986b..3916c06 100644
--- a/utilities/queuemanager/main/queuemgrwindow.cpp
+++ b/utilities/queuemanager/main/queuemgrwindow.cpp
@@ -618,7 +618,7 @@ void QueueMgrWindow::slotToggleFullScreen()
if (d->removeFullScreenButton)
{
QList<KToolBar*> toolbars = toolBars();
- foreach(KToolBar * toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
// name is set in ui.rc XML file
if (toolbar->objectName() == "ToolBar")
@@ -647,7 +647,7 @@ void QueueMgrWindow::slotToggleFullScreen()
QList<KToolBar*> toolbars = toolBars();
KToolBar* mainToolbar = 0;
- foreach(KToolBar * toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
if (toolbar->objectName() == "ToolBar")
{
@@ -686,7 +686,7 @@ void QueueMgrWindow::slotEscapePressed()
void QueueMgrWindow::showToolBars()
{
QList<KToolBar*> toolbars = toolBars();
- foreach(KToolBar * toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
toolbar->show();
}
@@ -695,7 +695,7 @@ void QueueMgrWindow::showToolBars()
void QueueMgrWindow::hideToolBars()
{
QList<KToolBar*> toolbars = toolBars();
- foreach(KToolBar * toolbar, toolbars)
+ foreach(KToolBar* toolbar, toolbars)
{
toolbar->hide();
}
@@ -808,7 +808,7 @@ void QueueMgrWindow::slotItemSelectionChanged()
void QueueMgrWindow::populateToolsList()
{
BatchToolsList list = d->batchToolsMgr->toolsList();
- foreach(BatchTool * tool, list)
+ foreach(BatchTool* tool, list)
{
d->toolsView->addTool(tool);
}
diff --git a/utilities/queuemanager/views/queuelist.cpp \
b/utilities/queuemanager/views/queuelist.cpp index 0b2b3a9..e05688d 100644
--- a/utilities/queuemanager/views/queuelist.cpp
+++ b/utilities/queuemanager/views/queuelist.cpp
@@ -1043,7 +1043,7 @@ void QueueListView::slotCollectionImageChange(const \
CollectionImageChangeset& ch case CollectionImageChangeset::Removed:
case CollectionImageChangeset::RemovedAll:
{
- foreach (const qlonglong& id, changeset.ids())
+ foreach(const qlonglong& id, changeset.ids())
{
removeItemById(id);
}
diff --git a/utilities/searchwindow/choicesearchutilities.h \
b/utilities/searchwindow/choicesearchutilities.h index 1425fda..ecc93cf 100644
--- a/utilities/searchwindow/choicesearchutilities.h
+++ b/utilities/searchwindow/choicesearchutilities.h
@@ -148,7 +148,7 @@ void ChoiceSearchModel::setChecked(const T& value, \
SearchXml::Relation relation) template <typename T>
void ChoiceSearchModel::setChecked(const QList<T>& keys, bool checked)
{
- foreach (T key, keys)
+ foreach(T key, keys)
{
setChecked(key, checked);
}
diff --git a/utilities/searchwindow/searchfieldgroup.cpp \
b/utilities/searchwindow/searchfieldgroup.cpp index 951ed70..4394e5b 100644
--- a/utilities/searchwindow/searchfieldgroup.cpp
+++ b/utilities/searchwindow/searchfieldgroup.cpp
@@ -80,7 +80,7 @@ void SearchFieldGroup::setLabel(SearchFieldGroupLabel* label)
SearchField* SearchFieldGroup::fieldForName(const QString& fieldName)
{
- foreach (SearchField* field, m_fields)
+ foreach(SearchField* field, m_fields)
{
if (field->supportsField(fieldName))
{
@@ -92,7 +92,7 @@ SearchField* SearchFieldGroup::fieldForName(const QString& \
fieldName)
void SearchFieldGroup::write(SearchXmlWriter& writer)
{
- foreach (SearchField* field, m_fields)
+ foreach(SearchField* field, m_fields)
{
field->write(writer);
}
@@ -101,7 +101,7 @@ void SearchFieldGroup::write(SearchXmlWriter& writer)
void SearchFieldGroup::reset()
{
clearMarkedFields();
- foreach (SearchField* field, m_fields)
+ foreach(SearchField* field, m_fields)
{
field->reset();
}
@@ -136,7 +136,7 @@ QList<QRect> SearchFieldGroup::areaOfMarkedFields() const
return rects;
}
- foreach (SearchField* field, m_markedFields)
+ foreach(SearchField* field, m_markedFields)
{
if (field->isVisible())
{
diff --git a/utilities/searchwindow/searchfields.cpp \
b/utilities/searchwindow/searchfields.cpp index 0367372..68b98bd 100644
--- a/utilities/searchwindow/searchfields.cpp
+++ b/utilities/searchwindow/searchfields.cpp
@@ -768,7 +768,7 @@ void SearchFieldKeyword::read(SearchXmlCachingReader& reader)
void SearchFieldKeyword::write(SearchXmlWriter& writer)
{
QStringList keywordList = KeywordSearch::split(m_edit->text());
- foreach(const QString & keyword, keywordList)
+ foreach(const QString& keyword, keywordList)
{
if (!keyword.isEmpty())
{
@@ -2125,7 +2125,7 @@ void SearchFieldAlbum::write(SearchXmlWriter& writer)
}
QList<int> albumIds;
- foreach(Album * album, checkedAlbums)
+ foreach(Album* album, checkedAlbums)
{
albumIds << album->id();
}
@@ -2619,7 +2619,7 @@ void SearchFieldLabels::write(SearchXmlWriter& writer)
if (!clAlbums.isEmpty())
{
- foreach(TAlbum * album, clAlbums)
+ foreach(TAlbum* album, clAlbums)
{
albumIds << album->id();
}
@@ -2629,7 +2629,7 @@ void SearchFieldLabels::write(SearchXmlWriter& writer)
if (!plAlbums.isEmpty())
{
- foreach(TAlbum * album, plAlbums)
+ foreach(TAlbum* album, plAlbums)
{
albumIds << album->id();
}
diff --git a/utilities/searchwindow/searchgroup.cpp \
b/utilities/searchwindow/searchgroup.cpp index 975776a..a6a4679 100644
--- a/utilities/searchwindow/searchgroup.cpp
+++ b/utilities/searchwindow/searchgroup.cpp
@@ -256,7 +256,7 @@ void SearchGroup::read(SearchXmlCachingReader& reader)
SearchField* field = 0;
SearchFieldGroup* fieldGroup = 0;
- foreach (fieldGroup, m_fieldGroups)
+ foreach(fieldGroup, m_fieldGroups)
{
if ( (field = fieldGroup->fieldForName(name)) )
{
@@ -301,7 +301,7 @@ void SearchGroup::write(SearchXmlWriter& writer)
writer.setGroupOperator(m_label->groupOperator());
writer.setDefaultFieldOperator(m_label->defaultFieldOperator());
- foreach (SearchFieldGroup* fieldGroup, m_fieldGroups)
+ foreach(SearchFieldGroup* fieldGroup, m_fieldGroups)
{
fieldGroup->write(writer);
}
@@ -314,7 +314,7 @@ void SearchGroup::write(SearchXmlWriter& writer)
void SearchGroup::reset()
{
- foreach (SearchFieldGroup* fieldGroup, m_fieldGroups)
+ foreach(SearchFieldGroup* fieldGroup, m_fieldGroups)
{
fieldGroup->reset();
}
@@ -334,7 +334,7 @@ QList<QRect> SearchGroup::startupAnimationArea() const
// from subgroups;
rects += startupAnimationAreaOfGroups();
// field groups
- foreach (SearchFieldGroup* fieldGroup, m_fieldGroups)
+ foreach(SearchFieldGroup* fieldGroup, m_fieldGroups)
{
rects += fieldGroup->areaOfMarkedFields();
}
diff --git a/utilities/searchwindow/searchview.cpp \
b/utilities/searchwindow/searchview.cpp index f7bbe7e..0eb62d0 100644
--- a/utilities/searchwindow/searchview.cpp
+++ b/utilities/searchwindow/searchview.cpp
@@ -120,7 +120,7 @@ void AbstractSearchGroupContainer::finishReadingGroups()
void AbstractSearchGroupContainer::writeGroups(SearchXmlWriter& writer)
{
- foreach (SearchGroup* group, m_groups)
+ foreach(SearchGroup* group, m_groups)
{
group->write(writer);
}
@@ -134,7 +134,7 @@ void AbstractSearchGroupContainer::removeSendingSearchGroup()
QList<QRect> AbstractSearchGroupContainer::startupAnimationAreaOfGroups() const
{
QList<QRect> list;
- foreach (SearchGroup* group, m_groups)
+ foreach(SearchGroup* group, m_groups)
{
list += group->startupAnimationArea();
}
diff --git a/utilities/setup/cameralist.cpp b/utilities/setup/cameralist.cpp
index 4633de3..811fdd1 100644
--- a/utilities/setup/cameralist.cpp
+++ b/utilities/setup/cameralist.cpp
@@ -156,7 +156,7 @@ bool CameraList::save()
QDomElement docElem = doc.documentElement();
- foreach(CameraType * ctype, d->clist)
+ foreach(CameraType* ctype, d->clist)
{
QDomElement elem = doc.createElement("item");
elem.setAttribute("title", ctype->title());
@@ -248,7 +248,7 @@ QList<CameraType*>* CameraList::cameraList()
CameraType* CameraList::find(const QString& title)
{
- foreach(CameraType * ctype, d->clist)
+ foreach(CameraType* ctype, d->clist)
{
if (ctype->title() == title)
{
@@ -275,7 +275,7 @@ CameraType* CameraList::autoDetect(bool& retry)
}
// Check if the camera is already in the list
- foreach(CameraType * ctype, d->clist)
+ foreach(CameraType* ctype, d->clist)
{
// We can get away with checking only the model, as the auto-detection
// works only for usb cameras. so the port is always usb:
diff --git a/utilities/setup/setupcamera.cpp b/utilities/setup/setupcamera.cpp
index c639cea..41e68b4 100644
--- a/utilities/setup/setupcamera.cpp
+++ b/utilities/setup/setupcamera.cpp
@@ -425,7 +425,7 @@ void SetupCamera::readSettings()
{
QList<CameraType*>* cl = clist->cameraList();
- foreach(CameraType * ctype, *cl)
+ foreach(CameraType* ctype, *cl)
{
new SetupCameraItem(d->listView, ctype);
}
@@ -461,7 +461,7 @@ void SetupCamera::readSettings()
}
FilterComboBox::defaultFilters(&d->filters);
- foreach(Filter * f, d->filters)
+ foreach(Filter* f, d->filters)
{
new QListWidgetItem(f->name, d->importListView);
}
diff --git a/utilities/setup/setupcollectionview.cpp \
b/utilities/setup/setupcollectionview.cpp index a174813..859071a 100644
--- a/utilities/setup/setupcollectionview.cpp
+++ b/utilities/setup/setupcollectionview.cpp
@@ -175,7 +175,7 @@ QSize SetupCollectionDelegate::sizeHint(const \
QStyleOptionViewItem& option, cons {
// get the largest size hint for the icon/text of all category entries
int maxStyledWidth = 0;
- foreach(const QModelIndex & catIndex, static_cast<const \
SetupCollectionModel*>(index.model())->categoryIndexes()) + foreach(const \
QModelIndex& catIndex, static_cast<const \
SetupCollectionModel*>(index.model())->categoryIndexes()) {
maxStyledWidth = qMax(maxStyledWidth, m_styledDelegate->sizeHint(option, \
catIndex).width()); }
@@ -396,7 +396,7 @@ void SetupCollectionModel::loadCollections()
m_collections.clear();
QList<CollectionLocation> locations = \
CollectionManager::instance()->allLocations();
- foreach(const CollectionLocation & location, locations)
+ foreach(const CollectionLocation& location, locations)
{
m_collections << Item(location);
}
@@ -481,7 +481,7 @@ void SetupCollectionModel::apply()
if (!failedItems.isEmpty())
{
QStringList failedPaths;
- foreach(const Item & item, failedItems)
+ foreach(const Item& item, failedItems)
{
failedPaths << item.path;
}
@@ -556,7 +556,7 @@ void SetupCollectionModel::addCollection(int category)
// Check path: First check with manager
QString messageFromManager, deviceIcon;
QList<CollectionLocation> assumeDeleted;
- foreach(const Item & item, m_collections)
+ foreach(const Item& item, m_collections)
{
if (item.deleted && !item.location.isNull())
{
@@ -573,7 +573,7 @@ void SetupCollectionModel::addCollection(int category)
&messageFromManager, \
&deviceIcon);
// If there are other added collections then CollectionManager does not know \
about them. Check here.
- foreach(const Item & item, m_collections)
+ foreach(const Item& item, m_collections)
{
if (!item.deleted && item.location.isNull())
{
@@ -959,7 +959,7 @@ int SetupCollectionModel::rowCount(const QModelIndex& parent) \
const // Level 1: item children count
int parentId = parent.row();
int rowCount = 0;
- foreach(const Item & item, m_collections)
+ foreach(const Item& item, m_collections)
{
if (!item.deleted && item.parentId == parentId)
{
diff --git a/utilities/setup/setupmime.cpp b/utilities/setup/setupmime.cpp
index c26352e..8ebe69c 100644
--- a/utilities/setup/setupmime.cpp
+++ b/utilities/setup/setupmime.cpp
@@ -265,7 +265,7 @@ void SetupMime::applySettings()
<< "png"; // PNG
QString imageFilter = d->imageFileFilterEdit->text();
- foreach(const QString & format, coreImageFormats)
+ foreach(const QString& format, coreImageFormats)
{
if (imageFilter.contains('-' + format)
|| imageFilter.contains("-*." + format))
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic