summaryrefslogtreecommitdiffhomepage
path: root/opentrack-compat
diff options
context:
space:
mode:
Diffstat (limited to 'opentrack-compat')
-rw-r--r--opentrack-compat/options.cpp7
-rw-r--r--opentrack-compat/options.hpp5
2 files changed, 5 insertions, 7 deletions
diff --git a/opentrack-compat/options.cpp b/opentrack-compat/options.cpp
index 05ae692a..4106f783 100644
--- a/opentrack-compat/options.cpp
+++ b/opentrack-compat/options.cpp
@@ -175,11 +175,6 @@ opts::opts(const QString &name) : b(bundle(name))
{
}
-pbundle bundle(const QString& name)
-{
- return detail::singleton().bundle(name);
-}
-
custom_type_initializer::custom_type_initializer()
{
qDebug() << "options: registering stream operators";
@@ -188,7 +183,7 @@ custom_type_initializer::custom_type_initializer()
QMetaType::registerDebugStreamOperator<slider_value>();
}
-custom_type_initializer custom_type_initializer::singleton = custom_type_initializer();
+custom_type_initializer custom_type_initializer::singleton;
namespace detail {
diff --git a/opentrack-compat/options.hpp b/opentrack-compat/options.hpp
index 20f26d26..d7101674 100644
--- a/opentrack-compat/options.hpp
+++ b/opentrack-compat/options.hpp
@@ -198,7 +198,10 @@ namespace options {
using pbundle = std::shared_ptr<detail::opt_bundle>;
- pbundle bundle(const QString& name);
+ inline pbundle bundle(const QString& name)
+ {
+ return detail::singleton().bundle(name);
+ }
#define DEFINE_SLOT(t) void setValue(t datum) { store(datum); }
#define DEFINE_SIGNAL(t) void valueChanged(t)