From 2a45f1c77134f7352bf98e4bb7f5013cc993b97d Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Fri, 23 Nov 2018 17:14:32 +0100
Subject: Fix PicFilesModel

Don't hide another function and weed out foreach. Also fix nullptr
issues.
---
 picfilesmodel.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'picfilesmodel.h')

diff --git a/picfilesmodel.h b/picfilesmodel.h
index 07865e6..6535f01 100644
--- a/picfilesmodel.h
+++ b/picfilesmodel.h
@@ -19,7 +19,7 @@ class PicFilesModel : public SmTreeModel {
         enum Roles { FileNameRole = Qt::UserRole + 1, SizeRole = Qt::UserRole + 2, MimeTypeRole = Qt::UserRole + 3, FullPathRole = Qt::UserRole + 4, IdRole = Qt::UserRole + 5, AddedRole = Qt::UserRole + 6, Md5SumRole = Qt::UserRole + 7, PicSizeRole = Qt::UserRole + 8 };
         enum Fields { FileName = 0, Size = 1, MimeType = 2, FullPath = 3, Id = 4, Added = 5, Md5Sum = 6, PicSize = 7 };
         enum { NumFields = 8 };
-        explicit PicFilesModel(const QStringList &headers, QObject *parent = 0);
+        explicit PicFilesModel(const QStringList &headers, QObject *parent = nullptr);
         void setMapping(int pMapId);
 
         //some data
@@ -31,7 +31,7 @@ class PicFilesModel : public SmTreeModel {
         bool changeMappings(const QList<int> &fileIds, const QList<QVariant> &parentIds);
         QList<MappingData> mappingDataFromFile(int fileId);
         SmTreeItem *mappingTreeFromFile(int fileId);
-        SmTreeItem *findRecursive(SmTreeItem *start, const QVariant &name, const QVariant id) const;
+        SmTreeItem *findRecursivePics(SmTreeItem *start, const QVariant &name, const QVariant id) const;
         QList<MappingData> mappingDataFromFiles(const QList<int> fileIds);
         void selectFromAll();
         void selectFromRecent(int days);
-- 
cgit v1.2.3-70-g09d2