diff options
| author | Arno <am@disconnect.de> | 2014-12-10 22:10:50 +0100 |
|---|---|---|
| committer | Arno <am@disconnect.de> | 2014-12-10 22:10:50 +0100 |
| commit | 2c022561f692a813b44da39d6ffdcb373aa4c7ba (patch) | |
| tree | a500c3623572e1230b12b2302b00bf558502dadd /picfilesmodel.cpp | |
| parent | 343d3db5f5ad571527a7ca70457cbb6ccb1bbb71 (diff) | |
| download | SheMov-2c022561f692a813b44da39d6ffdcb373aa4c7ba.tar.gz SheMov-2c022561f692a813b44da39d6ffdcb373aa4c7ba.tar.bz2 SheMov-2c022561f692a813b44da39d6ffdcb373aa4c7ba.zip | |
Various Bugfixes and cleanups
* remove debug statements from SmDirWatcher
* Don't crash on parentDir when current Dir is already deleted
* Fix PicFilesModel MappingQuery. It needlessly referenced the table
pics in FROM causing an expensive full table scan!
* Fix findRecursive in PicFilesModel: Stupid typo!
* Give SmDirWatcher a separate DB-Connection. One Thread, one Connection
* Remove several includes
This should have been 6 commits, but that's how debugging works :(
Diffstat (limited to 'picfilesmodel.cpp')
| -rw-r--r-- | picfilesmodel.cpp | 4 |
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()){ |