summaryrefslogtreecommitdiffstats
path: root/picfilesmodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'picfilesmodel.cpp')
-rw-r--r--picfilesmodel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/picfilesmodel.cpp b/picfilesmodel.cpp
index 6010e1d..dfe0f2d 100644
--- a/picfilesmodel.cpp
+++ b/picfilesmodel.cpp
@@ -22,7 +22,7 @@ PicFilesModel::PicFilesModel(const QStringList &headers, QObject *parent) : SmTr
//setup database
mDb = QSqlDatabase::database("treedb");
mPopulateQS = QString("SELECT DISTINCT(pics.ipicsid), pics.tfilename, pics.isize, pics.tformat, pics.dtadded, pics.cmd5sum, pics.cpicsize FROM pics, pics_mappings WHERE pics_mappings.imappings_parents_id IN (%1) AND pics_mappings.ipics_id = pics.ipicsid ORDER BY pics.tfilename");
- mMappingsQS = QString("SELECT DISTINCT(pics_mappings.imappings_parents_id) FROM pics_mappings, pics WHERE pics_mappings.ipics_id IN (%1)");
+ mMappingsQS = QString("SELECT DISTINCT(pics_mappings.imappings_parents_id) FROM pics_mappings WHERE pics_mappings.ipics_id IN (%1)");
}
void PicFilesModel::setMapping(int pMapId){
@@ -223,7 +223,7 @@ SmTreeItem *PicFilesModel::findRecursive(SmTreeItem *start, const QVariant &name
}
for(int i = 0; i < start->childCount(); ++i){
SmTreeItem *child = start->child(i);
- if(child->data(0) == name && start->data(1) == id){
+ if(child->data(0) == name && child->data(1) == id){
return child;
}
if(child->childCount()){