summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pictureswidget.cpp29
-rw-r--r--pictureswidget.h2
2 files changed, 0 insertions, 31 deletions
diff --git a/pictureswidget.cpp b/pictureswidget.cpp
index 5562006..d5caa76 100644
--- a/pictureswidget.cpp
+++ b/pictureswidget.cpp
@@ -255,26 +255,12 @@ void PictureView::selectedFilesChanged(){
if(sel.isEmpty()){
return;
}
- //file mappings
QList<QVariant> fileIds;
qint64 selSize = 0;
foreach(QModelIndex i, sel){
fileIds << i.data(PicFilesModel::IdRole);
selSize += i.data(PicFilesModel::SizeRole).toInt();
}
- mFilesMappings = mModel->mappingIds(fileIds);
- QStringList mappings;
- foreach(int m, mFilesMappings){
- MappingData mapping = mMappingTreeModel->mappingDataFromId(m);
- if(!mappings.contains(mapping.name)){
- mappings << mapping.name;
- }
- }
- qSort(mappings);
- QString mappingMsg = QString(tr("Mappings: %1")).arg(mappings.join(","));
- emit newMappings(mappingMsg);
-
- //selected items
emit numSelected(sel.size());
emit selectedSize(selSize);
}
@@ -288,7 +274,6 @@ PicFilesModel::PicFilesModel(const QStringList &headers, QObject *parent) : SmTr
mPopulateQS = QString("SELECT DISTINCT(pics.ipicsid), pics.tfilename, pics.isize, pics.tformat, pics.dtadded, pics.cmd5sum FROM pics, pics_mappings2 WHERE pics_mappings2.imappings_parents_id IN (%1) AND pics_mappings2.ipics_id = pics.ipicsid ORDER BY pics.tfilename");
mDeleteFileQ = new QSqlQuery(mDb);
mDeleteFileQ->prepare("DELETE FROM pics WHERE ipicsid = :id");
- mCurMappingIdsQS = QString("SELECT DISTINCT(pics_mappings.imapping_id) FROM pics_mappings, pics WHERE pics_mappings.ipics_id IN (%1)");
mDeleteMappingsQ = new QSqlQuery(mDb);
mDeleteMappingsQ->prepare("DELETE FROM pics_mappings WHERE ipics_id = :id");
mAddMappingsQ = new QSqlQuery(mDb);
@@ -310,20 +295,6 @@ void PicFilesModel::setMapping(int pMapId){
}
}
-QList<int> PicFilesModel::mappingIds(const QList<QVariant> &fileIds){
- QList<int> retval;
- QStringList ids;
- foreach(QVariant f, fileIds){
- ids << f.toString();
- }
- QString mappingQuery = mCurMappingIdsQS.arg(ids.join(","));
- QSqlQuery idQ(mappingQuery, mDb);
- while(idQ.next()){
- retval << idQ.value(0).toInt();
- }
- return retval;
-}
-
QVariant PicFilesModel::data(const QModelIndex &index, int role) const {
if(role == Qt::FontRole){
if(index.column() == Md5Sum){
diff --git a/pictureswidget.h b/pictureswidget.h
index ae64a94..cc1578d 100644
--- a/pictureswidget.h
+++ b/pictureswidget.h
@@ -111,7 +111,6 @@ class PicFilesModel : public SmTreeModel {
explicit PicFilesModel(const QStringList &headers, QObject *parent = 0);
~PicFilesModel();
void setMapping(int pMapId);
- QList<int> mappingIds(const QList<QVariant> &fileIds);
//some data
Qt::ItemFlags flags(const QModelIndex &) const { return Qt::ItemIsEnabled | Qt::ItemIsSelectable; }
@@ -131,7 +130,6 @@ class PicFilesModel : public SmTreeModel {
QSqlQuery *mDeleteFileQ;
QSqlQuery *mDeleteMappingsQ;
QSqlQuery *mAddMappingsQ;
- QString mCurMappingIdsQS;
QList<int> mMappingIds;
};