From 6139a271e038f20565516307d7face4a875fbee1 Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" Date: Sat, 29 Sep 2012 21:25:17 +0400 Subject: [PATCH 1/5] added missed stdio.h for fprintf --- src/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index baf4cf2..03950e4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,6 @@ +#include + #include #include "test.h" From 7082363b4b634e9d85a423f2a2c21146746ee4a2 Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" Date: Sat, 29 Sep 2012 21:40:07 +0400 Subject: [PATCH 2/5] fixed gcc warnings 'enumeration value not handled' --- src/qamqp/amqp_frame.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qamqp/amqp_frame.cpp b/src/qamqp/amqp_frame.cpp index 4be0fe9..e11e954 100644 --- a/src/qamqp/amqp_frame.cpp +++ b/src/qamqp/amqp_frame.cpp @@ -472,6 +472,7 @@ void QAMQP::Frame::writeField( QDataStream &s, const QVariant & value ) case QVariant::List: type = 'A'; break; + default:; } if(type) From c6da70daba74578253f48e40561643e115b09516 Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" Date: Sat, 29 Sep 2012 21:45:55 +0400 Subject: [PATCH 3/5] fixed gcc warnings 'unused variable' --- src/main.cpp | 1 + src/qamqp/amqp.cpp | 1 + src/qamqp/amqp_network.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 03950e4..bf9f996 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,6 +33,7 @@ int main(int argc, char *argv[]) Test test[1]; + Q_UNUSED(test); return a.exec(); } diff --git a/src/qamqp/amqp.cpp b/src/qamqp/amqp.cpp index 1e23cd0..add2d44 100644 --- a/src/qamqp/amqp.cpp +++ b/src/qamqp/amqp.cpp @@ -163,6 +163,7 @@ Queue * ClientPrivate::createQueue(int channelNumber, const QString &name ) void ClientPrivate::disconnect() { P_Q(QAMQP::Client); + Q_UNUSED(q); if(network_->state() != QAbstractSocket::UnconnectedState) { network_->QAMQP::Network::disconnect(); diff --git a/src/qamqp/amqp_network.cpp b/src/qamqp/amqp_network.cpp index 4d08927..c3dcb74 100644 --- a/src/qamqp/amqp_network.cpp +++ b/src/qamqp/amqp_network.cpp @@ -195,6 +195,7 @@ void QAMQP::Network::initSocket( bool ssl /*= false*/ ) void QAMQP::Network::sslErrors( const QList & errors ) { + Q_UNUSED(errors); static_cast(socket_.data())->ignoreSslErrors(); } From b1549e83cfc89dbba701f16fdbcc01ea818e9179 Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" Date: Sat, 29 Sep 2012 21:51:24 +0400 Subject: [PATCH 4/5] fixed gcc warnings: initializing order or your changes. Lines starting --- src/qamqp/amqp.cpp | 4 ++-- src/qamqp/amqp_channel.cpp | 4 ++-- src/qamqp/amqp_connection.cpp | 4 ++-- src/qamqp/amqp_frame.cpp | 2 +- src/qamqp/amqp_queue.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qamqp/amqp.cpp b/src/qamqp/amqp.cpp index add2d44..3d30382 100644 --- a/src/qamqp/amqp.cpp +++ b/src/qamqp/amqp.cpp @@ -30,10 +30,10 @@ struct ClientExceptionCleaner ////////////////////////////////////////////////////////////////////////// ClientPrivate::ClientPrivate( Client * q ) : - pq_ptr(q) - , port(AMQPPORT) + port(AMQPPORT) , host(QString::fromLatin1(AMQPHOST)) , virtualHost(QString::fromLatin1(AMQPVHOST)) + , pq_ptr(q) { } diff --git a/src/qamqp/amqp_channel.cpp b/src/qamqp/amqp_channel.cpp index 0697db6..d666177 100644 --- a/src/qamqp/amqp_channel.cpp +++ b/src/qamqp/amqp_channel.cpp @@ -131,10 +131,10 @@ void QAMQP::Channel::setQOS( qint32 prefetchSize, quint16 prefetchCount ) ////////////////////////////////////////////////////////////////////////// ChannelPrivate::ChannelPrivate(Channel * q) - :pq_ptr(q) - , number(0) + : number(0) , opened(false) , needOpen(true) + , pq_ptr(q) { } diff --git a/src/qamqp/amqp_connection.cpp b/src/qamqp/amqp_connection.cpp index d199629..987baea 100644 --- a/src/qamqp/amqp_connection.cpp +++ b/src/qamqp/amqp_connection.cpp @@ -37,9 +37,9 @@ namespace QAMQP ConnectionPrivate::ConnectionPrivate( Connection * q) - :pq_ptr(q) - , closed_(false) + : closed_(false) , connected(false) + , pq_ptr(q) { } diff --git a/src/qamqp/amqp_frame.cpp b/src/qamqp/amqp_frame.cpp index e11e954..209b6e7 100644 --- a/src/qamqp/amqp_frame.cpp +++ b/src/qamqp/amqp_frame.cpp @@ -7,7 +7,7 @@ #include using namespace QAMQP::Frame; -Base::Base( Type type ) :type_(type), channel_(0), size_(0) {} +Base::Base( Type type ) : size_(0), type_(type), channel_(0) {} Base::Base( QDataStream& raw ) { diff --git a/src/qamqp/amqp_queue.cpp b/src/qamqp/amqp_queue.cpp index 162fa46..bb87b32 100644 --- a/src/qamqp/amqp_queue.cpp +++ b/src/qamqp/amqp_queue.cpp @@ -180,8 +180,8 @@ QueuePrivate::QueuePrivate(Queue * q) :ChannelPrivate(q) , deleyedDeclare(false) , declared(false) - , recievingMessage(false) , noAck(true) + , recievingMessage(false) { } @@ -564,4 +564,4 @@ void QueuePrivate::_q_body( int channeNumber, const QByteArray & body ) { QMetaObject::invokeMethod(pq_func(), "messageRecieved"); } -} \ No newline at end of file +} From b0abf3d2c1cdca7e12ba45a8189912728c77764c Mon Sep 17 00:00:00 2001 From: "Matwey V. Kornilov" Date: Sat, 29 Sep 2012 22:00:59 +0400 Subject: [PATCH 5/5] fixed comparison that was always true due to limited range of data type --- src/qamqp/amqp_frame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qamqp/amqp_frame.cpp b/src/qamqp/amqp_frame.cpp index 209b6e7..6914224 100644 --- a/src/qamqp/amqp_frame.cpp +++ b/src/qamqp/amqp_frame.cpp @@ -64,7 +64,7 @@ void QAMQP::Frame::Base::readHeader( QDataStream & stream ) void QAMQP::Frame::Base::readEnd( QDataStream & stream ) { - char end_ = 0; + unsigned char end_ = 0; stream.readRawData(reinterpret_cast(&end_), sizeof(end_)); if(end_ != AMQP_FRAME_END ) {