diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2019-02-11 18:40:27 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-02-11 20:21:35 +0100 |
| commit | 24f8f904f3975832b77e18957dc41d2372deebc5 (patch) | |
| tree | d6097eec1bd3118487d044dec3d8f28b7e0ac147 /options | |
| parent | 15a8ad060653a521bcd175b495455a0e09377050 (diff) | |
less header namespace pollution
Diffstat (limited to 'options')
| -rw-r--r-- | options/value.cpp | 3 | ||||
| -rw-r--r-- | options/value.hpp | 37 |
2 files changed, 19 insertions, 21 deletions
diff --git a/options/value.cpp b/options/value.cpp index e0be69ae..81a094e6 100644 --- a/options/value.cpp +++ b/options/value.cpp @@ -1,6 +1,5 @@ // instantiate the "template class" value<t> symbols -#include "compat/linkage-macros.hpp" -#define OTR_INST_VALUE(x) OTR_TEMPLATE_EXPORT(x) +#define OTR_OPTIONS_INST_VALUE OTR_TEMPLATE_EXPORT #include "value.hpp" diff --git a/options/value.hpp b/options/value.hpp index 18a5ae9b..940e2a15 100644 --- a/options/value.hpp +++ b/options/value.hpp @@ -153,26 +153,25 @@ public: } }; -// some linker problems -#if !defined OTR_INST_VALUE -# define OTR_INST_VALUE OTR_TEMPLATE_IMPORT +#if !defined OTR_OPTIONS_INST_VALUE +# define OTR_OPTIONS_INST_VALUE OTR_TEMPLATE_IMPORT #endif -OTR_INST_VALUE(value<double>) -OTR_INST_VALUE(value<float>) -OTR_INST_VALUE(value<int>) -OTR_INST_VALUE(value<bool>) -OTR_INST_VALUE(value<QString>) -OTR_INST_VALUE(value<slider_value>) -OTR_INST_VALUE(value<QPointF>) -OTR_INST_VALUE(value<QVariant>) -OTR_INST_VALUE(value<QList<double>>) -OTR_INST_VALUE(value<QList<float>>) -OTR_INST_VALUE(value<QList<int>>) -OTR_INST_VALUE(value<QList<bool>>) -OTR_INST_VALUE(value<QList<QString>>) -OTR_INST_VALUE(value<QList<slider_value>>) -OTR_INST_VALUE(value<QList<QPointF>>) -OTR_INST_VALUE(value<QList<QVariant>>) +OTR_OPTIONS_INST_VALUE(value<double>) +OTR_OPTIONS_INST_VALUE(value<float>) +OTR_OPTIONS_INST_VALUE(value<int>) +OTR_OPTIONS_INST_VALUE(value<bool>) +OTR_OPTIONS_INST_VALUE(value<QString>) +OTR_OPTIONS_INST_VALUE(value<slider_value>) +OTR_OPTIONS_INST_VALUE(value<QPointF>) +OTR_OPTIONS_INST_VALUE(value<QVariant>) +OTR_OPTIONS_INST_VALUE(value<QList<double>>) +OTR_OPTIONS_INST_VALUE(value<QList<float>>) +OTR_OPTIONS_INST_VALUE(value<QList<int>>) +OTR_OPTIONS_INST_VALUE(value<QList<bool>>) +OTR_OPTIONS_INST_VALUE(value<QList<QString>>) +OTR_OPTIONS_INST_VALUE(value<QList<slider_value>>) +OTR_OPTIONS_INST_VALUE(value<QList<QPointF>>) +OTR_OPTIONS_INST_VALUE(value<QList<QVariant>>) } // ns options |