summaryrefslogtreecommitdiffstats
path: root/picfilesmodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'picfilesmodel.cpp')
-rw-r--r--picfilesmodel.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/picfilesmodel.cpp b/picfilesmodel.cpp
index 717812c..193a883 100644
--- a/picfilesmodel.cpp
+++ b/picfilesmodel.cpp
@@ -33,7 +33,7 @@ PicFilesModel::PicFilesModel(const QStringList &headers, QObject *parent) : SmTr
void PicFilesModel::setMapping(int pMapId){
QList<QVariant> ids = mMappingTreeModel->childList(pMapId, MappingTreeModel::MappingId);
mMappingIds.clear();
- foreach(QVariant i, ids){
+ for(QVariant i : ids){
mMappingIds << i.toInt();
}
}
@@ -93,7 +93,7 @@ QList<QVariant> PicFilesModel::dataList(const QModelIndex &idx){
}
QList<MappingData> mapData = mappingDataFromFile(idx.data(PicFilesModel::IdRole).toInt());
QList<QStringList> mappings;
- foreach(MappingData d, mapData){
+ for(MappingData d : mapData){
mappings << d.path;
}
@@ -130,7 +130,7 @@ void PicFilesModel::removeFiles(const QList<QPair<int, QString> > &files){
}
}
// remove from view
- foreach(int id, success){
+ for(int id : success){
QModelIndex idx = find(id, Id);
if(idx.isValid()){
removeRows(idx.row(), 1, QModelIndex());
@@ -144,12 +144,12 @@ bool PicFilesModel::changeMappings(const QList<int> &fileIds, const QList<QVaria
deleteMappingsQ.prepare("DELETE FROM pics_mappings WHERE ipics_id = :id");
QSqlQuery addMappingsQ(mDb);
addMappingsQ.prepare("INSERT INTO pics_mappings(ipics_id, imappings_parents_id) VALUES(:pid, :id)");
- foreach(int fid, fileIds){
+ for(int fid : fileIds){
deleteMappingsQ.bindValue(":id", fid);
if(!deleteMappingsQ.exec()){
goto error;
}
- foreach(QVariant pid, parentIds){
+ for(QVariant pid : parentIds){
addMappingsQ.bindValue(":pid", fid);
addMappingsQ.bindValue(":id", pid);
if(!addMappingsQ.exec()){
@@ -169,12 +169,12 @@ SmTreeItem *PicFilesModel::mappingTreeFromFile(int fileId){
QList<int> fileIds = QList<int>() << fileId;
QList<int> parentIds = mappingPIdsFromFiles(fileIds);
if(parentIds.isEmpty()){
- return 0;
+ return nullptr;
}
SmTreeItem *retval = new SmTreeItem(2);
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){
+ for(int pId : parentIds){
QList<QVariantList> curData;
int curParent = -1;
mpq.bindValue(":id", pId);
@@ -199,7 +199,7 @@ SmTreeItem *PicFilesModel::mappingTreeFromFile(int fileId){
SmTreeItem *parentItem = retval;
for(int i = 0; i < curData.size(); ++i){
QVariantList data = curData.at(i);
- SmTreeItem *searchItem = findRecursive(parentItem, data.at(0), data.at(1));
+ SmTreeItem *searchItem = findRecursivePics(parentItem, data.at(0), data.at(1));
if(searchItem){
parentItem = searchItem;
}else{
@@ -219,9 +219,9 @@ SmTreeItem *PicFilesModel::mappingTreeFromFile(int fileId){
return retval;
}
-SmTreeItem *PicFilesModel::findRecursive(SmTreeItem *start, const QVariant &name, const QVariant id) const{
+SmTreeItem *PicFilesModel::findRecursivePics(SmTreeItem *start, const QVariant &name, const QVariant id) const{
if(!start){
- return 0;
+ return nullptr;
}
if(start->data(0) == name && start->data(1) == id){
return start;
@@ -232,14 +232,14 @@ SmTreeItem *PicFilesModel::findRecursive(SmTreeItem *start, const QVariant &name
return child;
}
if(child->childCount()){
- return findRecursive(child, name, id);
+ return findRecursivePics(child, name, id);
}
}
SmTreeItem *next = start->next();
if(next){
- return findRecursive(next, name, id);
+ return findRecursivePics(next, name, id);
}
- return 0;
+ return nullptr;
}
QList<MappingData> PicFilesModel::mappingDataFromFile(int fileId){
@@ -255,7 +255,7 @@ QList<MappingData> PicFilesModel::mappingDataFromFiles(const QList<int> fileIds)
QList<MappingData> retval;
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){
+ for(int pId : parentIds){
MappingData curData;
int curParent = -1;
mpq.bindValue(":id", pId);
@@ -289,7 +289,7 @@ QList<int> PicFilesModel::mappingPIdsFromFiles(QList<int> fileIds){
return QList<int>();
}
QStringList idList;
- foreach(int id, fileIds){
+ for(int id : fileIds){
idList << QString::number(id);
}
QString qTempl = QString(mMappingsQS.arg(idList.join(",")));
@@ -333,7 +333,7 @@ void PicFilesModel::selectFromRecent(int days){
void PicFilesModel::selectFromSelection(QList<QVariant> ids){
mAllPics.clear();
QStringList idQS;
- foreach (QVariant i, ids){
+ for(QVariant i : ids){
idQS << QString::number(i.toInt());
}
QString inPart = idQS.join(',');
@@ -357,7 +357,7 @@ void PicFilesModel::allPicIds(){
cur << q.value(0) << q.value(1) << q.value(2);
mAllPics << cur;
}
- unsigned seed = std::chrono::system_clock::now().time_since_epoch().count();
+ auto seed = std::chrono::system_clock::now().time_since_epoch().count();
std::shuffle(mAllPics.begin(), mAllPics.end(), std::default_random_engine(seed));
mCurrentPics = &mAllPics;
}
@@ -371,7 +371,7 @@ void PicFilesModel::recentPicIds(){
cur << q.value(0) << q.value(1) << q.value(2);
mRecentPics << cur;
}
- unsigned seed = std::chrono::system_clock::now().time_since_epoch().count();
+ auto seed = std::chrono::system_clock::now().time_since_epoch().count();
std::shuffle(mRecentPics.begin(), mRecentPics.end(), std::default_random_engine(seed));
mCurrentPics = &mRecentPics;
}
@@ -396,7 +396,7 @@ QList<QList<QVariant> > PicFilesModel::getNextBatch(){
void PicFilesModel::populate(){
SmTreeItem *root = new SmTreeItem(NumFields);
QStringList idList;
- foreach(int id, mMappingIds){
+ for(int id : mMappingIds){
idList << QString::number(id);
}
QString query = mPopulateQS.arg(idList.join(","));
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-05-10 08:27:52 +0000