export it all! this may be unnecessary, more investigation needed

This commit is contained in:
Matt Broadstone 2014-05-28 15:33:15 -04:00
parent 64f23fd648
commit 2ba2823b84
11 changed files with 40 additions and 20 deletions

View File

@ -1,4 +1,4 @@
QAMQP_VERSION = 1.0.0 QAMQP_VERSION = 0.3.0
isEmpty(QAMQP_LIBRARY_TYPE) { isEmpty(QAMQP_LIBRARY_TYPE) {
QAMQP_LIBRARY_TYPE = shared QAMQP_LIBRARY_TYPE = shared

View File

@ -4,10 +4,12 @@
#include <QString> #include <QString>
#include <QDataStream> #include <QDataStream>
#include "amqp_global.h"
namespace QAMQP namespace QAMQP
{ {
class Authenticator class QAMQP_EXPORT Authenticator
{ {
public: public:
virtual ~Authenticator() {} virtual ~Authenticator() {}
@ -15,7 +17,7 @@ public:
virtual void write(QDataStream &out) = 0; virtual void write(QDataStream &out) = 0;
}; };
class AMQPlainAuthenticator : public Authenticator class QAMQP_EXPORT AMQPlainAuthenticator : public Authenticator
{ {
public: public:
AMQPlainAuthenticator(const QString &login = QString(), const QString &password = QString()); AMQPlainAuthenticator(const QString &login = QString(), const QString &password = QString());

View File

@ -9,7 +9,7 @@ namespace QAMQP
class Client; class Client;
class ChannelPrivate; class ChannelPrivate;
class Channel : public QObject, public Frame::MethodHandler class QAMQP_EXPORT Channel : public QObject, public Frame::MethodHandler
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int number READ channelNumber CONSTANT) Q_PROPERTY(int number READ channelNumber CONSTANT)

View File

@ -4,6 +4,8 @@
#include <QObject> #include <QObject>
#include <QUrl> #include <QUrl>
#include "amqp_global.h"
namespace QAMQP namespace QAMQP
{ {
@ -12,7 +14,7 @@ class Queue;
class ClientPrivate; class ClientPrivate;
class Authenticator; class Authenticator;
class ConnectionPrivate; class ConnectionPrivate;
class Client : public QObject class QAMQP_EXPORT Client : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(quint32 port READ port WRITE setPort) Q_PROPERTY(quint32 port READ port WRITE setPort)

View File

@ -11,7 +11,7 @@ class Client;
class ClientPrivate; class ClientPrivate;
class ChannelPrivate; class ChannelPrivate;
class ConnectionPrivate; class ConnectionPrivate;
class Connection : public QObject, public Frame::MethodHandler class QAMQP_EXPORT Connection : public QObject, public Frame::MethodHandler
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool connected READ isConnected CONSTANT) Q_PROPERTY(bool connected READ isConnected CONSTANT)

View File

@ -10,7 +10,7 @@ class Client;
class Queue; class Queue;
class ClientPrivate; class ClientPrivate;
class ExchangePrivate; class ExchangePrivate;
class Exchange : public Channel class QAMQP_EXPORT Exchange : public Channel
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString type READ type) Q_PROPERTY(QString type READ type)

View File

@ -5,6 +5,8 @@
#include <QHash> #include <QHash>
#include <QVariant> #include <QVariant>
#include "amqp_global.h"
#define AMQP_BASIC_CONTENT_TYPE_FLAG (1 << 15) #define AMQP_BASIC_CONTENT_TYPE_FLAG (1 << 15)
#define AMQP_BASIC_CONTENT_ENCODING_FLAG (1 << 7) #define AMQP_BASIC_CONTENT_ENCODING_FLAG (1 << 7)
#define AMQP_BASIC_HEADERS_FLAG (1 << 13) #define AMQP_BASIC_HEADERS_FLAG (1 << 13)
@ -105,7 +107,7 @@ namespace Frame
* @endcode * @endcode
* octet short long 'size' octets octet * octet short long 'size' octets octet
*/ */
class Base class QAMQP_EXPORT Base
{ {
public: public:
/* /*
@ -187,7 +189,7 @@ namespace Frame
* short short ... * short short ...
* @endcode * @endcode
*/ */
class Method : public Base class QAMQP_EXPORT Method : public Base
{ {
public: public:
/* /*
@ -277,7 +279,7 @@ namespace Frame
* @sa setProperty * @sa setProperty
* @sa property * @sa property
*/ */
class Content : public Base class QAMQP_EXPORT Content : public Base
{ {
public: public:
/* /*
@ -359,7 +361,7 @@ namespace Frame
friend class QAMQP::QueuePrivate; friend class QAMQP::QueuePrivate;
}; };
class ContentBody : public Base class QAMQP_EXPORT ContentBody : public Base
{ {
public: public:
ContentBody(); ContentBody();
@ -381,7 +383,7 @@ namespace Frame
* @brief Class for working with heartbeat frames. * @brief Class for working with heartbeat frames.
* @detailed Implement frame for heartbeat send. * @detailed Implement frame for heartbeat send.
*/ */
class Heartbeat : public Base class QAMQP_EXPORT Heartbeat : public Base
{ {
public: public:
/* /*
@ -395,19 +397,19 @@ namespace Frame
void readPayload(QDataStream &stream); void readPayload(QDataStream &stream);
}; };
class MethodHandler class QAMQP_EXPORT MethodHandler
{ {
public: public:
virtual void _q_method(const Frame::Method &frame) = 0; virtual void _q_method(const Frame::Method &frame) = 0;
}; };
class ContentHandler class QAMQP_EXPORT ContentHandler
{ {
public: public:
virtual void _q_content(const Frame::Content & frame) = 0; virtual void _q_content(const Frame::Content & frame) = 0;
}; };
class ContentBodyHandler class QAMQP_EXPORT ContentBodyHandler
{ {
public: public:
virtual void _q_body(const Frame::ContentBody & frame) = 0; virtual void _q_body(const Frame::ContentBody & frame) = 0;

View File

@ -11,8 +11,18 @@
#define AMQPPSWD "guest" #define AMQPPSWD "guest"
#define FRAME_MAX 131072 #define FRAME_MAX 131072
#define QAMQP_VERSION "0.2.0" #define QAMQP_VERSION "0.3.0"
#define AMQP_CONNECTION_FORCED 320 #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__ #endif // qamqp_global_h__

View File

@ -1,15 +1,17 @@
#ifndef amqp_message_h__ #ifndef amqp_message_h__
#define amqp_message_h__ #define amqp_message_h__
#include "amqp_frame.h"
#include <QByteArray> #include <QByteArray>
#include <QHash> #include <QHash>
#include <QSharedPointer> #include <QSharedPointer>
#include "amqp_frame.h"
#include "amqp_global.h"
namespace QAMQP namespace QAMQP
{ {
struct Message struct QAMQP_EXPORT Message
{ {
Message(); Message();
virtual ~Message(); virtual ~Message();

View File

@ -10,11 +10,12 @@
#include <QBuffer> #include <QBuffer>
#include "amqp_frame.h" #include "amqp_frame.h"
#include "amqp_global.h"
namespace QAMQP namespace QAMQP
{ {
class Network : public QObject class QAMQP_EXPORT Network : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:

View File

@ -3,6 +3,7 @@
#include "amqp_channel.h" #include "amqp_channel.h"
#include "amqp_message.h" #include "amqp_message.h"
#include "amqp_global.h"
namespace QAMQP namespace QAMQP
{ {
@ -11,7 +12,7 @@ class Client;
class ClientPrivate; class ClientPrivate;
class Exchange; class Exchange;
class QueuePrivate; 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_OBJECT
Q_ENUMS(QueueOptions) Q_ENUMS(QueueOptions)