summaryrefslogtreecommitdiffstats
path: root/mappingtreemodel.cpp
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2012-10-27 13:39:25 +0200
committerArno <am@disconnect.de>2012-10-27 13:39:25 +0200
commit97e8c68d7a92d6ccdb5f6ead8bba0d0af58efb3b (patch)
tree9cf27100410fe74b4794927ef1171301b7a1ceb5 /mappingtreemodel.cpp
parentdc7cc269a4fffe43bdac2ae2dc6548fbd1e3bb5e (diff)
downloadSheMov-97e8c68d7a92d6ccdb5f6ead8bba0d0af58efb3b.tar.gz
SheMov-97e8c68d7a92d6ccdb5f6ead8bba0d0af58efb3b.tar.bz2
SheMov-97e8c68d7a92d6ccdb5f6ead8bba0d0af58efb3b.zip
Bugfixes: don't select dirs and don't crash on write settings
Only select files when archiving pics from filemanager. While at it, I noticed a crash on close when no item is selected in PicturesWidget. So check if MappingData is valid on writing settings. Best way is MappingData::isValid(), and for that I needed a explicit constructor.
Diffstat (limited to 'mappingtreemodel.cpp')
-rw-r--r--mappingtreemodel.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/mappingtreemodel.cpp b/mappingtreemodel.cpp
index 2c636e6..80085c3 100644
--- a/mappingtreemodel.cpp
+++ b/mappingtreemodel.cpp
@@ -305,7 +305,7 @@ bool MappingTreeModel::deleteChild(const QModelIndex &idx){
}
MappingData MappingTreeModel::mappingDataFromIndex(QModelIndex &idx) const{
- MappingData retval = { -1, -1, -1, QString(), QList<QStringList>() };
+ MappingData retval;
if(!idx.isValid()){
return retval;
}
@@ -579,3 +579,9 @@ QList<QVariant> MappingTreeResultModel::columnValuesRecursive(SmTreeItem *parent
}
return retval;
}
+
+MappingData::MappingData() : mappingId(-1), parentId(-1), myId(-1) {}
+
+bool MappingData::isValid(){
+ return !(mappingId == -1 && parentId == -1 && myId == -1);
+}