diff --git a/MessageServer.hpp b/MessageServer.hpp index bb75015..3007262 100644 --- a/MessageServer.hpp +++ b/MessageServer.hpp @@ -7,7 +7,6 @@ #include #include -#include "udp_export.h" #include "Radio.hpp" #include "pimpl_h.hpp" @@ -23,7 +22,7 @@ class QString; // applications that use the Qt framework. Other applications should // use this classes' implementation as a reference implementation. // -class UDP_EXPORT MessageServer +class MessageServer : public QObject { Q_OBJECT; diff --git a/Radio.hpp b/Radio.hpp index 7f8b0a0..afb0fd1 100644 --- a/Radio.hpp +++ b/Radio.hpp @@ -5,8 +5,6 @@ #include #include -#include "udp_export.h" - class QVariant; class QString; @@ -34,27 +32,27 @@ namespace Radio // QVariant argument is convertible to double and is assumed to // be scaled by (10 ** -scale). // - Frequency UDP_EXPORT frequency (QVariant const&, int scale, + Frequency frequency (QVariant const&, int scale, bool * ok = nullptr, QLocale const& = QLocale ()); - FrequencyDelta UDP_EXPORT frequency_delta (QVariant const&, int scale, + FrequencyDelta frequency_delta (QVariant const&, int scale, bool * ok = nullptr, QLocale const& = QLocale ()); // // Frequency type formatting // - QString UDP_EXPORT frequency_MHz_string (Frequency, QLocale const& = QLocale ()); - QString UDP_EXPORT frequency_MHz_string (FrequencyDelta, QLocale const& = QLocale ()); - QString UDP_EXPORT pretty_frequency_MHz_string (Frequency, QLocale const& = QLocale ()); - QString UDP_EXPORT pretty_frequency_MHz_string (double, int scale, QLocale const& = QLocale ()); - QString UDP_EXPORT pretty_frequency_MHz_string (FrequencyDelta, QLocale const& = QLocale ()); + QString frequency_MHz_string (Frequency, QLocale const& = QLocale ()); + QString frequency_MHz_string (FrequencyDelta, QLocale const& = QLocale ()); + QString pretty_frequency_MHz_string (Frequency, QLocale const& = QLocale ()); + QString pretty_frequency_MHz_string (double, int scale, QLocale const& = QLocale ()); + QString pretty_frequency_MHz_string (FrequencyDelta, QLocale const& = QLocale ()); // // Callsigns // - bool UDP_EXPORT is_callsign (QString const&); - bool UDP_EXPORT is_compound_callsign (QString const&); - QString UDP_EXPORT base_callsign (QString); - QString UDP_EXPORT effective_prefix (QString); + bool is_callsign (QString const&); + bool is_compound_callsign (QString const&); + QString base_callsign (QString); + QString effective_prefix (QString); } Q_DECLARE_METATYPE (Radio::Frequency);