Merge pull request #5 from matwey/master

fixed compiling for gcc 4.7

src/main.cpp

@@ -1,4 +1,6 @@
 
+#include <stdio.h>
+
 #include <QtCore/QCoreApplication>
 #include "test.h"
 
@@ -31,6 +33,7 @@ int main(int argc, char *argv[])
 
 	
 	Test test[1];
+	Q_UNUSED(test);
 
 	return a.exec();
 }

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)
 {
 	
 }
@@ -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();	

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)
 {
 
 }

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)
 {
 
 }

src/qamqp/amqp_frame.cpp

@@ -7,7 +7,7 @@
 #include <float.h>
 
 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 )
 {
@@ -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<char*>(&end_), sizeof(end_));
 	if(end_ != AMQP_FRAME_END )
 	{
@@ -472,6 +472,7 @@ void QAMQP::Frame::writeField( QDataStream &s, const QVariant & value )
 	case QVariant::List:
 		type = 'A';
 		break;
+	default:;
 	}
 
 	if(type)

src/qamqp/amqp_network.cpp

@@ -195,6 +195,7 @@ void QAMQP::Network::initSocket( bool ssl /*= false*/ )
 
 void QAMQP::Network::sslErrors( const QList<QSslError> & errors )
 {
+	Q_UNUSED(errors);
 	static_cast<QSslSocket*>(socket_.data())->ignoreSslErrors();
 }
 

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");
 	}
-}
+}