start renaming internal macros as OPENTRACK_* to OTR_*

9 files changed, 19 insertions, 36 deletions

diff --git a/logic/export.hpp b/logic/export.hpp
index 2503f3a6..b737e98e 100644
--- a/logic/export.hpp
+++ b/logic/export.hpp
@@ -1,28 +1,11 @@
-#pragma once
+// generates export.hpp for each module from compat/linkage.hpp
 
-#ifdef BUILD_logic
-#   ifdef _WIN32
-#       define OPENTRACK_LOGIC_LINKAGE __declspec(dllexport)
-#   else
-#       define OPENTRACK_LOGIC_LINKAGE
-#   endif
+#pragma once
 
-#   ifndef _MSC_VER
-#       define OPENTRACK_LOGIC_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LOGIC_LINKAGE
-#   else
-#       define OPENTRACK_LOGIC_EXPORT OPENTRACK_LOGIC_LINKAGE
-#   endif
+#include "compat/linkage-macros.hpp"
 
+#ifdef BUILD_LOGIC
+#   define OTR_LOGIC_EXPORT OTR_GENERIC_EXPORT
 #else
-#ifdef _WIN32
-#    define OPENTRACK_LOGIC_LINKAGE __declspec(dllimport)
-#else
-#    define OPENTRACK_LOGIC_LINKAGE
-#endif
-
-#ifndef _MSC_VER
-#    define OPENTRACK_LOGIC_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_LOGIC_LINKAGE
-#else
-#    define OPENTRACK_LOGIC_EXPORT OPENTRACK_LOGIC_LINKAGE
-#endif
+#   define OTR_LOGIC_EXPORT OTR_GENERIC_IMPORT
 #endif
diff --git a/logic/main-settings.hpp b/logic/main-settings.hpp
index 49894820..20805059 100644
--- a/logic/main-settings.hpp
+++ b/logic/main-settings.hpp
@@ -21,7 +21,7 @@ namespace axis_clamp_opts
 
 } // ns axis-clamp-opts
 
-struct OPENTRACK_LOGIC_EXPORT axis_opts final
+struct OTR_LOGIC_EXPORT axis_opts final
 {
     enum max_clamp
     {
@@ -52,7 +52,7 @@ private:
     static inline QString n(QString pfx, QString name);
 };
 
-struct OPENTRACK_LOGIC_EXPORT key_opts
+struct OTR_LOGIC_EXPORT key_opts
 {
     value<QString> keycode, guid;
     value<int> button;
@@ -60,14 +60,14 @@ struct OPENTRACK_LOGIC_EXPORT key_opts
     key_opts(bundle b, const QString& name);
 };
 
-struct OPENTRACK_LOGIC_EXPORT module_settings
+struct OTR_LOGIC_EXPORT module_settings
 {
     bundle b;
     value<QString> tracker_dll, filter_dll, protocol_dll;
     module_settings();
 };
 
-struct OPENTRACK_LOGIC_EXPORT main_settings final
+struct OTR_LOGIC_EXPORT main_settings final
 {
     bundle b, b_map;
     axis_opts a_x, a_y, a_z;
diff --git a/logic/mappings.hpp b/logic/mappings.hpp
index 6d028c10..4e0f7218 100644
--- a/logic/mappings.hpp
+++ b/logic/mappings.hpp
@@ -13,7 +13,7 @@ using namespace options;
 #include "spline/spline.hpp"
 #include "main-settings.hpp"
 
-struct OPENTRACK_LOGIC_EXPORT Map final
+struct OTR_LOGIC_EXPORT Map final
 {
     Map(QString primary, QString secondary, int max_x, int max_y, axis_opts& opts);
 
@@ -25,7 +25,7 @@ struct OPENTRACK_LOGIC_EXPORT Map final
     spline spline_main, spline_alt;
 };
 
-class OPENTRACK_LOGIC_EXPORT Mappings final
+class OTR_LOGIC_EXPORT Mappings final
 {
 private:
     Map axes[6];
diff --git a/logic/selected-libraries.hpp b/logic/selected-libraries.hpp
index d782374c..689cbec3 100644
--- a/logic/selected-libraries.hpp
+++ b/logic/selected-libraries.hpp
@@ -13,7 +13,7 @@
 
 #include "export.hpp"
 
-struct OPENTRACK_LOGIC_EXPORT SelectedLibraries
+struct OTR_LOGIC_EXPORT SelectedLibraries
 {
     using dylibptr = mem<dylib>;
     mem<ITracker> pTracker;
diff --git a/logic/shortcuts.h b/logic/shortcuts.h
index 5a96e983..5f23d2e7 100644
--- a/logic/shortcuts.h
+++ b/logic/shortcuts.h
@@ -27,7 +27,7 @@
 
 using namespace options;
 
-struct OPENTRACK_LOGIC_EXPORT Shortcuts final : public QObject
+struct OTR_LOGIC_EXPORT Shortcuts final : public QObject
 {
     Q_OBJECT
 
diff --git a/logic/tracker.h b/logic/tracker.h
index 6b9b07ee..4295822e 100644
--- a/logic/tracker.h
+++ b/logic/tracker.h
@@ -51,7 +51,7 @@ struct bits
     bits();
 };
 
-class OPENTRACK_LOGIC_EXPORT Tracker : private QThread, private bits
+class OTR_LOGIC_EXPORT Tracker : private QThread, private bits
 {
     Q_OBJECT
 private:
diff --git a/logic/tracklogger.hpp b/logic/tracklogger.hpp
index 19e16fef..0a8d5410 100644
--- a/logic/tracklogger.hpp
+++ b/logic/tracklogger.hpp
@@ -8,7 +8,7 @@
 #include <QMessageBox>
 #include <QWidget>
 
-class OPENTRACK_LOGIC_EXPORT TrackLogger
+class OTR_LOGIC_EXPORT TrackLogger
 {
     TrackLogger(TrackLogger&&) = delete;
     TrackLogger(const TrackLogger&) = delete;
@@ -46,7 +46,7 @@ public:
 };
 
 
-class OPENTRACK_LOGIC_EXPORT TrackLoggerCSV : public TrackLogger
+class OTR_LOGIC_EXPORT TrackLoggerCSV : public TrackLogger
 {
     std::ofstream out;
     bool first_col;
diff --git a/logic/win32-shortcuts.h b/logic/win32-shortcuts.h
index 7626a31f..4e32c9ea 100644
--- a/logic/win32-shortcuts.h
+++ b/logic/win32-shortcuts.h
@@ -12,7 +12,7 @@ extern QList<win_key> windows_key_sequences;
 
 #include "export.hpp"
 
-struct OPENTRACK_LOGIC_EXPORT win_key
+struct OTR_LOGIC_EXPORT win_key
 {
     win_key(int win, Qt::Key qt) : win(win), qt(qt) {}
     int win;
diff --git a/logic/work.hpp b/logic/work.hpp
index f0aae28a..f1d5e401 100644
--- a/logic/work.hpp
+++ b/logic/work.hpp
@@ -24,7 +24,7 @@
 #include <tuple>
 #include <functional>
 
-struct OPENTRACK_LOGIC_EXPORT Work
+struct OTR_LOGIC_EXPORT Work
 {
     using fn_t = std::function<void(bool)>;
     using key_tuple = std::tuple<key_opts&, fn_t, bool>;