summaryrefslogtreecommitdiffstats
path: root/archivemodel.h
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2013-08-10 10:54:14 +0200
committerArno <am@disconnect.de>2013-08-10 10:54:14 +0200
commit6e4a72a3442af9e6c4010cccc2329035008df167 (patch)
tree38b50e34e43b972b01942a57b45bc1d17a108a9d /archivemodel.h
parent485e8ca24887b387b2a8f08a7561d2054651633b (diff)
downloadSheMov-6e4a72a3442af9e6c4010cccc2329035008df167.tar.gz
SheMov-6e4a72a3442af9e6c4010cccc2329035008df167.tar.bz2
SheMov-6e4a72a3442af9e6c4010cccc2329035008df167.zip
Various Bugfixes
* cache: use qint64 consistently instead of quint64 once (typo, I guess) * sync cancelling of ArchiveCollector: wait for it and reset the cancel var * sync access to cache file with QMutex * don't set quality for pics
Diffstat (limited to 'archivemodel.h')
-rw-r--r--archivemodel.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/archivemodel.h b/archivemodel.h
index 74a2715..8323385 100644
--- a/archivemodel.h
+++ b/archivemodel.h
@@ -82,6 +82,7 @@ class ArchiveModel : public SmTreeModel {
QHash<QString, int> mAvailableOrders;
QList<ArchiveCollector*> mCollectors;
QHash<int, QIcon> mNodeIcons;
+ QMutex mCacheMx;
int mOrder;
};
@@ -116,7 +117,8 @@ class ArchiveCollector : public QThread {
explicit ArchiveCollector(int numFields, int order, QObject *parent = 0);
SmTreeItem *rootItem();
int sortOrder() const { return mSortOrder; }
- void cancel();
+ void setCancelled(bool cancel);
+ bool isCancelled() const { return mCancelled; }
signals:
void message(const QString message);