1 files changed, 5 insertions, 54 deletions

diff --git a/logic/main-settings.cpp b/logic/main-settings.cpp
index 2bf0ad1f..19bb692d 100644
--- a/logic/main-settings.cpp
+++ b/logic/main-settings.cpp
@@ -4,57 +4,8 @@ namespace main_settings_impl {
 
 using namespace options;
 
-main_settings::main_settings() :
-    b(make_bundle("opentrack-ui")),
-    b_map(make_bundle("opentrack-mappings")),
-    a_x("x", TX),
-    a_y("y", TY),
-    a_z("z", TZ),
-    a_yaw("yaw", Yaw),
-    a_pitch("pitch", Pitch),
-    a_roll("roll", Roll),
-    all_axis_opts { &a_x, &a_y, &a_z, &a_yaw, &a_pitch, &a_roll },
-    reltrans_disable_tx(b, "compensate-translation-disable-x-axis", false),
-    reltrans_disable_ty(b, "compensate-translation-disable-y-axis", false),
-    reltrans_disable_tz(b, "compensate-translation-disable-z-axis", false),
-    reltrans_disable_src_yaw(b, "compensate-translation-disable-source-yaw", false),
-    reltrans_disable_src_pitch(b, "compensate-translation-disable-source-pitch", false),
-    reltrans_disable_src_roll(b, "compensate-translation-disable-source-roll", false),
-    tray_enabled(b, "use-system-tray", false),
-    tray_start(b, "start-in-tray", false),
-    center_at_startup(b, "center-at-startup", true),
-    neck_z(b, "neck-depth", 0),
-    neck_enable(b, "neck-enable", false),
-    key_start_tracking1(b, "start-tracking"),
-    key_start_tracking2(b, "start-tracking-alt"),
-    key_stop_tracking1(b, "stop-tracking"),
-    key_stop_tracking2(b, "stop-tracking-alt"),
-    key_toggle_tracking1(b, "toggle-tracking"),
-    key_toggle_tracking2(b, "toggle-tracking-alt"),
-    key_restart_tracking1(b, "restart-tracking"),
-    key_restart_tracking2(b, "restart-tracking-alt"),
-    key_center1(b, "center"),
-    key_center2(b, "center-alt"),
-    key_toggle1(b, "toggle"),
-    key_toggle2(b, "toggle-alt"),
-    key_zero1(b, "zero"),
-    key_zero2(b, "zero-alt"),
-    key_toggle_press1(b, "toggle-press"),
-    key_toggle_press2(b, "toggle-press-alt"),
-    key_zero_press1(b, "zero-press"),
-    key_zero_press2(b, "zero-press-alt"),
-    tracklogging_enabled(b, "tracklogging-enabled", false),
-    tracklogging_filename(b, "tracklogging-filename", QString())
-{
-}
-
-module_settings::module_settings() :
-    b(make_bundle("modules")),
-    tracker_dll(b, "tracker-dll", "pt"),
-    filter_dll(b, "filter-dll", "accela"),
-    protocol_dll(b, "protocol-dll", "freetrack")
-{
-}
+main_settings::main_settings() = default;
+module_settings::module_settings() = default;
 
 key_opts::key_opts(bundle b, const QString& name) :
     keycode(b, QString("keycode-%1").arg(name), ""),
@@ -66,9 +17,9 @@ key_opts& key_opts::operator=(const key_opts& x)
 {
     if (&x != this)
     {
-        keycode = x.keycode();
-        guid = x.guid();
-        button = x.button();
+        keycode = *x.keycode;
+        guid = *x.guid;
+        button = *x.button;
     }
 
     return *this;