[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] core/libs: polish
From:       Maik Qualmann <null () kde ! org>
Date:       2018-05-24 16:41:13
Message-ID: E1fLtIf-0007ME-HE () code ! kde ! org
[Download RAW message or body]

Git commit 361450a27b26414a83450b4a3d1cf38e007eb717 by Maik Qualmann.
Committed on 24/05/2018 at 16:40.
Pushed by mqualmann into branch 'master'.

polish

M  +7    -4    core/libs/database/item/imagelister.cpp
M  +7    -5    core/libs/models/imagealbummodel.cpp

https://commits.kde.org/digikam/361450a27b26414a83450b4a3d1cf38e007eb717

diff --git a/core/libs/database/item/imagelister.cpp \
b/core/libs/database/item/imagelister.cpp index 93f154a8cb..b203a8c1d4 100644
--- a/core/libs/database/item/imagelister.cpp
+++ b/core/libs/database/item/imagelister.cpp
@@ -337,7 +337,7 @@ void ImageLister::listTag(ImageListerReceiver* const receiver, \
const QList<int>&  }
     }
 
-    for (QSet<ImageListerRecord>::iterator it = records.begin(); it != \
records.end(); ++it) +    for (QSet<ImageListerRecord>::iterator it = records.begin() \
; it != records.end() ; ++it)  {
         receiver->receive(*it);
     }
@@ -609,7 +609,8 @@ void ImageLister::listSearch(ImageListerReceiver* const receiver, \
const QString&  lon                      = (*it).toDouble();
         ++it;
 
-        record.currentSimilarity                 = \
SimilarityDbAccess().db()->getImageSimilarity(record.imageID, referenceImageId); +    \
record.currentSimilarity = \
SimilarityDbAccess().db()->getImageSimilarity(record.imageID, referenceImageId); +
         if (record.currentSimilarity < 0)
         {
             // Ignore nonexistence and invalid db entry.
@@ -853,7 +854,8 @@ void ImageLister::listHaarSearch(ImageListerReceiver* const \
receiver, const QStr  iface.setAlbumRootsToSearch(albumRootsToList());
         }
 
-        imageSimilarityMap = iface.bestMatchesForImageWithThreshold(id, threshold, \
maxThreshold, targetAlbums, HaarIface::DuplicatesSearchRestrictions::None, \
sketchType).second; +        imageSimilarityMap = \
iface.bestMatchesForImageWithThreshold(id, threshold, maxThreshold, targetAlbums, +   \
HaarIface::DuplicatesSearchRestrictions::None, sketchType).second;  }
     else if (type == QLatin1String("image"))
     {
@@ -866,7 +868,8 @@ void ImageLister::listHaarSearch(ImageListerReceiver* const \
receiver, const QStr  iface.setAlbumRootsToSearch(albumRootsToList());
         }
 
-        imageSimilarityMap = iface.bestMatchesForImageWithThreshold(path, \
threshold,maxThreshold, targetAlbums, HaarIface::DuplicatesSearchRestrictions::None, \
sketchType).second; +        imageSimilarityMap = \
iface.bestMatchesForImageWithThreshold(path, threshold,maxThreshold, targetAlbums, +  \
HaarIface::DuplicatesSearchRestrictions::None, sketchType).second;  }
 
     listFromHaarSearch(receiver, imageSimilarityMap);
diff --git a/core/libs/models/imagealbummodel.cpp \
b/core/libs/models/imagealbummodel.cpp index 93b41c93e5..0267d5b59c 100644
--- a/core/libs/models/imagealbummodel.cpp
+++ b/core/libs/models/imagealbummodel.cpp
@@ -352,8 +352,8 @@ void ImageAlbumModel::startListJob(QList<Album*> albums)
 
         DatesDBJobInfo jobInfo;
 
-        jobInfo.setStartDate( url.startDate() );
-        jobInfo.setEndDate( url.endDate() );
+        jobInfo.setStartDate(url.startDate());
+        jobInfo.setEndDate(url.endDate());
 
         if (d->recurseAlbums)
             jobInfo.setRecursive();
@@ -396,7 +396,7 @@ void ImageAlbumModel::startListJob(QList<Album*> albums)
         if (d->listOnlyAvailableImages)
             jobInfo.setListAvailableImagesOnly();
 
-        jobInfo.setAlbumRootId( url.albumRootId() );
+        jobInfo.setAlbumRootId(url.albumRootId());
         jobInfo.setAlbum( url.album() );
 
         d->jobThread = DBJobsManager::instance()->startAlbumsJobThread(jobInfo);
@@ -450,7 +450,9 @@ void ImageAlbumModel::slotResult()
 void ImageAlbumModel::slotData(const QList<ImageListerRecord> &records)
 {
     if (d->jobThread != sender())
+    {
         return;
+    }
 
     if (records.isEmpty())
     {
@@ -464,7 +466,7 @@ void ImageAlbumModel::slotData(const QList<ImageListerRecord> \
&records)  {
         QList<QVariant> extraValues;
 
-        foreach (const ImageListerRecord &record, records)
+        foreach(const ImageListerRecord& record, records)
         {
             ImageInfo info(record);
             newItemsList << info;
@@ -496,7 +498,7 @@ void ImageAlbumModel::slotData(const QList<ImageListerRecord> \
&records)  }
     else
     {
-        foreach (const ImageListerRecord &record, records)
+        foreach(const ImageListerRecord& record, records)
         {
             ImageInfo info(record);
             newItemsList << info;


[prev in list] [next in list] [prev in thread] [next in thread]