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

style fixes

This commit is contained in:
Matt Broadstone 2014-05-30 17:20:11 -04:00
parent 477cca3d69
commit 4aa8397f2a
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/amqp_client.h
View File

@ -12,9 +12,8 @@ namespace QAMQP
class Exchange; class Exchange;
class Queue; class Queue;
class ClientPrivate;
class Authenticator; class Authenticator;
class ConnectionPrivate; class ClientPrivate;
class QAMQP_EXPORT Client : public QObject class QAMQP_EXPORT Client : public QObject
{ {
Q_OBJECT Q_OBJECT

5
src/amqp_frame.cpp
View File

@ -27,7 +27,8 @@ Type Base::type() const
} }
Base::~Base() Base::~Base()
{} {
}
void Base::setChannel(qint16 channel) void Base::setChannel(qint16 channel)
{ {
@ -291,7 +292,7 @@ QDataStream &Frame::deserialize(QDataStream &stream, Frame::TableField &f)
stream >> data; stream >> data;
QDataStream s(&data, QIODevice::ReadOnly); QDataStream s(&data, QIODevice::ReadOnly);
while(!s.atEnd()) { while (!s.atEnd()) {
qint8 valueType = 0; qint8 valueType = 0;
QString name = readField('s', s).toString(); QString name = readField('s', s).toString();
s >> valueType; s >> valueType;

19
src/amqp_network.cpp
View File

@ -24,7 +24,7 @@ Network::~Network()
void Network::connectTo(const QString &host, quint16 port) void Network::connectTo(const QString &host, quint16 port)
{ {
if(!socket_) { if (!socket_) {
qWarning("AMQP: Socket didn't create."); qWarning("AMQP: Socket didn't create.");
return; return;
} }
@ -39,7 +39,7 @@ void Network::connectTo(const QString &host, quint16 port)
if (isSsl()) { if (isSsl()) {
#ifndef QT_NO_SSL #ifndef QT_NO_SSL
static_cast<QSslSocket *>(socket_.data())->connectToHostEncrypted(h, p); static_cast<QSslSocket*>(socket_.data())->connectToHostEncrypted(h, p);
#else #else
qWarning("AMQP: You library has builded with QT_NO_SSL option."); qWarning("AMQP: You library has builded with QT_NO_SSL option.");
#endif #endif
@ -110,7 +110,7 @@ void Network::readyRead()
if (frame.methodClass() == Frame::fcConnection) { if (frame.methodClass() == Frame::fcConnection) {
m_pMethodHandlerConnection->_q_method(frame); m_pMethodHandlerConnection->_q_method(frame);
} else { } else {
foreach(Frame::MethodHandler *pMethodHandler, m_methodHandlersByChannel[frame.channel()]) foreach (Frame::MethodHandler *pMethodHandler, m_methodHandlersByChannel[frame.channel()])
pMethodHandler->_q_method(frame); pMethodHandler->_q_method(frame);
} }
} }
@ -118,14 +118,14 @@ void Network::readyRead()
case Frame::ftHeader: case Frame::ftHeader:
{ {
Frame::Content frame(streamB); Frame::Content frame(streamB);
foreach(Frame::ContentHandler *pMethodHandler, m_contentHandlerByChannel[frame.channel()]) foreach (Frame::ContentHandler *pMethodHandler, m_contentHandlerByChannel[frame.channel()])
pMethodHandler->_q_content(frame); pMethodHandler->_q_content(frame);
} }
break; break;
case Frame::ftBody: case Frame::ftBody:
{ {
Frame::ContentBody frame(streamB); Frame::ContentBody frame(streamB);
foreach(Frame::ContentBodyHandler *pMethodHandler, m_bodyHandlersByChannel[frame.channel()]) foreach (Frame::ContentBodyHandler *pMethodHandler, m_bodyHandlersByChannel[frame.channel()])
pMethodHandler->_q_body(frame); pMethodHandler->_q_body(frame);
} }
break; break;
@ -143,10 +143,13 @@ void Network::readyRead()
void Network::sendFrame(const Frame::Base &frame) void Network::sendFrame(const Frame::Base &frame)
{ {
if (socket_->state() == QAbstractSocket::ConnectedState) { if (socket_->state() != QAbstractSocket::ConnectedState) {
QDataStream stream(socket_); qDebug() << Q_FUNC_INFO << "socket not connected: " << socket_->state();
frame.toStream(stream); return;
} }
QDataStream stream(socket_);
frame.toStream(stream);
} }
bool Network::isSsl() const bool Network::isSsl() const

4
src/amqp_network.h
View File

@ -23,8 +23,6 @@ public:
~Network(); ~Network();
void disconnect(); void disconnect();
void sendFrame();
void sendFrame(const Frame::Base &frame); void sendFrame(const Frame::Base &frame);
bool isSsl() const; bool isSsl() const;
@ -41,7 +39,7 @@ public:
void addContentHandlerForChannel(Channel channel, Frame::ContentHandler *pHandler); void addContentHandlerForChannel(Channel channel, Frame::ContentHandler *pHandler);
void addContentBodyHandlerForChannel(Channel channel, Frame::ContentBodyHandler *pHandler); void addContentBodyHandlerForChannel(Channel channel, Frame::ContentBodyHandler *pHandler);
public slots: public Q_SLOTS:
void connectTo(const QString &host = QString(), quint16 port = 0); void connectTo(const QString &host = QString(), quint16 port = 0);
void error(QAbstractSocket::SocketError socketError); void error(QAbstractSocket::SocketError socketError);