diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-03-28 11:00:31 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-03-28 11:08:56 +0200 |
| commit | 7337f89f4d69cc0e5fe3a72f9f6773ecf9b24cc5 (patch) | |
| tree | d24194237167fa7a1e5303b78c8bc2b2017475b7 /spline | |
| parent | 783739a2f3599e00869f907ed1747491b35486b1 (diff) | |
start renaming internal macros as OPENTRACK_* to OTR_*
Diffstat (limited to 'spline')
| -rw-r--r-- | spline/export.hpp | 28 | ||||
| -rw-r--r-- | spline/spline-widget.hpp | 2 | ||||
| -rw-r--r-- | spline/spline.hpp | 4 |
3 files changed, 9 insertions, 25 deletions
diff --git a/spline/export.hpp b/spline/export.hpp index 4875b4c1..180ce0f2 100644 --- a/spline/export.hpp +++ b/spline/export.hpp @@ -1,27 +1,11 @@ +// generates export.hpp for each module from compat/linkage.hpp + #pragma once -#ifdef BUILD_spline_widget -# ifdef _WIN32 -# define OPENTRACK_SPLINE_LINKAGE __declspec(dllexport) -# else -# define OPENTRACK_SPLINE_LINKAGE -# endif +#include "compat/linkage-macros.hpp" -# ifndef _MSC_VER -# define OPENTRACK_SPLINE_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_SPLINE_LINKAGE -# else -# define OPENTRACK_SPLINE_EXPORT OPENTRACK_SPLINE_LINKAGE -# endif +#ifdef BUILD_SPLINE +# define OTR_SPLINE_EXPORT OTR_GENERIC_EXPORT #else - #ifdef _WIN32 - # define OPENTRACK_SPLINE_LINKAGE __declspec(dllimport) - #else - # define OPENTRACK_SPLINE_LINKAGE - #endif - - #ifndef _MSC_VER - # define OPENTRACK_SPLINE_EXPORT __attribute__ ((visibility ("default"))) OPENTRACK_SPLINE_LINKAGE - #else - # define OPENTRACK_SPLINE_EXPORT OPENTRACK_SPLINE_LINKAGE - #endif +# define OTR_SPLINE_EXPORT OTR_GENERIC_IMPORT #endif diff --git a/spline/spline-widget.hpp b/spline/spline-widget.hpp index 4d5a7680..062db493 100644 --- a/spline/spline-widget.hpp +++ b/spline/spline-widget.hpp @@ -27,7 +27,7 @@ using namespace options; #include <QDebug> -class OPENTRACK_SPLINE_EXPORT spline_widget final : public QWidget +class OTR_SPLINE_EXPORT spline_widget final : public QWidget { Q_OBJECT Q_PROPERTY(QColor colorBezier READ colorBezier WRITE setColorBezier) diff --git a/spline/spline.hpp b/spline/spline.hpp index 77b2bdf9..067967b5 100644 --- a/spline/spline.hpp +++ b/spline/spline.hpp @@ -26,7 +26,7 @@ using namespace options; namespace spline_detail { -class OPENTRACK_SPLINE_EXPORT settings final : public QObject +class OTR_SPLINE_EXPORT settings final : public QObject { Q_OBJECT public: @@ -40,7 +40,7 @@ signals: } -class OPENTRACK_SPLINE_EXPORT spline final +class OTR_SPLINE_EXPORT spline final { double precision(const QList<QPointF>& points) const; void update_interp_data(); |