diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2018-10-06 16:14:08 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2018-10-06 16:14:08 +0200 |
| commit | 6b08be06ae0ff6d5b18471a959ad3401b3afebe1 (patch) | |
| tree | 8a6452f832e0e92274bbe47e0ca08f110dc6978a | |
| parent | 61dd862769a186a05a2b0ca7fe7cc470aa383f25 (diff) | |
Better hack for seeding QHash attribute map.
| -rw-r--r-- | src/audioextractor.cc | 5 | ||||
| -rw-r--r-- | src/projectrenderer.cc | 5 | ||||
| -rw-r--r-- | src/projectserialiser.cc | 7 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/audioextractor.cc b/src/audioextractor.cc index b9b743a..21a4108 100644 --- a/src/audioextractor.cc +++ b/src/audioextractor.cc @@ -30,13 +30,12 @@ #include <QFile> #include <QDir> #include <QApplication> +#include <QHash> #include <sndfile.h> #include "project.h" -extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed; - #define INSTRUMENT_VERSION "2.0" typedef struct @@ -219,7 +218,7 @@ void AudioExtractor::exportSelections() // Ugly hack to ensure the xml attribute order is the same each time a save // or export is performed. - qt_qhash_seed.store(0); + qSetGlobalQHashSeed(0); QDomDocument doc; QDomProcessingInstruction header = diff --git a/src/projectrenderer.cc b/src/projectrenderer.cc index c6f24b0..d258bf5 100644 --- a/src/projectrenderer.cc +++ b/src/projectrenderer.cc @@ -30,12 +30,11 @@ #include <QFile> #include <QApplication> #include <QDir> +#include <QHash> #include "project.h" #include "audioextractor.h" -extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed; - ProjectRenderer::ProjectRenderer(Project& project) : project(project) { @@ -45,7 +44,7 @@ void ProjectRenderer::render() { // Ugly hack to ensure the xml attribute order is the same each time a save // or export is performed. - qt_qhash_seed.store(0); + qSetGlobalQHashSeed(0); QDomDocument doc; QDomProcessingInstruction header = diff --git a/src/projectserialiser.cc b/src/projectserialiser.cc index 64824dd..6a204eb 100644 --- a/src/projectserialiser.cc +++ b/src/projectserialiser.cc @@ -30,6 +30,7 @@ #include <iostream> #include <QDomDocument> +#include <QHash> /* <?xml version="1.0" encoding="UTF-8"?> @@ -39,8 +40,6 @@ </dgedit> */ -extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed; - class DomHelper { public: @@ -108,7 +107,7 @@ QString ProjectSerialiser::serialise(const Project& project) { // Ugly hack to ensure the xml attribute order is the same each time a save // or export is performed. - qt_qhash_seed.store(0); + qSetGlobalQHashSeed(0); QDomDocument doc; auto header = @@ -218,7 +217,7 @@ bool ProjectSerialiser::deserialise(const QString& data, Project& project) { // Ugly hack to ensure the xml attribute order is the same each time a save // or export is performed. - qt_qhash_seed.store(0); + qSetGlobalQHashSeed(0); QDomDocument doc; if(!doc.setContent(data)) |