There goes the constness...

At least try to reconnect to the database after resume.

2 files changed, 13 insertions, 10 deletions

diff --git a/picfilesmodel.cpp b/picfilesmodel.cpp
index 11d8f43..8ea4442 100644
--- a/picfilesmodel.cpp
+++ b/picfilesmodel.cpp
@@ -82,7 +82,7 @@ QVariant PicFilesModel::data(const QModelIndex &index, int role) const {
     return SmTreeModel::data(index, role);
 }
 
-QList<QVariant> PicFilesModel::dataList(const QModelIndex &idx) const{
+QList<QVariant> PicFilesModel::dataList(const QModelIndex &idx){
     QList<QVariant> retval;
     if(!idx.isValid()){
         return retval;
@@ -165,13 +165,16 @@ bool PicFilesModel::changeMappings(const QList<int> &fileIds, const QList<QVaria
     return false;
 }
 
-SmTreeItem *PicFilesModel::mappingTreeFromFile(int fileId) const{
+SmTreeItem *PicFilesModel::mappingTreeFromFile(int fileId){
     QList<int> fileIds = QList<int>() << fileId;
     QList<int> parentIds = mappingPIdsFromFiles(fileIds);
     if(parentIds.isEmpty()){
         return 0;
     }
     SmTreeItem *retval = new SmTreeItem(2);
+    if(!mDb.isOpen()){
+        mDb.open();
+    }
     QSqlQuery mpq(mDb);
     mpq.prepare("SELECT imapping_parents_id, iparent_id, tdescription_name, mapping_parents.idescription_id FROM mapping_parents, mapping_description WHERE imapping_parents_id = :id AND mapping_parents.idescription_id = mapping_description.idescription_id");
     foreach(int pId, parentIds){
@@ -242,12 +245,12 @@ SmTreeItem *PicFilesModel::findRecursive(SmTreeItem *start, const QVariant &name
     return 0;
 }
 
-QList<MappingData> PicFilesModel::mappingDataFromFile(int fileId) const{
+QList<MappingData> PicFilesModel::mappingDataFromFile(int fileId){
     QList<int> d = QList<int>() << fileId;
     return mappingDataFromFiles(d);
 }
 
-QList<MappingData> PicFilesModel::mappingDataFromFiles(const QList<int> fileIds) const{
+QList<MappingData> PicFilesModel::mappingDataFromFiles(const QList<int> fileIds){
     QList<int> parentIds = mappingPIdsFromFiles(fileIds);
     if(parentIds.isEmpty()){
         return QList<MappingData>();
@@ -284,7 +287,7 @@ QList<MappingData> PicFilesModel::mappingDataFromFiles(const QList<int> fileIds)
     return retval;
 }
 
-QList<int> PicFilesModel::mappingPIdsFromFiles(QList<int> fileIds) const{
+QList<int> PicFilesModel::mappingPIdsFromFiles(QList<int> fileIds){
     if(fileIds.isEmpty()){
         return QList<int>();
     }
diff --git a/picfilesmodel.h b/picfilesmodel.h
index 6e68a74..07865e6 100644
--- a/picfilesmodel.h
+++ b/picfilesmodel.h
@@ -25,14 +25,14 @@ class PicFilesModel : public SmTreeModel {
         //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<QVariant> dataList(const QModelIndex &idx);
         QList<QList<QVariant> > allFiles() const;
         void removeFiles(const QList<QPair<int, QString> > &files);
         bool changeMappings(const QList<int> &fileIds, const QList<QVariant> &parentIds);
-        QList<MappingData> mappingDataFromFile(int fileId) const;
-        SmTreeItem *mappingTreeFromFile(int fileId) const;
+        QList<MappingData> mappingDataFromFile(int fileId);
+        SmTreeItem *mappingTreeFromFile(int fileId);
         SmTreeItem *findRecursive(SmTreeItem *start, const QVariant &name, const QVariant id) const;
-        QList<MappingData> mappingDataFromFiles(const QList<int> fileIds) const;
+        QList<MappingData> mappingDataFromFiles(const QList<int> fileIds);
         void selectFromAll();
         void selectFromRecent(int days);
         void selectFromSelection(QList<QVariant> ids);
@@ -45,7 +45,7 @@ class PicFilesModel : public SmTreeModel {
         void populate();
 
     private:
-        QList<int> mappingPIdsFromFiles(QList<int> fileIds) const;
+        QList<int> mappingPIdsFromFiles(QList<int> fileIds);
         QSqlDatabase mDb;
         MappingTreeModel *mMappingTreeModel;
         QString mPopulateQS;