summaryrefslogtreecommitdiffstats
path: root/picfilesmodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'picfilesmodel.cpp')
-rw-r--r--picfilesmodel.cpp13
1 files changed, 8 insertions, 5 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>();
}