diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-08 23:29:49 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-08 23:29:49 +0200 |
| commit | fa1801471c2708ed8266ec7b99bd4cec886ccc1b (patch) | |
| tree | aa56218c2c7e4939aaf11a2046b0f12760326545 /migration/20160906_00-mappings.cpp | |
| parent | 90940a774eab876c38d5cef981b4be5bae67a462 (diff) | |
options: fix 2 issues
1. Calling valueChanged didn't invoke machinery in
value<t>, only base_value aka value_.
There's a fast path in value<t>::type() despite the
pessimization.
2. Split global scope stuff into options::globals from
the options::globals stuff
3. Adjust usages
Diffstat (limited to 'migration/20160906_00-mappings.cpp')
| -rw-r--r-- | migration/20160906_00-mappings.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/migration/20160906_00-mappings.cpp b/migration/20160906_00-mappings.cpp index 0019d0ef..f94f8290 100644 --- a/migration/20160906_00-mappings.cpp +++ b/migration/20160906_00-mappings.cpp @@ -19,6 +19,7 @@ #include <QDebug> using namespace options; +using namespace options::globals; using namespace migrations; static const char* const old_names[] = @@ -44,7 +45,7 @@ static QList<QList<QPointF>> get_old_splines() { QList<QList<QPointF>> ret; - return group::with_settings_object([&](QSettings& settings) { + return with_settings_object([&](QSettings& settings) { for (const char* name : old_names) { const int max = settings.value("point-count", 0).toInt(); @@ -96,7 +97,7 @@ struct mappings_from_2_3_0_rc11 : migration void run() override { - group::with_settings_object([this](QSettings&) { + with_settings_object([](QSettings&) { const QList<QList<QPointF>> old_mappings = get_old_splines(); for (int i = 0; i < 12; i++) |