diff --git a/qamqp.pri b/qamqp.pri index 11daaf5..a9a6f17 100644 --- a/qamqp.pri +++ b/qamqp.pri @@ -1,4 +1,4 @@ -QAMQP_VERSION = 1.0.0 +QAMQP_VERSION = 0.3.0 isEmpty(QAMQP_LIBRARY_TYPE) { QAMQP_LIBRARY_TYPE = shared diff --git a/src/amqp_authenticator.h b/src/amqp_authenticator.h index ee8cbc0..faa0aa9 100644 --- a/src/amqp_authenticator.h +++ b/src/amqp_authenticator.h @@ -4,10 +4,12 @@ #include #include +#include "amqp_global.h" + namespace QAMQP { -class Authenticator +class QAMQP_EXPORT Authenticator { public: virtual ~Authenticator() {} @@ -15,7 +17,7 @@ public: virtual void write(QDataStream &out) = 0; }; -class AMQPlainAuthenticator : public Authenticator +class QAMQP_EXPORT AMQPlainAuthenticator : public Authenticator { public: AMQPlainAuthenticator(const QString &login = QString(), const QString &password = QString()); diff --git a/src/amqp_channel.h b/src/amqp_channel.h index 09ed038..9181abf 100644 --- a/src/amqp_channel.h +++ b/src/amqp_channel.h @@ -9,7 +9,7 @@ namespace QAMQP class Client; class ChannelPrivate; -class Channel : public QObject, public Frame::MethodHandler +class QAMQP_EXPORT Channel : public QObject, public Frame::MethodHandler { Q_OBJECT Q_PROPERTY(int number READ channelNumber CONSTANT) diff --git a/src/amqp_client.h b/src/amqp_client.h index 8126614..f9107d8 100644 --- a/src/amqp_client.h +++ b/src/amqp_client.h @@ -4,6 +4,8 @@ #include #include +#include "amqp_global.h" + namespace QAMQP { @@ -12,7 +14,7 @@ class Queue; class ClientPrivate; class Authenticator; class ConnectionPrivate; -class Client : public QObject +class QAMQP_EXPORT Client : public QObject { Q_OBJECT Q_PROPERTY(quint32 port READ port WRITE setPort) diff --git a/src/amqp_connection.h b/src/amqp_connection.h index dc627a4..f14e517 100644 --- a/src/amqp_connection.h +++ b/src/amqp_connection.h @@ -11,7 +11,7 @@ class Client; class ClientPrivate; class ChannelPrivate; class ConnectionPrivate; -class Connection : public QObject, public Frame::MethodHandler +class QAMQP_EXPORT Connection : public QObject, public Frame::MethodHandler { Q_OBJECT Q_PROPERTY(bool connected READ isConnected CONSTANT) diff --git a/src/amqp_exchange.h b/src/amqp_exchange.h index 79db578..d1872b5 100644 --- a/src/amqp_exchange.h +++ b/src/amqp_exchange.h @@ -10,7 +10,7 @@ class Client; class Queue; class ClientPrivate; class ExchangePrivate; -class Exchange : public Channel +class QAMQP_EXPORT Exchange : public Channel { Q_OBJECT Q_PROPERTY(QString type READ type) diff --git a/src/amqp_frame.h b/src/amqp_frame.h index 513cf8e..bc8b49a 100644 --- a/src/amqp_frame.h +++ b/src/amqp_frame.h @@ -5,6 +5,8 @@ #include #include +#include "amqp_global.h" + #define AMQP_BASIC_CONTENT_TYPE_FLAG (1 << 15) #define AMQP_BASIC_CONTENT_ENCODING_FLAG (1 << 7) #define AMQP_BASIC_HEADERS_FLAG (1 << 13) @@ -105,7 +107,7 @@ namespace Frame * @endcode * octet short long 'size' octets octet */ - class Base + class QAMQP_EXPORT Base { public: /* @@ -187,7 +189,7 @@ namespace Frame * short short ... * @endcode */ - class Method : public Base + class QAMQP_EXPORT Method : public Base { public: /* @@ -277,7 +279,7 @@ namespace Frame * @sa setProperty * @sa property */ - class Content : public Base + class QAMQP_EXPORT Content : public Base { public: /* @@ -359,7 +361,7 @@ namespace Frame friend class QAMQP::QueuePrivate; }; - class ContentBody : public Base + class QAMQP_EXPORT ContentBody : public Base { public: ContentBody(); @@ -381,7 +383,7 @@ namespace Frame * @brief Class for working with heartbeat frames. * @detailed Implement frame for heartbeat send. */ - class Heartbeat : public Base + class QAMQP_EXPORT Heartbeat : public Base { public: /* @@ -395,19 +397,19 @@ namespace Frame void readPayload(QDataStream &stream); }; - class MethodHandler + class QAMQP_EXPORT MethodHandler { public: virtual void _q_method(const Frame::Method &frame) = 0; }; - class ContentHandler + class QAMQP_EXPORT ContentHandler { public: virtual void _q_content(const Frame::Content & frame) = 0; }; - class ContentBodyHandler + class QAMQP_EXPORT ContentBodyHandler { public: virtual void _q_body(const Frame::ContentBody & frame) = 0; diff --git a/src/amqp_global.h b/src/amqp_global.h index 0684022..33b5236 100644 --- a/src/amqp_global.h +++ b/src/amqp_global.h @@ -11,8 +11,18 @@ #define AMQPPSWD "guest" #define FRAME_MAX 131072 -#define QAMQP_VERSION "0.2.0" +#define QAMQP_VERSION "0.3.0" #define AMQP_CONNECTION_FORCED 320 +#ifdef QAMQP_SHARED +# ifdef QAMQP_BUILD +# define QAMQP_EXPORT Q_DECL_EXPORT +# else +# define QAMQP_EXPORT Q_DECL_IMPORT +# endif +#else +# define QAMQP_EXPORT +#endif + #endif // qamqp_global_h__ diff --git a/src/amqp_message.h b/src/amqp_message.h index 8a8e5c3..9a998da 100644 --- a/src/amqp_message.h +++ b/src/amqp_message.h @@ -1,15 +1,17 @@ #ifndef amqp_message_h__ #define amqp_message_h__ -#include "amqp_frame.h" #include #include #include +#include "amqp_frame.h" +#include "amqp_global.h" + namespace QAMQP { -struct Message +struct QAMQP_EXPORT Message { Message(); virtual ~Message(); diff --git a/src/amqp_network.h b/src/amqp_network.h index b7eab50..481005c 100644 --- a/src/amqp_network.h +++ b/src/amqp_network.h @@ -10,11 +10,12 @@ #include #include "amqp_frame.h" +#include "amqp_global.h" namespace QAMQP { -class Network : public QObject +class QAMQP_EXPORT Network : public QObject { Q_OBJECT public: diff --git a/src/amqp_queue.h b/src/amqp_queue.h index 233f113..0c46f9e 100644 --- a/src/amqp_queue.h +++ b/src/amqp_queue.h @@ -3,6 +3,7 @@ #include "amqp_channel.h" #include "amqp_message.h" +#include "amqp_global.h" namespace QAMQP { @@ -11,7 +12,7 @@ class Client; class ClientPrivate; class Exchange; class QueuePrivate; -class Queue : public Channel, public Frame::ContentHandler, public Frame::ContentBodyHandler +class QAMQP_EXPORT Queue : public Channel, public Frame::ContentHandler, public Frame::ContentBodyHandler { Q_OBJECT Q_ENUMS(QueueOptions)