Revert "compat/options: export template instances to lessen code bloat"

This reverts commit 1e26e00e9ae0c519355e3a6fe5ad098d1f6a9622.

Broke osx.

1 files changed, 2 insertions, 116 deletions

diff --git a/opentrack-compat/options.cpp b/opentrack-compat/options.cpp
index f12a209c..7b2eaa2f 100644
--- a/opentrack-compat/options.cpp
+++ b/opentrack-compat/options.cpp
@@ -1,6 +1,5 @@
-#define OPENTRACK_OPTIONS_EXTERN_TEMPLATES /* nothing */
-
 #include "options.hpp"
+
 #include <cmath>
 
 namespace options
@@ -241,118 +240,5 @@ OPENTRACK_COMPAT_EXPORT opt_singleton& singleton()
 
 } // end options::detail
 
-template<>
-void tie_setting(value<int>& v, QComboBox* cb)
-{
-    cb->setCurrentIndex(v);
-    v = cb->currentIndex();
-    base_value::connect(cb, SIGNAL(currentIndexChanged(int)), &v, SLOT(setValue(int)), v.DIRECT_CONNTYPE);
-    base_value::connect(&v, SIGNAL(valueChanged(int)), cb, SLOT(setCurrentIndex(int)), v.DIRECT_CONNTYPE);
-}
-
-template<>
-void tie_setting(value<QString>& v, QComboBox* cb)
-{
-    cb->setCurrentText(v);
-    v = cb->currentText();
-    base_value::connect(cb, SIGNAL(currentTextChanged(QString)), &v, SLOT(setValue(QString)), v.DIRECT_CONNTYPE);
-    base_value::connect(&v, SIGNAL(valueChanged(QString)), cb, SLOT(setCurrentText(QString)), v.DIRECT_CONNTYPE);
-}
-
-template<>
-void tie_setting(value<bool>& v, QCheckBox* cb)
-{
-    cb->setChecked(v);
-    base_value::connect(cb, SIGNAL(toggled(bool)), &v, SLOT(setValue(bool)), v.DIRECT_CONNTYPE);
-    base_value::connect(&v, SIGNAL(valueChanged(bool)), cb, SLOT(setChecked(bool)), v.DIRECT_CONNTYPE);
-}
-
-template<>
-void tie_setting(value<double>& v, QDoubleSpinBox* dsb)
-{
-    dsb->setValue(v);
-    base_value::connect(dsb, SIGNAL(valueChanged(double)), &v, SLOT(setValue(double)), v.DIRECT_CONNTYPE);
-    base_value::connect(&v, SIGNAL(valueChanged(double)), dsb, SLOT(setValue(double)), v.DIRECT_CONNTYPE);
-}
-
-template<>
-void tie_setting(value<int>& v, QSpinBox* sb)
-{
-    sb->setValue(v);
-    base_value::connect(sb, SIGNAL(valueChanged(int)), &v, SLOT(setValue(int)), v.DIRECT_CONNTYPE);
-    base_value::connect(&v, SIGNAL(valueChanged(int)), sb, SLOT(setValue(int)), v.DIRECT_CONNTYPE);
-}
-
-template<>
-void tie_setting(value<int>& v, QSlider* sl)
-{
-    sl->setValue(v);
-    v = sl->value();
-    base_value::connect(sl, SIGNAL(valueChanged(int)), &v, SLOT(setValue(int)), v.DIRECT_CONNTYPE);
-    base_value::connect(&v, SIGNAL(valueChanged(int)), sl, SLOT(setValue(int)), v.DIRECT_CONNTYPE);
-}
-
-template<>
-void tie_setting(value<QString>& v, QLineEdit* le)
-{
-    le->setText(v);
-    base_value::connect(le, SIGNAL(textChanged(QString)), &v, SLOT(setValue(QString)), v.DIRECT_CONNTYPE);
-    base_value::connect(&v, SIGNAL(valueChanged(QString)),le, SLOT(setText(QString)), v.DIRECT_CONNTYPE);
-}
-
-template<>
-void tie_setting(value<QString>& v, QLabel* lb)
-{
-    lb->setText(v);
-    base_value::connect(&v, SIGNAL(valueChanged(QString)), lb, SLOT(setText(QString)), v.DIRECT_CONNTYPE);
-}
-
-template<>
-void tie_setting(value<int>& v, QTabWidget* t)
-{
-    t->setCurrentIndex(v);
-    base_value::connect(t, SIGNAL(currentChanged(int)), &v, SLOT(setValue(int)), v.DIRECT_CONNTYPE);
-    base_value::connect(&v, SIGNAL(valueChanged(int)), t, SLOT(setCurrentIndex(int)), v.DIRECT_CONNTYPE);
-}
-
-template<>
-void tie_setting(value<slider_value>& v, QSlider* w)
-{
-    // we can't get these at runtime since signals cross threads
-    const int q_min = w->minimum();
-    const int q_max = w->maximum();
-    const int q_diff = q_max - q_min;
-
-    slider_value sv(v);
-
-    const double sv_max = sv.max();
-    const double sv_min = sv.min();
-    const double sv_c = sv_max - sv_min;
-
-    w->setValue(int((sv.cur() - sv_min) / sv_c * q_diff + q_min));
-    v = slider_value(q_diff <= 0 ? 0 : (w->value() - q_min) * sv_c / (double)q_diff + sv_min, sv_min, sv_max);
-
-    base_value::connect(w,
-                        &QSlider::valueChanged,
-                        &v,
-                        [=, &v](int pos) -> void
-    {
-        if (q_diff <= 0 || pos <= 0)
-            v = slider_value(sv_min, sv_min, sv_max);
-        else
-            v = slider_value((pos - q_min) * sv_c / (double)q_diff + sv_min, sv_min, sv_max);
-    },
-    v.DIRECT_CONNTYPE);
-    base_value::connect(&v,
-                        static_cast<void(base_value::*)(double)>(&base_value::valueChanged),
-                        w,
-                        [=](double value) -> void
-    {
-        w->setValue(int(value * q_diff) + q_min);
-    },
-    v.DIRECT_CONNTYPE);
-}
-
-} // ns options
+} // end options
 
-#include "options-specialize.hpp"