From 184448e767ccdeae66fe4d795757cace98033b0e Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Thu, 4 Oct 2012 06:59:44 +0200
Subject: Fix Mappings in PictureViewer2

Another fix for the new MappingTreeModel database layout: Make the
mappings display correctly when showing an archived picture.

For performance reasons I had to make PicFilesModel global and put it
into a separate file.

Also clean up MappingTreeModel: remove comments and unused functions.
---
 pictureswidget.h | 34 ----------------------------------
 1 file changed, 34 deletions(-)

(limited to 'pictureswidget.h')

diff --git a/pictureswidget.h b/pictureswidget.h
index b2da8ea..9618e6e 100644
--- a/pictureswidget.h
+++ b/pictureswidget.h
@@ -103,38 +103,4 @@ class PictureView : public QTreeView {
         MappingTreeModel *mMappingTreeModel;
 };
 
-class PicFilesModel : public SmTreeModel {
-    Q_OBJECT
-    public:
-        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, SizeDisplayRole = Qt::UserRole + 8 };
-        enum Fields { FileName = 0, Size = 1, MimeType = 2, FullPath = 3, Id = 4, Added = 5, Md5Sum = 6, SizeDisplay = 7 };
-        enum { NumFields = 8 };
-        explicit PicFilesModel(const QStringList &headers, QObject *parent = 0);
-        ~PicFilesModel();
-        void setMapping(int pMapId);
-
-        //some data
-        Qt::ItemFlags flags(const QModelIndex &) const { return Qt::ItemIsEnabled | Qt::ItemIsSelectable; }
-        QVariant data(const QModelIndex &index, int role) const;
-        QList<QVariant> dataList(const QModelIndex &idx) const;
-        QList<QList<QVariant> > allFiles() const;
-        void removeFiles(const QList<QPersistentModelIndex> &files);
-        bool changeMappings(const QList<int> &fileIds, const QList<int> &mappingIds);
-        QList<MappingData> mappingDataFromFiles(const QList<int> fileIds) const;
-
-    public slots:
-        void populate();
-
-    private:
-        QList<int> mappingPIdsFromFiles(QList<int> fileIds) const;
-        QSqlDatabase mDb;
-        MappingTreeModel *mMappingTreeModel;
-        QString mPopulateQS;
-        QString mMappingsQS;
-        QSqlQuery *mDeleteFileQ;
-        QSqlQuery *mDeleteMappingsQ;
-        QSqlQuery *mAddMappingsQ;
-        QList<int> mMappingIds;
-};
-
 #endif // PICTURESWIDGET_H
-- 
cgit v1.2.3-70-g09d2