From 88e4563455ca183e1b77364b73d5e6173af513d3 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 20 Sep 2016 21:24:40 +0200
Subject: api, compat: backport exports fix

---
 opentrack-compat/options.hpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'opentrack-compat/options.hpp')

diff --git a/opentrack-compat/options.hpp b/opentrack-compat/options.hpp
index a317a1f7..8485c167 100644
--- a/opentrack-compat/options.hpp
+++ b/opentrack-compat/options.hpp
@@ -37,11 +37,7 @@
 
 #include <memory>
 
-#ifdef BUILD_compat
-#   include "compat-export.hpp"
-#else
-#   include "compat-import.hpp"
-#endif
+#include "export.hpp"
 
 template<typename t> using mem = std::shared_ptr<t>;
 
@@ -131,7 +127,7 @@ namespace options {
         bool contains(const QString& name);
         void save();
         bool modifiedp();
-        
+
         template<typename t>
         t get(const QString& name)
         {
@@ -160,12 +156,12 @@ namespace options {
             pbundle bundle(const k& key);
             void bundle_decf(const k& key);
         };
-        
+
         OPENTRACK_COMPAT_EXPORT opt_singleton& singleton();
     }
-    
+
     using pbundle = std::shared_ptr<opt_bundle>;
-    
+
     static inline pbundle bundle(const QString name) { return detail::singleton().bundle(name); }
 
     class OPENTRACK_COMPAT_EXPORT opt_bundle : public impl_bundle
@@ -238,7 +234,7 @@ namespace options {
     private:
         t def;
     };
-    
+
     struct OPENTRACK_COMPAT_EXPORT opts
     {
         pbundle b;
@@ -314,7 +310,7 @@ namespace options {
         lb->setText(v);
         base_value::connect(&v, SIGNAL(valueChanged(QString)), lb, SLOT(setText(QString)), v.SAFE_CONNTYPE);
     }
-    
+
     template<>
     inline void tie_setting(value<int>& v, QTabWidget* t)
     {
-- 
cgit v1.2.3