summaryrefslogtreecommitdiffstats
path: root/backend-shared/exportfuncs.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-02-06 22:18:42 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-02-09 12:13:18 -0800
commit5b302235f4a7c3a5c8bf1bc6404171ebef1b321c (patch)
tree176f6bbcd91f85e156769e88b0af312da28e37d1 /backend-shared/exportfuncs.cpp
parent2cea115ddb7528d9e6dd1bf918ebf5c670b82479 (diff)
downloadsubsurface-5b302235f4a7c3a5c8bf1bc6404171ebef1b321c.tar.gz
Cleanup: Remove global QFuture from exportFuncs
When exporting dives we show a message. The message is closed when the export is finished. This is coordinated by a QFuture. Instead of keeping a global QFuture in the export-code, pass it around as a local variable. This is supported according to Qt's documentation: "QFuture is a lightweight reference counted class that can be passed by value." and the source code indicates the same. Not only does this remove a global, it also makes the code more flexible: Now we could show one notification per export, for example. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'backend-shared/exportfuncs.cpp')
-rw-r--r--backend-shared/exportfuncs.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/backend-shared/exportfuncs.cpp b/backend-shared/exportfuncs.cpp
index 839c0bf1d..eea20ef5b 100644
--- a/backend-shared/exportfuncs.cpp
+++ b/backend-shared/exportfuncs.cpp
@@ -311,8 +311,8 @@ std::vector<const dive_site *> exportFuncs::getDiveSitesToExport(bool selectedOn
return res;
}
-void exportFuncs::exportUsingStyleSheet(QString filename, bool doExport, int units,
+QFuture<int> exportFuncs::exportUsingStyleSheet(QString filename, bool doExport, int units,
QString stylesheet, bool anonymize)
{
- future = QtConcurrent::run(export_dives_xslt, filename.toUtf8(), doExport, units, stylesheet.toUtf8(), anonymize);
+ return QtConcurrent::run(export_dives_xslt, filename.toUtf8(), doExport, units, stylesheet.toUtf8(), anonymize);
}