rename amqp => amqp_client

src/amqp_channel.cpp

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

src/amqp_client.cpp

@@ -1,5 +1,5 @@
-#include "amqp.h"
-#include "amqp_p.h"
+#include "amqp_client.h"
+#include "amqp_client_p.h"
 
 #include <QTextStream>
 #include <QCoreApplication>
@@ -12,26 +12,6 @@
 
 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)
     : port(AMQPPORT),
       host(QString::fromLatin1(AMQPHOST)),

src/amqp_client.h

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

src/amqp_client_p.h

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

src/amqp_connection.cpp

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

src/src.pro

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

tests/manual/qamqp/QamqpApp.h

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

tests/manual/qamqp/pubsub/EmitLog.h

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

tests/manual/qamqp/pubsub/ReceiveLog.h

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

tests/manual/qamqp/routing/EmitLogDirect.h

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

tests/manual/qamqp/routing/ReceiveLogDirect.h

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

tests/manual/qamqp/sendreceive/Receive.h

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

tests/manual/qamqp/sendreceive/Send.h

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

tests/manual/qamqp/workqueues/NewTask.h

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

tests/manual/qamqp/workqueues/Worker.h

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