diff options
Diffstat (limited to 'compat')
-rw-r--r-- | compat/base-path.cpp | 2 | ||||
-rw-r--r-- | compat/camera-names.cpp | 4 | ||||
-rw-r--r-- | compat/check-visible.cpp | 4 | ||||
-rw-r--r-- | compat/check-visible.hpp | 7 | ||||
-rw-r--r-- | compat/euler.cpp | 4 | ||||
-rw-r--r-- | compat/sleep.cpp | 2 |
6 files changed, 10 insertions, 13 deletions
diff --git a/compat/base-path.cpp b/compat/base-path.cpp index f207eca0..4ef3762e 100644 --- a/compat/base-path.cpp +++ b/compat/base-path.cpp @@ -1,8 +1,6 @@ #include "base-path.hpp" #include <QCoreApplication> -OTR_COMPAT_EXPORT -cc_noinline const QString& application_base_path() { static QString const& const_path = QCoreApplication::applicationDirPath(); diff --git a/compat/camera-names.cpp b/compat/camera-names.cpp index c88bae75..23649d38 100644 --- a/compat/camera-names.cpp +++ b/compat/camera-names.cpp @@ -17,7 +17,7 @@ #include <QDebug> -OTR_COMPAT_EXPORT int camera_name_to_index(const QString &name) +int camera_name_to_index(const QString &name) { auto list = get_camera_names(); int ret = list.indexOf(name); @@ -26,7 +26,7 @@ OTR_COMPAT_EXPORT int camera_name_to_index(const QString &name) return ret; } -OTR_COMPAT_EXPORT QList<QString> get_camera_names() +QList<QString> get_camera_names() { QList<QString> ret; #if defined(_WIN32) diff --git a/compat/check-visible.cpp b/compat/check-visible.cpp index 0e154dd0..96dba60f 100644 --- a/compat/check-visible.cpp +++ b/compat/check-visible.cpp @@ -15,7 +15,6 @@ static Timer timer; static QMutex mtx; static bool visible = true; -cc_noinline OTR_COMPAT_EXPORT void set_is_visible(const QWidget& w, bool force) { QMutexLocker l(&mtx); @@ -47,7 +46,6 @@ void set_is_visible(const QWidget& w, bool force) } } -cc_noinline OTR_COMPAT_EXPORT bool check_is_visible() { QMutexLocker l(&mtx); @@ -57,12 +55,10 @@ bool check_is_visible() #else -cc_noinline OTR_COMPAT_EXPORT void set_is_visible(const QWidget&, bool) { } -cc_noinline OTR_COMPAT_EXPORT bool check_is_visible() { return true; diff --git a/compat/check-visible.hpp b/compat/check-visible.hpp index 65a20d79..e24a654b 100644 --- a/compat/check-visible.hpp +++ b/compat/check-visible.hpp @@ -5,5 +5,8 @@ #include <QWidget> -cc_noinline OTR_COMPAT_EXPORT void set_is_visible(QWidget const& w, bool force = false); -cc_noinline OTR_COMPAT_EXPORT bool check_is_visible(); +cc_noinline OTR_COMPAT_EXPORT +void set_is_visible(QWidget const& w, bool force = false); + +cc_noinline OTR_COMPAT_EXPORT +bool check_is_visible(); diff --git a/compat/euler.cpp b/compat/euler.cpp index 44b34f90..889fc53e 100644 --- a/compat/euler.cpp +++ b/compat/euler.cpp @@ -4,7 +4,7 @@ namespace euler { -euler_t OTR_COMPAT_EXPORT rmat_to_euler(const rmat& R) +euler_t rmat_to_euler(const rmat& R) { const double cy = sqrt(R(2,2)*R(2, 2) + R(2, 1)*R(2, 1)); const bool large_enough = cy > 1e-10; @@ -23,7 +23,7 @@ euler_t OTR_COMPAT_EXPORT rmat_to_euler(const rmat& R) } // tait-bryan angles, not euler -rmat OTR_COMPAT_EXPORT euler_to_rmat(const euler_t& input) +rmat euler_to_rmat(const euler_t& input) { const double H = -input(0); const double P = -input(1); diff --git a/compat/sleep.cpp b/compat/sleep.cpp index 4ec61db5..5178ae2f 100644 --- a/compat/sleep.cpp +++ b/compat/sleep.cpp @@ -8,7 +8,7 @@ namespace portable { - OTR_COMPAT_EXPORT void sleep(int milliseconds) + void sleep(int milliseconds) { if (milliseconds > 0) { |