jessequ
/
qamqp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename amqp => amqp_client

This commit is contained in:
Matt Broadstone 2014-05-28 13:05:51 -04:00
parent 7394092f60
commit cd33957147
15 changed files with 25 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/amqp_channel.cpp
View File

@ -2,8 +2,8 @@
#include "amqp_channel_p.h" #include "amqp_channel_p.h"
#include "amqp_connection_p.h" #include "amqp_connection_p.h"
#include "amqp.h" #include "amqp_client.h"
#include "amqp_p.h" #include "amqp_client_p.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDebug> #include <QDebug>

24
src/amqp.cpp → src/amqp_client.cpp
View File

@ -1,5 +1,5 @@
#include "amqp.h" #include "amqp_client.h"
#include "amqp_p.h" #include "amqp_client_p.h"
#include <QTextStream> #include <QTextStream>
#include <QCoreApplication> #include <QCoreApplication>
@ -12,26 +12,6 @@
using namespace QAMQP; using namespace QAMQP;
namespace QAMQP
{
struct ClientExceptionCleaner
{
/* this cleans up when the constructor throws an exception */
static inline void cleanup(Client *that, ClientPrivate *d)
{
#ifdef QT_NO_EXCEPTIONS
Q_UNUSED(that);
Q_UNUSED(d);
#else
Q_UNUSED(that);
Q_UNUSED(d);
#endif
}
};
}
//////////////////////////////////////////////////////////////////////////
ClientPrivate::ClientPrivate(Client * q) ClientPrivate::ClientPrivate(Client * q)
: port(AMQPPORT), : port(AMQPPORT),
host(QString::fromLatin1(AMQPHOST)), host(QString::fromLatin1(AMQPHOST)),

9
src/amqp.h → src/amqp_client.h
View File

@ -1,5 +1,5 @@
#ifndef QAMQP_H #ifndef amqp_client_h__
#define QAMQP_H #define amqp_client_h__
#include <QObject> #include <QObject>
#include <QUrl> #include <QUrl>
@ -24,7 +24,7 @@ class Client : public QObject
Q_PROPERTY(QString password READ password WRITE setPassword) Q_PROPERTY(QString password READ password WRITE setPassword)
Q_PROPERTY(bool ssl READ isSsl WRITE setSsl) Q_PROPERTY(bool ssl READ isSsl WRITE setSsl)
Q_PROPERTY(bool autoReconnect READ autoReconnect WRITE setAutoReconnect) Q_PROPERTY(bool autoReconnect READ autoReconnect WRITE setAutoReconnect)
Q_PROPERTY(bool connected READ isConnected ) Q_PROPERTY(bool connected READ isConnected)
public: public:
Client(QObject *parent = 0); Client(QObject *parent = 0);
@ -85,9 +85,8 @@ private:
friend class ConnectionPrivate; friend class ConnectionPrivate;
friend class ChannelPrivate; friend class ChannelPrivate;
friend struct ClientExceptionCleaner;
}; };
} // namespace QAMQP } // namespace QAMQP
#endif // QAMQP #endif // amqp_client_h__

6
src/amqp_p.h → src/amqp_client_p.h
View File

@ -1,5 +1,5 @@
#ifndef QAMQP_P_H #ifndef amqp_client_p_h__
#define QAMQP_P_H #define amqp_client_p_h__
#include <QSharedPointer> #include <QSharedPointer>
@ -48,4 +48,4 @@ public:
}; };
} }
#endif // amqp_p_h__ #endif // amqp_client_p_h__

4
src/amqp_connection.cpp
View File

@ -1,7 +1,7 @@
#include "amqp_connection.h" #include "amqp_connection.h"
#include "amqp_connection_p.h" #include "amqp_connection_p.h"
#include "amqp.h" #include "amqp_client.h"
#include "amqp_p.h" #include "amqp_client_p.h"
#include "amqp_frame.h" #include "amqp_frame.h"
#include <QCoreApplication> #include <QCoreApplication>

6
src/src.pro
View File

@ -11,16 +11,16 @@ VERSION = $${QAMQP_VERSION}
win32:DESTDIR = $$OUT_PWD win32:DESTDIR = $$OUT_PWD
PRIVATE_HEADERS += \ PRIVATE_HEADERS += \
amqp_p.h \
amqp_channel_p.h \ amqp_channel_p.h \
amqp_client_p.h \
amqp_connection_p.h \ amqp_connection_p.h \
amqp_exchange_p.h \ amqp_exchange_p.h \
amqp_queue_p.h amqp_queue_p.h
INSTALL_HEADERS += \ INSTALL_HEADERS += \
amqp.h \
amqp_authenticator.h \ amqp_authenticator.h \
amqp_channel.h \ amqp_channel.h \
amqp_client.h \
amqp_connection.h \ amqp_connection.h \
amqp_exchange.h \ amqp_exchange.h \
amqp_frame.h \ amqp_frame.h \
@ -34,9 +34,9 @@ HEADERS += \
$${PRIVATE_HEADERS} $${PRIVATE_HEADERS}
SOURCES += \ SOURCES += \
amqp.cpp \
amqp_authenticator.cpp \ amqp_authenticator.cpp \
amqp_channel.cpp \ amqp_channel.cpp \
amqp_client.cpp \
amqp_connection.cpp \ amqp_connection.cpp \
amqp_exchange.cpp \ amqp_exchange.cpp \
amqp_frame.cpp \ amqp_frame.cpp \

2
tests/manual/qamqp/QamqpApp.h
View File

@ -9,7 +9,7 @@
#include <QTextStream> #include <QTextStream>
#include <QTimer> #include <QTimer>
#include "amqp.h" #include "amqp_client.h"
#include "amqp_exchange.h" #include "amqp_exchange.h"
#include "amqp_queue.h" #include "amqp_queue.h"

2
tests/manual/qamqp/pubsub/EmitLog.h
View File

@ -7,7 +7,7 @@
#include <QTimer> #include <QTimer>
#include <QDateTime> #include <QDateTime>
#include "amqp.h" #include "amqp_client.h"
#include "amqp_exchange.h" #include "amqp_exchange.h"
namespace QAMQP namespace QAMQP

2
tests/manual/qamqp/pubsub/ReceiveLog.h
View File

@ -7,7 +7,7 @@
#include <QThread> #include <QThread>
#include <QTime> #include <QTime>
#include "amqp.h" #include "amqp_client.h"
#include "amqp_queue.h" #include "amqp_queue.h"
namespace QAMQP namespace QAMQP

2
tests/manual/qamqp/routing/EmitLogDirect.h
View File

@ -8,7 +8,7 @@
#include <QTimer> #include <QTimer>
#include <QDateTime> #include <QDateTime>
#include "amqp.h" #include "amqp_client.h"
#include "amqp_exchange.h" #include "amqp_exchange.h"
namespace QAMQP namespace QAMQP

2
tests/manual/qamqp/routing/ReceiveLogDirect.h
View File

@ -8,7 +8,7 @@
#include <QThread> #include <QThread>
#include <QTime> #include <QTime>
#include "amqp.h" #include "amqp_client.h"
#include "amqp_queue.h" #include "amqp_queue.h"

2
tests/manual/qamqp/sendreceive/Receive.h
View File

@ -9,7 +9,7 @@
#include <QTimer> #include <QTimer>
#include <QDateTime> #include <QDateTime>
#include "amqp.h" #include "amqp_client.h"
#include "amqp_queue.h" #include "amqp_queue.h"

2
tests/manual/qamqp/sendreceive/Send.h
View File

@ -9,7 +9,7 @@
#include <QTimer> #include <QTimer>
#include <QDateTime> #include <QDateTime>
#include "amqp.h" #include "amqp_client.h"
#include "amqp_exchange.h" #include "amqp_exchange.h"
#include "amqp_queue.h" #include "amqp_queue.h"

2
tests/manual/qamqp/workqueues/NewTask.h
View File

@ -7,7 +7,7 @@
#include <QTimer> #include <QTimer>
#include <QDateTime> #include <QDateTime>
#include "amqp.h" #include "amqp_client.h"
#include "amqp_exchange.h" #include "amqp_exchange.h"
#include "amqp_queue.h" #include "amqp_queue.h"

3
tests/manual/qamqp/workqueues/Worker.h
View File

@ -7,10 +7,9 @@
#include <QThread> #include <QThread>
#include <QTime> #include <QTime>
#include "amqp.h" #include "amqp_client.h"
#include "amqp_queue.h" #include "amqp_queue.h"
namespace QAMQP namespace QAMQP
{ {