summaryrefslogtreecommitdiffhomepage
path: root/options
diff options
context:
space:
mode:
authorattila-csipa <attila.csipa@hp.com>2017-07-07 13:16:16 +0100
committerattila-csipa <attila.csipa@hp.com>2017-07-07 13:16:16 +0100
commit5ded46a80ec82137869ebd234189b1fd9ffff680 (patch)
treefeac22663567716e51133734d7592da64adfd239 /options
parent816c857c513e42a0b2583c2ab7bd89610f968f93 (diff)
parentf013741288cbbd9a2e70aea727cbb80cf72d10cc (diff)
Merge remote-tracking branch 'upstream/unstable' into unstable
Diffstat (limited to 'options')
-rw-r--r--options/value.cpp3
-rw-r--r--options/value.hpp23
2 files changed, 26 insertions, 0 deletions
diff --git a/options/value.cpp b/options/value.cpp
new file mode 100644
index 00000000..39bf0506
--- /dev/null
+++ b/options/value.cpp
@@ -0,0 +1,3 @@
+// instantiate the "template class" value<t> symbols
+#define OTR_OPT_VALUE_TMPL_EXPORT
+#include "value.hpp"
diff --git a/options/value.hpp b/options/value.hpp
index ba482cf7..be3e4be2 100644
--- a/options/value.hpp
+++ b/options/value.hpp
@@ -130,4 +130,27 @@ private:
const t def;
};
+#if defined OTR_OPT_VALUE_TMPL_EXPORT && defined BUILD_OPTIONS
+# define OTR_OPT_VALUE OTR_TEMPLATE_EXPORT
+#else
+# define OTR_OPT_VALUE OTR_TEMPLATE_IMPORT
+#endif
+
+OTR_OPT_VALUE value<double>;
+OTR_OPT_VALUE value<float>;
+OTR_OPT_VALUE value<int>;
+OTR_OPT_VALUE value<bool>;
+OTR_OPT_VALUE value<QString>;
+OTR_OPT_VALUE value<slider_value>;
+OTR_OPT_VALUE value<QPointF>;
+OTR_OPT_VALUE value<QVariant>;
+
+OTR_OPT_VALUE value<QList<double>>;
+OTR_OPT_VALUE value<QList<float>>;
+OTR_OPT_VALUE value<QList<int>>;
+OTR_OPT_VALUE value<QList<bool>>;
+OTR_OPT_VALUE value<QList<QString>>;
+OTR_OPT_VALUE value<QList<slider_value>>;
+OTR_OPT_VALUE value<QList<QPointF>>;
+
} // ns options