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

rename ChannelPrivate::number -> channelNumber

This commit is contained in:
Matt Broadstone 2014-06-04 09:50:31 -04:00
parent 343609d884
commit 1a769b2b48
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/amqp_channel.cpp
View File

@ -10,7 +10,7 @@ using namespace QAMQP;
int ChannelPrivate::nextChannelNumber = 0; int ChannelPrivate::nextChannelNumber = 0;
ChannelPrivate::ChannelPrivate(Channel *q) ChannelPrivate::ChannelPrivate(Channel *q)
: number(0), : channelNumber(0),
opened(false), opened(false),
needOpen(true), needOpen(true),
q_ptr(q) q_ptr(q)
@ -21,11 +21,11 @@ ChannelPrivate::~ChannelPrivate()
{ {
} }
void ChannelPrivate::init(int channelNumber, Client *c) void ChannelPrivate::init(int channel, Client *c)
{ {
client = c; client = c;
needOpen = channelNumber == -1 ? true : false; needOpen = channel == -1 ? true : false;
number = channelNumber == -1 ? ++nextChannelNumber : channelNumber; channelNumber = channel == -1 ? ++nextChannelNumber : channel;
nextChannelNumber = qMax(channelNumber, (nextChannelNumber + 1)); nextChannelNumber = qMax(channelNumber, (nextChannelNumber + 1));
} }
@ -50,14 +50,14 @@ void ChannelPrivate::stateChanged(State state)
bool ChannelPrivate::_q_method(const Frame::Method &frame) bool ChannelPrivate::_q_method(const Frame::Method &frame)
{ {
Q_ASSERT(frame.channel() == number); Q_ASSERT(frame.channel() == channelNumber);
if (frame.channel() != number) if (frame.channel() != channelNumber)
return true; return true;
if (frame.methodClass() != Frame::fcChannel) if (frame.methodClass() != Frame::fcChannel)
return false; return false;
qDebug("Channel#%d:", number); qDebug("Channel#%d:", channelNumber);
switch (frame.id()) { switch (frame.id()) {
case miOpenOk: case miOpenOk:
@ -99,9 +99,9 @@ void ChannelPrivate::open()
if (!client->isConnected()) if (!client->isConnected())
return; return;
qDebug("Open channel #%d", number); qDebug("Open channel #%d", channelNumber);
Frame::Method frame(Frame::fcChannel, miOpen); Frame::Method frame(Frame::fcChannel, miOpen);
frame.setChannel(number); frame.setChannel(channelNumber);
QByteArray arguments; QByteArray arguments;
arguments.resize(1); arguments.resize(1);
@ -196,7 +196,7 @@ void ChannelPrivate::setQOS(qint32 prefetchSize, quint16 prefetchCount)
Q_UNUSED(prefetchSize) Q_UNUSED(prefetchSize)
Q_UNUSED(prefetchCount) Q_UNUSED(prefetchCount)
qDebug() << Q_FUNC_INFO << "temporarily disabled"; qDebug() << Q_FUNC_INFO << "temporarily disabled";
// client_->d_func()->connection_->d_func()->setQOS(prefetchSize, prefetchCount, number, false); // client_->d_func()->connection_->d_func()->setQOS(prefetchSize, prefetchCount, channelNumber, false);
} }
void ChannelPrivate::_q_disconnected() void ChannelPrivate::_q_disconnected()
@ -249,7 +249,7 @@ QString Channel::name() const
int Channel::channelNumber() const int Channel::channelNumber() const
{ {
Q_D(const Channel); Q_D(const Channel);
return d->number; return d->channelNumber;
} }
void Channel::setName(const QString &name) void Channel::setName(const QString &name)

4
src/amqp_channel_p.h
View File

@ -46,7 +46,7 @@ public:
ChannelPrivate(Channel *q); ChannelPrivate(Channel *q);
virtual ~ChannelPrivate(); virtual ~ChannelPrivate();
void init(int channelNumber, Client *client); void init(int channel, Client *client);
void stateChanged(State state); void stateChanged(State state);
void setQOS(qint32 prefetchSize, quint16 prefetchCount); void setQOS(qint32 prefetchSize, quint16 prefetchCount);
@ -72,7 +72,7 @@ public:
QPointer<Client> client; QPointer<Client> client;
QString name; QString name;
int number; int channelNumber;
static int nextChannelNumber; static int nextChannelNumber;
bool opened; bool opened;
bool needOpen; bool needOpen;

10
src/amqp_exchange.cpp
View File

@ -41,7 +41,7 @@ void ExchangePrivate::declare()
} }
Frame::Method frame(Frame::fcExchange, ExchangePrivate::miDeclare); Frame::Method frame(Frame::fcExchange, ExchangePrivate::miDeclare);
frame.setChannel(number); frame.setChannel(channelNumber);
QByteArray args; QByteArray args;
QDataStream stream(&args, QIODevice::WriteOnly); QDataStream stream(&args, QIODevice::WriteOnly);
@ -164,7 +164,7 @@ void Exchange::remove(bool ifUnused, bool noWait)
{ {
Q_D(Exchange); Q_D(Exchange);
Frame::Method frame(Frame::fcExchange, ExchangePrivate::miDelete); Frame::Method frame(Frame::fcExchange, ExchangePrivate::miDelete);
frame.setChannel(d->number); frame.setChannel(d->channelNumber);
QByteArray arguments; QByteArray arguments;
QDataStream stream(&arguments, QIODevice::WriteOnly); QDataStream stream(&arguments, QIODevice::WriteOnly);
@ -218,7 +218,7 @@ void Exchange::publish(const QByteArray &message, const QString &key,
{ {
Q_D(Exchange); Q_D(Exchange);
Frame::Method frame(Frame::fcBasic, ExchangePrivate::bmPublish); Frame::Method frame(Frame::fcBasic, ExchangePrivate::bmPublish);
frame.setChannel(d->number); frame.setChannel(d->channelNumber);
QByteArray arguments; QByteArray arguments;
QDataStream out(&arguments, QIODevice::WriteOnly); QDataStream out(&arguments, QIODevice::WriteOnly);
@ -232,7 +232,7 @@ void Exchange::publish(const QByteArray &message, const QString &key,
d->sendFrame(frame); d->sendFrame(frame);
Frame::Content content(Frame::fcBasic); Frame::Content content(Frame::fcBasic);
content.setChannel(d->number); content.setChannel(d->channelNumber);
content.setProperty(Frame::Content::cpContentType, mimeType); content.setProperty(Frame::Content::cpContentType, mimeType);
content.setProperty(Frame::Content::cpContentEncoding, "utf-8"); content.setProperty(Frame::Content::cpContentEncoding, "utf-8");
content.setProperty(Frame::Content::cpHeaders, headers); content.setProperty(Frame::Content::cpHeaders, headers);
@ -249,7 +249,7 @@ void Exchange::publish(const QByteArray &message, const QString &key,
for (int sent = 0; sent < fullSize; sent += (FRAME_MAX - 7)) { for (int sent = 0; sent < fullSize; sent += (FRAME_MAX - 7)) {
Frame::ContentBody body; Frame::ContentBody body;
QByteArray partition = message.mid(sent, (FRAME_MAX - 7)); QByteArray partition = message.mid(sent, (FRAME_MAX - 7));
body.setChannel(d->number); body.setChannel(d->channelNumber);
body.setBody(partition); body.setBody(partition);
d->sendFrame(body); d->sendFrame(body);
} }

24
src/amqp_queue.cpp
View File

@ -77,8 +77,8 @@ bool QueuePrivate::_q_method(const Frame::Method &frame)
void QueuePrivate::_q_content(const Frame::Content &frame) void QueuePrivate::_q_content(const Frame::Content &frame)
{ {
Q_ASSERT(frame.channel() == number); Q_ASSERT(frame.channel() == channelNumber);
if (frame.channel() != number) if (frame.channel() != channelNumber)
return; return;
if (messages.isEmpty()) { if (messages.isEmpty()) {
@ -97,8 +97,8 @@ void QueuePrivate::_q_content(const Frame::Content &frame)
void QueuePrivate::_q_body(const Frame::ContentBody &frame) void QueuePrivate::_q_body(const Frame::ContentBody &frame)
{ {
Q_Q(Queue); Q_Q(Queue);
Q_ASSERT(frame.channel() == number); Q_ASSERT(frame.channel() == channelNumber);
if (frame.channel() != number) if (frame.channel() != channelNumber)
return; return;
if (messages.isEmpty()) { if (messages.isEmpty()) {
@ -280,7 +280,7 @@ void Queue::declare(const QString &name, QueueOptions options)
} }
Frame::Method frame(Frame::fcQueue, QueuePrivate::miDeclare); Frame::Method frame(Frame::fcQueue, QueuePrivate::miDeclare);
frame.setChannel(d->number); frame.setChannel(d->channelNumber);
QByteArray arguments; QByteArray arguments;
QDataStream out(&arguments, QIODevice::WriteOnly); QDataStream out(&arguments, QIODevice::WriteOnly);
@ -305,7 +305,7 @@ void Queue::remove(bool ifUnused, bool ifEmpty, bool noWait)
} }
Frame::Method frame(Frame::fcQueue, QueuePrivate::miDelete); Frame::Method frame(Frame::fcQueue, QueuePrivate::miDelete);
frame.setChannel(d->number); frame.setChannel(d->channelNumber);
QByteArray arguments; QByteArray arguments;
QDataStream out(&arguments, QIODevice::WriteOnly); QDataStream out(&arguments, QIODevice::WriteOnly);
@ -331,7 +331,7 @@ void Queue::purge()
return; return;
Frame::Method frame(Frame::fcQueue, QueuePrivate::miPurge); Frame::Method frame(Frame::fcQueue, QueuePrivate::miPurge);
frame.setChannel(d->number); frame.setChannel(d->channelNumber);
QByteArray arguments; QByteArray arguments;
QDataStream out(&arguments, QIODevice::WriteOnly); QDataStream out(&arguments, QIODevice::WriteOnly);
@ -364,7 +364,7 @@ void Queue::bind(const QString &exchangeName, const QString &key)
} }
Frame::Method frame(Frame::fcQueue, QueuePrivate::miBind); Frame::Method frame(Frame::fcQueue, QueuePrivate::miBind);
frame.setChannel(d->number); frame.setChannel(d->channelNumber);
QByteArray arguments; QByteArray arguments;
QDataStream out(&arguments, QIODevice::WriteOnly); QDataStream out(&arguments, QIODevice::WriteOnly);
@ -400,7 +400,7 @@ void Queue::unbind(const QString &exchangeName, const QString &key)
} }
Frame::Method frame(Frame::fcQueue, QueuePrivate::miUnbind); Frame::Method frame(Frame::fcQueue, QueuePrivate::miUnbind);
frame.setChannel(d->number); frame.setChannel(d->channelNumber);
QByteArray arguments; QByteArray arguments;
QDataStream out(&arguments, QIODevice::WriteOnly); QDataStream out(&arguments, QIODevice::WriteOnly);
@ -439,7 +439,7 @@ void Queue::consume(ConsumeOptions options)
} }
Frame::Method frame(Frame::fcBasic, QueuePrivate::bmConsume); Frame::Method frame(Frame::fcBasic, QueuePrivate::bmConsume);
frame.setChannel(d->number); frame.setChannel(d->channelNumber);
QByteArray arguments; QByteArray arguments;
QDataStream out(&arguments, QIODevice::WriteOnly); QDataStream out(&arguments, QIODevice::WriteOnly);
@ -476,7 +476,7 @@ void Queue::get()
} }
Frame::Method frame(Frame::fcBasic, QueuePrivate::bmGet); Frame::Method frame(Frame::fcBasic, QueuePrivate::bmGet);
frame.setChannel(d->number); frame.setChannel(d->channelNumber);
QByteArray arguments; QByteArray arguments;
QDataStream out(&arguments, QIODevice::WriteOnly); QDataStream out(&arguments, QIODevice::WriteOnly);
@ -499,7 +499,7 @@ void Queue::ack(const MessagePtr &message)
} }
Frame::Method frame(Frame::fcBasic, QueuePrivate::bmAck); Frame::Method frame(Frame::fcBasic, QueuePrivate::bmAck);
frame.setChannel(d->number); frame.setChannel(d->channelNumber);
QByteArray arguments; QByteArray arguments;
QDataStream out(&arguments, QIODevice::WriteOnly); QDataStream out(&arguments, QIODevice::WriteOnly);