From 6a3d355de2d0f83854ae04208e3d3e85ad328647 Mon Sep 17 00:00:00 2001 From: Matt Broadstone Date: Tue, 26 Aug 2014 15:05:39 -0400 Subject: [PATCH] rename amqp_ files to qamqp amqp_ is used in at least two other C/C++ projects related to amqp, so this commit changes all our source to use a qamqp header. This avoids potential clashes, and is more in line with Qt style --- ...thenticator.cpp => qamqpauthenticator.cpp} | 6 +-- ...p_authenticator.h => qamqpauthenticator.h} | 8 ++-- src/{amqp_channel.cpp => qamqpchannel.cpp} | 10 ++--- src/{amqp_channel.h => qamqpchannel.h} | 8 ++-- src/{amqp_channel_p.h => qamqpchannel_p.h} | 8 ++-- src/{amqp_client.cpp => qamqpclient.cpp} | 20 ++++----- src/{amqp_client.h => qamqpclient.h} | 8 ++-- src/{amqp_client_p.h => qamqpclient_p.h} | 10 ++--- src/{amqp_exchange.cpp => qamqpexchange.cpp} | 12 +++-- src/{amqp_exchange.h => qamqpexchange.h} | 12 ++--- src/{amqp_exchange_p.h => qamqpexchange_p.h} | 12 ++--- src/{amqp_frame.cpp => qamqpframe.cpp} | 6 +-- src/{amqp_frame_p.h => qamqpframe_p.h} | 10 ++--- src/{amqp_global.h => qamqpglobal.h} | 6 +-- src/{amqp_message.cpp => qamqpmessage.cpp} | 6 +-- src/{amqp_message.h => qamqpmessage.h} | 8 ++-- src/{amqp_message_p.h => qamqpmessage_p.h} | 10 ++--- src/{amqp_queue.cpp => qamqpqueue.cpp} | 14 +++--- src/{amqp_queue.h => qamqpqueue.h} | 12 ++--- src/{amqp_queue_p.h => qamqpqueue_p.h} | 8 ++-- src/{amqp_table.cpp => qamqptable.cpp} | 4 +- src/{amqp_table.h => qamqptable.h} | 9 ++-- src/src.pro | 44 +++++++++---------- tests/auto/qamqpchannel/tst_qamqpchannel.cpp | 8 ++-- tests/auto/qamqpclient/tst_qamqpclient.cpp | 8 ++-- .../auto/qamqpexchange/tst_qamqpexchange.cpp | 8 ++-- tests/auto/qamqpqueue/tst_qamqpqueue.cpp | 8 ++-- .../{amqp_testcase.h => qamqptestcase.h} | 8 ++-- tests/tests.pri | 2 +- tutorials/helloworld/receive/main.cpp | 6 +-- tutorials/helloworld/send/main.cpp | 6 +-- tutorials/pubsub/emit_log/main.cpp | 6 +-- tutorials/pubsub/receive_logs/main.cpp | 6 +-- tutorials/routing/emit_log_direct/main.cpp | 6 +-- .../routing/receive_logs_direct/main.cpp | 6 +-- tutorials/topics/emit_log_topic/main.cpp | 6 +-- tutorials/topics/receive_logs_topic/main.cpp | 6 +-- tutorials/workqueues/new_task/main.cpp | 6 +-- tutorials/workqueues/worker/main.cpp | 4 +- 39 files changed, 175 insertions(+), 176 deletions(-) rename src/{amqp_authenticator.cpp => qamqpauthenticator.cpp} (90%) rename src/{amqp_authenticator.h => qamqpauthenticator.h} (85%) rename src/{amqp_channel.cpp => qamqpchannel.cpp} (98%) rename src/{amqp_channel.h => qamqpchannel.h} (93%) rename src/{amqp_channel_p.h => qamqpchannel_p.h} (94%) rename src/{amqp_client.cpp => qamqpclient.cpp} (98%) rename src/{amqp_client.h => qamqpclient.h} (97%) rename src/{amqp_client_p.h => qamqpclient_p.h} (95%) rename src/{amqp_exchange.cpp => qamqpexchange.cpp} (98%) rename src/{amqp_exchange.h => qamqpexchange.h} (94%) rename src/{amqp_exchange_p.h => qamqpexchange_p.h} (81%) rename src/{amqp_frame.cpp => qamqpframe.cpp} (99%) rename src/{amqp_frame_p.h => qamqpframe_p.h} (98%) rename src/{amqp_global.h => qamqpglobal.h} (96%) rename src/{amqp_message.cpp => qamqpmessage.cpp} (96%) rename src/{amqp_message.h => qamqpmessage.h} (94%) rename src/{amqp_message_p.h => qamqpmessage_p.h} (74%) rename src/{amqp_queue.cpp => qamqpqueue.cpp} (99%) rename src/{amqp_queue.h => qamqpqueue.h} (94%) rename src/{amqp_queue_p.h => qamqpqueue_p.h} (93%) rename src/{amqp_table.cpp => qamqptable.cpp} (99%) rename src/{amqp_table.h => qamqptable.h} (87%) rename tests/common/{amqp_testcase.h => qamqptestcase.h} (93%) diff --git a/src/amqp_authenticator.cpp b/src/qamqpauthenticator.cpp similarity index 90% rename from src/amqp_authenticator.cpp rename to src/qamqpauthenticator.cpp index 9bbdb22..2ef5203 100644 --- a/src/amqp_authenticator.cpp +++ b/src/qamqpauthenticator.cpp @@ -1,6 +1,6 @@ -#include "amqp_table.h" -#include "amqp_frame_p.h" -#include "amqp_authenticator.h" +#include "qamqptable.h" +#include "qamqpframe_p.h" +#include "qamqpauthenticator.h" using namespace QAMQP; AMQPlainAuthenticator::AMQPlainAuthenticator(const QString &l, const QString &p) diff --git a/src/amqp_authenticator.h b/src/qamqpauthenticator.h similarity index 85% rename from src/amqp_authenticator.h rename to src/qamqpauthenticator.h index faa0aa9..84d3384 100644 --- a/src/amqp_authenticator.h +++ b/src/qamqpauthenticator.h @@ -1,10 +1,10 @@ -#ifndef amqp_authenticator_h__ -#define amqp_authenticator_h__ +#ifndef QAMQPAUTHENTICATOR_H +#define QAMQPAUTHENTICATOR_H #include #include -#include "amqp_global.h" +#include "qamqpglobal.h" namespace QAMQP { @@ -40,4 +40,4 @@ private: } // namespace QAMQP -#endif // amqp_authenticator_h__ +#endif // QAMQPAUTHENTICATOR_H diff --git a/src/amqp_channel.cpp b/src/qamqpchannel.cpp similarity index 98% rename from src/amqp_channel.cpp rename to src/qamqpchannel.cpp index 7592f25..c4ebc31 100644 --- a/src/amqp_channel.cpp +++ b/src/qamqpchannel.cpp @@ -1,7 +1,7 @@ -#include "amqp_channel.h" -#include "amqp_channel_p.h" -#include "amqp_client.h" -#include "amqp_client_p.h" +#include "qamqpchannel.h" +#include "qamqpchannel_p.h" +#include "qamqpclient.h" +#include "qamqpclient_p.h" #include #include @@ -337,4 +337,4 @@ void Channel::resume() d->flow(true); } -#include "moc_amqp_channel.cpp" +#include "moc_qamqpchannel.cpp" diff --git a/src/amqp_channel.h b/src/qamqpchannel.h similarity index 93% rename from src/amqp_channel.h rename to src/qamqpchannel.h index abf2935..c913d8a 100644 --- a/src/amqp_channel.h +++ b/src/qamqpchannel.h @@ -1,8 +1,8 @@ -#ifndef amqp_channel_h__ -#define amqp_channel_h__ +#ifndef QAMQPCHANNEL_H +#define QAMQPCHANNEL_H #include -#include "amqp_global.h" +#include "qamqpglobal.h" namespace QAMQP { @@ -65,4 +65,4 @@ protected: } // namespace QAMQP -#endif +#endif // QAMQPCHANNEL_H diff --git a/src/amqp_channel_p.h b/src/qamqpchannel_p.h similarity index 94% rename from src/amqp_channel_p.h rename to src/qamqpchannel_p.h index 0e73eb2..df03ad6 100644 --- a/src/amqp_channel_p.h +++ b/src/qamqpchannel_p.h @@ -1,8 +1,8 @@ -#ifndef amqp_channel_p_h__ -#define amqp_channel_p_h__ +#ifndef QAMQPCHANNEL_P_H +#define QAMQPCHANNEL_P_H #include -#include "amqp_frame_p.h" +#include "qamqpframe_p.h" #define METHOD_ID_ENUM(name, id) name = id, name ## Ok @@ -81,4 +81,4 @@ public: } // namespace QAMQP -#endif // amqp_channel_p_h__ +#endif // QAMQPCHANNEL_P_H diff --git a/src/amqp_client.cpp b/src/qamqpclient.cpp similarity index 98% rename from src/amqp_client.cpp rename to src/qamqpclient.cpp index 6b7cfbe..e27f324 100644 --- a/src/amqp_client.cpp +++ b/src/qamqpclient.cpp @@ -4,15 +4,15 @@ #include #include -#include "amqp_global.h" -#include "amqp_exchange.h" -#include "amqp_exchange_p.h" -#include "amqp_queue.h" -#include "amqp_queue_p.h" -#include "amqp_authenticator.h" -#include "amqp_table.h" -#include "amqp_client_p.h" -#include "amqp_client.h" +#include "qamqpglobal.h" +#include "qamqpexchange.h" +#include "qamqpexchange_p.h" +#include "qamqpqueue.h" +#include "qamqpqueue_p.h" +#include "qamqpauthenticator.h" +#include "qamqptable.h" +#include "qamqpclient_p.h" +#include "qamqpclient.h" using namespace QAMQP; ClientPrivate::ClientPrivate(Client *q) @@ -844,4 +844,4 @@ SslClient::~SslClient() #endif -#include "moc_amqp_client.cpp" +#include "moc_qamqpclient.cpp" diff --git a/src/amqp_client.h b/src/qamqpclient.h similarity index 97% rename from src/amqp_client.h rename to src/qamqpclient.h index 10e8557..4bf0790 100644 --- a/src/amqp_client.h +++ b/src/qamqpclient.h @@ -1,5 +1,5 @@ -#ifndef amqp_client_h__ -#define amqp_client_h__ +#ifndef QAMQPCLIENT_H +#define QAMQPCLIENT_H #include #include @@ -10,7 +10,7 @@ #include #endif -#include "amqp_global.h" +#include "qamqpglobal.h" namespace QAMQP { @@ -136,4 +136,4 @@ private: } // namespace QAMQP -#endif // amqp_client_h__ +#endif // QAMQPCLIENT_H diff --git a/src/amqp_client_p.h b/src/qamqpclient_p.h similarity index 95% rename from src/amqp_client_p.h rename to src/qamqpclient_p.h index bd2cb4c..41ba141 100644 --- a/src/amqp_client_p.h +++ b/src/qamqpclient_p.h @@ -1,5 +1,5 @@ -#ifndef amqp_client_p_h__ -#define amqp_client_p_h__ +#ifndef QAMQPCLIENT_P_H +#define QAMQPCLIENT_P_H #include #include @@ -11,8 +11,8 @@ # include #endif -#include "amqp_table.h" -#include "amqp_frame_p.h" +#include "qamqptable.h" +#include "qamqpframe_p.h" #define METHOD_ID_ENUM(name, id) name = id, name ## Ok @@ -130,4 +130,4 @@ public: } // namespace QAMQP -#endif // amqp_client_p_h__ +#endif // QAMQPCLIENT_P_H diff --git a/src/amqp_exchange.cpp b/src/qamqpexchange.cpp similarity index 98% rename from src/amqp_exchange.cpp rename to src/qamqpexchange.cpp index 80a3d62..625fe21 100644 --- a/src/amqp_exchange.cpp +++ b/src/qamqpexchange.cpp @@ -1,15 +1,13 @@ -#include "amqp_exchange.h" -#include "amqp_exchange_p.h" -#include "amqp_queue.h" -#include "amqp_global.h" -#include "amqp_client.h" - #include #include +#include "qamqpexchange.h" +#include "qamqpexchange_p.h" +#include "qamqpqueue.h" +#include "qamqpglobal.h" +#include "qamqpclient.h" using namespace QAMQP; - QString ExchangePrivate::typeToString(Exchange::ExchangeType type) { switch (type) { diff --git a/src/amqp_exchange.h b/src/qamqpexchange.h similarity index 94% rename from src/amqp_exchange.h rename to src/qamqpexchange.h index f20d40f..00fad9f 100644 --- a/src/amqp_exchange.h +++ b/src/qamqpexchange.h @@ -1,9 +1,9 @@ -#ifndef amqp_exchange_h__ -#define amqp_exchange_h__ +#ifndef QAMQPEXCHANGE_H +#define QAMQPEXCHANGE_H -#include "amqp_table.h" -#include "amqp_channel.h" -#include "amqp_message.h" +#include "qamqptable.h" +#include "qamqpchannel.h" +#include "qamqpmessage.h" namespace QAMQP { @@ -99,4 +99,4 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QAMQP::Exchange::ExchangeOptions) Q_DECLARE_METATYPE(QAMQP::Exchange::ExchangeType) -#endif // amqp_exchange_h__ +#endif // QAMQPEXCHANGE_H diff --git a/src/amqp_exchange_p.h b/src/qamqpexchange_p.h similarity index 81% rename from src/amqp_exchange_p.h rename to src/qamqpexchange_p.h index 460404b..bbae62c 100644 --- a/src/amqp_exchange_p.h +++ b/src/qamqpexchange_p.h @@ -1,9 +1,9 @@ -#ifndef amqp_exchange_p_h__ -#define amqp_exchange_p_h__ +#ifndef QAMQPEXCHANGE_P_H +#define QAMQPEXCHANGE_P_H -#include "amqp_table.h" -#include "amqp_exchange.h" -#include "amqp_channel_p.h" +#include "qamqptable.h" +#include "qamqpexchange.h" +#include "qamqpchannel_p.h" namespace QAMQP { @@ -39,4 +39,4 @@ public: } // namespace QAMQP -#endif // amqp_exchange_p_h__ +#endif // QAMQPEXCHANGE_P_H diff --git a/src/amqp_frame.cpp b/src/qamqpframe.cpp similarity index 99% rename from src/amqp_frame.cpp rename to src/qamqpframe.cpp index 29ae9ab..0113e82 100644 --- a/src/amqp_frame.cpp +++ b/src/qamqpframe.cpp @@ -2,9 +2,9 @@ #include #include -#include "amqp_table.h" -#include "amqp_global.h" -#include "amqp_frame_p.h" +#include "qamqptable.h" +#include "qamqpglobal.h" +#include "qamqpframe_p.h" using namespace QAMQP; using namespace QAMQP::Frame; diff --git a/src/amqp_frame_p.h b/src/qamqpframe_p.h similarity index 98% rename from src/amqp_frame_p.h rename to src/qamqpframe_p.h index f8a8b7f..24899f3 100644 --- a/src/amqp_frame_p.h +++ b/src/qamqpframe_p.h @@ -1,12 +1,12 @@ -#ifndef amqp_frame_h__ -#define amqp_frame_h__ +#ifndef QAMQPFRAME_P_H +#define QAMQPFRAME_P_H #include #include #include -#include "amqp_global.h" -#include "amqp_message.h" +#include "qamqpglobal.h" +#include "qamqpmessage.h" /** * Library namespace @@ -358,4 +358,4 @@ namespace Frame } // namespace QAMQP -#endif // amqp_frame_h__ +#endif // QAMQPFRAME_P_H diff --git a/src/amqp_global.h b/src/qamqpglobal.h similarity index 96% rename from src/amqp_global.h rename to src/qamqpglobal.h index c95c777..ed20eee 100644 --- a/src/amqp_global.h +++ b/src/qamqpglobal.h @@ -1,5 +1,5 @@ -#ifndef qamqp_global_h__ -#define qamqp_global_h__ +#ifndef QAMQPGLOBAL_H +#define QAMQPGLOBAL_H #include @@ -113,4 +113,4 @@ struct Decimal Q_DECLARE_METATYPE(QAMQP::Error) Q_DECLARE_METATYPE(QAMQP::Decimal) -#endif // qamqp_global_h__ +#endif // QAMQPGLOBAL_H diff --git a/src/amqp_message.cpp b/src/qamqpmessage.cpp similarity index 96% rename from src/amqp_message.cpp rename to src/qamqpmessage.cpp index 2da7f60..3ef42eb 100644 --- a/src/amqp_message.cpp +++ b/src/qamqpmessage.cpp @@ -1,7 +1,7 @@ -#include "amqp_message.h" -#include "amqp_message_p.h" - +#include "qamqpmessage.h" +#include "qamqpmessage_p.h" using namespace QAMQP; + MessagePrivate::MessagePrivate() : deliveryTag(0), leftSize(0) diff --git a/src/amqp_message.h b/src/qamqpmessage.h similarity index 94% rename from src/amqp_message.h rename to src/qamqpmessage.h index 4fd2e22..a0bf031 100644 --- a/src/amqp_message.h +++ b/src/qamqpmessage.h @@ -1,12 +1,12 @@ -#ifndef amqp_message_h__ -#define amqp_message_h__ +#ifndef QAMQPMESSAGE_H +#define QAMQPMESSAGE_H #include #include #include #include -#include "amqp_global.h" +#include "qamqpglobal.h" namespace QAMQP { @@ -65,4 +65,4 @@ private: Q_DECLARE_METATYPE(QAMQP::Message::PropertyHash) -#endif // amqp_message_h__ +#endif // QAMQPMESSAGE_H diff --git a/src/amqp_message_p.h b/src/qamqpmessage_p.h similarity index 74% rename from src/amqp_message_p.h rename to src/qamqpmessage_p.h index 5a13b43..83a01b5 100644 --- a/src/amqp_message_p.h +++ b/src/qamqpmessage_p.h @@ -1,11 +1,11 @@ -#ifndef amqp_message_p_h__ -#define amqp_message_p_h__ +#ifndef QAMQPMESSAGE_P_H +#define QAMQPMESSAGE_P_H #include #include -#include "amqp_frame_p.h" -#include "amqp_message.h" +#include "qamqpframe_p.h" +#include "qamqpmessage.h" namespace QAMQP { @@ -27,4 +27,4 @@ public: } // namespace QAMQP -#endif // amqp_message_p_h__ +#endif // QAMQPMESSAGE_P_H diff --git a/src/amqp_queue.cpp b/src/qamqpqueue.cpp similarity index 99% rename from src/amqp_queue.cpp rename to src/qamqpqueue.cpp index a629196..804e878 100644 --- a/src/amqp_queue.cpp +++ b/src/qamqpqueue.cpp @@ -1,15 +1,15 @@ -#include "amqp_queue.h" -#include "amqp_queue_p.h" -#include "amqp_exchange.h" -#include "amqp_message_p.h" -#include "amqp_table.h" -using namespace QAMQP; - #include #include #include #include +#include "qamqpqueue.h" +#include "qamqpqueue_p.h" +#include "qamqpexchange.h" +#include "qamqpmessage_p.h" +#include "qamqptable.h" +using namespace QAMQP; + QueuePrivate::QueuePrivate(Queue *q) : ChannelPrivate(q), delayedDeclare(false), diff --git a/src/amqp_queue.h b/src/qamqpqueue.h similarity index 94% rename from src/amqp_queue.h rename to src/qamqpqueue.h index 057b47c..6f2b908 100644 --- a/src/amqp_queue.h +++ b/src/qamqpqueue.h @@ -1,11 +1,11 @@ -#ifndef amqp_queue_h__ -#define amqp_queue_h__ +#ifndef QAMQPQUEUE_H +#define QAMQPQUEUE_H #include -#include "amqp_channel.h" -#include "amqp_message.h" -#include "amqp_global.h" +#include "qamqpchannel.h" +#include "qamqpmessage.h" +#include "qamqpglobal.h" namespace QAMQP { @@ -101,4 +101,4 @@ private: } // namespace QAMQP -#endif +#endif // QAMQPQUEUE_H diff --git a/src/amqp_queue_p.h b/src/qamqpqueue_p.h similarity index 93% rename from src/amqp_queue_p.h rename to src/qamqpqueue_p.h index e51c09a..7e54830 100644 --- a/src/amqp_queue_p.h +++ b/src/qamqpqueue_p.h @@ -1,10 +1,10 @@ -#ifndef amqp_queue_p_h__ -#define amqp_queue_p_h__ +#ifndef QAMQPQUEUE_P_H +#define QAMQPQUEUE_P_H #include #include -#include "amqp_channel_p.h" +#include "qamqpchannel_p.h" namespace QAMQP { @@ -60,4 +60,4 @@ public: } // namespace QAMQP -#endif // amqp_queue_p_h__ +#endif // QAMQPQUEUE_P_H diff --git a/src/amqp_table.cpp b/src/qamqptable.cpp similarity index 99% rename from src/amqp_table.cpp rename to src/qamqptable.cpp index 5d00a94..d59fec8 100644 --- a/src/amqp_table.cpp +++ b/src/qamqptable.cpp @@ -3,8 +3,8 @@ #include #include -#include "amqp_frame_p.h" -#include "amqp_table.h" +#include "qamqpframe_p.h" +#include "qamqptable.h" using namespace QAMQP; /* diff --git a/src/amqp_table.h b/src/qamqptable.h similarity index 87% rename from src/amqp_table.h rename to src/qamqptable.h index e74bcd3..c767aac 100644 --- a/src/amqp_table.h +++ b/src/qamqptable.h @@ -1,9 +1,10 @@ -#ifndef amqp_table_h__ -#define amqp_table_h__ +#ifndef QAMQPTABLE_H +#define QAMQPTABLE_H -#include "amqp_global.h" #include +#include "qamqpglobal.h" + namespace QAMQP { class QAMQP_EXPORT Table : public QVariantHash @@ -26,4 +27,4 @@ QAMQP_EXPORT QDataStream &operator<<(QDataStream &, const QAMQP::Table &table); QAMQP_EXPORT QDataStream &operator>>(QDataStream &, QAMQP::Table &table); Q_DECLARE_METATYPE(QAMQP::Table) -#endif // amqp_table_h__ +#endif // QAMQPTABLE_H diff --git a/src/src.pro b/src/src.pro index 17165d2..e176268 100644 --- a/src/src.pro +++ b/src/src.pro @@ -11,36 +11,36 @@ VERSION = $${QAMQP_VERSION} win32:DESTDIR = $$OUT_PWD PRIVATE_HEADERS += \ - amqp_channel_p.h \ - amqp_client_p.h \ - amqp_exchange_p.h \ - amqp_frame_p.h \ - amqp_message_p.h \ - amqp_queue_p.h + qamqpchannel_p.h \ + qamqpclient_p.h \ + qamqpexchange_p.h \ + qamqpframe_p.h \ + qamqpmessage_p.h \ + qamqpqueue_p.h INSTALL_HEADERS += \ - amqp_authenticator.h \ - amqp_channel.h \ - amqp_client.h \ - amqp_exchange.h \ - amqp_global.h \ - amqp_message.h \ - amqp_queue.h \ - amqp_table.h + qamqpauthenticator.h \ + qamqpchannel.h \ + qamqpclient.h \ + qamqpexchange.h \ + qamqpglobal.h \ + qamqpmessage.h \ + qamqpqueue.h \ + qamqptable.h HEADERS += \ $${INSTALL_HEADERS} \ $${PRIVATE_HEADERS} SOURCES += \ - amqp_authenticator.cpp \ - amqp_channel.cpp \ - amqp_client.cpp \ - amqp_exchange.cpp \ - amqp_frame.cpp \ - amqp_message.cpp \ - amqp_queue.cpp \ - amqp_table.cpp + qamqpauthenticator.cpp \ + qamqpchannel.cpp \ + qamqpclient.cpp \ + qamqpexchange.cpp \ + qamqpframe.cpp \ + qamqpmessage.cpp \ + qamqpqueue.cpp \ + qamqptable.cpp # install headers.files = $${INSTALL_HEADERS} diff --git a/tests/auto/qamqpchannel/tst_qamqpchannel.cpp b/tests/auto/qamqpchannel/tst_qamqpchannel.cpp index 5913c6b..d90ed79 100644 --- a/tests/auto/qamqpchannel/tst_qamqpchannel.cpp +++ b/tests/auto/qamqpchannel/tst_qamqpchannel.cpp @@ -1,11 +1,11 @@ #include #include "signalspy.h" -#include "amqp_testcase.h" +#include "qamqptestcase.h" -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class tst_QAMQPChannel : public TestCase diff --git a/tests/auto/qamqpclient/tst_qamqpclient.cpp b/tests/auto/qamqpclient/tst_qamqpclient.cpp index 034ad1f..5a03e1a 100644 --- a/tests/auto/qamqpclient/tst_qamqpclient.cpp +++ b/tests/auto/qamqpclient/tst_qamqpclient.cpp @@ -1,10 +1,10 @@ #include -#include "amqp_testcase.h" +#include "qamqptestcase.h" #include -#include "amqp_client.h" -#include "amqp_client_p.h" -#include "amqp_authenticator.h" +#include "qamqpclient.h" +#include "qamqpclient_p.h" +#include "qamqpauthenticator.h" using namespace QAMQP; class tst_QAMQPClient : public TestCase diff --git a/tests/auto/qamqpexchange/tst_qamqpexchange.cpp b/tests/auto/qamqpexchange/tst_qamqpexchange.cpp index 7735c55..2744c08 100644 --- a/tests/auto/qamqpexchange/tst_qamqpexchange.cpp +++ b/tests/auto/qamqpexchange/tst_qamqpexchange.cpp @@ -1,11 +1,11 @@ #include #include "signalspy.h" -#include "amqp_testcase.h" +#include "qamqptestcase.h" -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class tst_QAMQPExchange : public TestCase diff --git a/tests/auto/qamqpqueue/tst_qamqpqueue.cpp b/tests/auto/qamqpqueue/tst_qamqpqueue.cpp index 0f24fe5..b7c7031 100644 --- a/tests/auto/qamqpqueue/tst_qamqpqueue.cpp +++ b/tests/auto/qamqpqueue/tst_qamqpqueue.cpp @@ -3,11 +3,11 @@ #include #include -#include "amqp_testcase.h" +#include "qamqptestcase.h" -#include "amqp_client.h" -#include "amqp_queue.h" -#include "amqp_exchange.h" +#include "qamqpclient.h" +#include "qamqpqueue.h" +#include "qamqpexchange.h" using namespace QAMQP; class tst_QAMQPQueue : public TestCase diff --git a/tests/common/amqp_testcase.h b/tests/common/qamqptestcase.h similarity index 93% rename from tests/common/amqp_testcase.h rename to tests/common/qamqptestcase.h index 60367cd..a52446f 100644 --- a/tests/common/amqp_testcase.h +++ b/tests/common/qamqptestcase.h @@ -1,10 +1,10 @@ -#ifndef amqp_testcase_h__ -#define amqp_testcase_h__ +#ifndef QAMQPTESTCASE_H +#define QAMQPTESTCASE_H #include #include -#include "amqp_queue.h" +#include "qamqpqueue.h" namespace QAMQP { @@ -52,4 +52,4 @@ protected: } // namespace QAMQP -#endif // amqp_testcase_h__ +#endif // QAMQPTESTCASE_H diff --git a/tests/tests.pri b/tests/tests.pri index 8e9ee4d..8c0b456 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -7,5 +7,5 @@ CONFIG += testcase HEADERS += \ $${PWD}/common/signalspy.h \ - $${PWD}/common/amqp_testcase.h + $${PWD}/common/qamqptestcase.h diff --git a/tutorials/helloworld/receive/main.cpp b/tutorials/helloworld/receive/main.cpp index 1d9db0c..14a3698 100644 --- a/tutorials/helloworld/receive/main.cpp +++ b/tutorials/helloworld/receive/main.cpp @@ -1,9 +1,9 @@ #include #include -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class Receiver : public QObject diff --git a/tutorials/helloworld/send/main.cpp b/tutorials/helloworld/send/main.cpp index 387ddcf..8f1f5db 100644 --- a/tutorials/helloworld/send/main.cpp +++ b/tutorials/helloworld/send/main.cpp @@ -2,9 +2,9 @@ #include #include -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class Sender : public QObject diff --git a/tutorials/pubsub/emit_log/main.cpp b/tutorials/pubsub/emit_log/main.cpp index 42bb135..76ac40b 100644 --- a/tutorials/pubsub/emit_log/main.cpp +++ b/tutorials/pubsub/emit_log/main.cpp @@ -2,9 +2,9 @@ #include #include -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class LogEmitter : public QObject diff --git a/tutorials/pubsub/receive_logs/main.cpp b/tutorials/pubsub/receive_logs/main.cpp index 4143cda..7d9d6cb 100644 --- a/tutorials/pubsub/receive_logs/main.cpp +++ b/tutorials/pubsub/receive_logs/main.cpp @@ -2,9 +2,9 @@ #include #include -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class LogReceiver : public QObject diff --git a/tutorials/routing/emit_log_direct/main.cpp b/tutorials/routing/emit_log_direct/main.cpp index 8df666d..b83231c 100644 --- a/tutorials/routing/emit_log_direct/main.cpp +++ b/tutorials/routing/emit_log_direct/main.cpp @@ -2,9 +2,9 @@ #include #include -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class DirectLogEmitter : public QObject diff --git a/tutorials/routing/receive_logs_direct/main.cpp b/tutorials/routing/receive_logs_direct/main.cpp index be9530d..928408d 100644 --- a/tutorials/routing/receive_logs_direct/main.cpp +++ b/tutorials/routing/receive_logs_direct/main.cpp @@ -2,9 +2,9 @@ #include #include -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class DirectLogReceiver : public QObject diff --git a/tutorials/topics/emit_log_topic/main.cpp b/tutorials/topics/emit_log_topic/main.cpp index 90bb089..f92706e 100644 --- a/tutorials/topics/emit_log_topic/main.cpp +++ b/tutorials/topics/emit_log_topic/main.cpp @@ -2,9 +2,9 @@ #include #include -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class TopicLogEmitter : public QObject diff --git a/tutorials/topics/receive_logs_topic/main.cpp b/tutorials/topics/receive_logs_topic/main.cpp index 41e73fd..5b020b6 100644 --- a/tutorials/topics/receive_logs_topic/main.cpp +++ b/tutorials/topics/receive_logs_topic/main.cpp @@ -2,9 +2,9 @@ #include #include -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class TopicLogReceiver : public QObject diff --git a/tutorials/workqueues/new_task/main.cpp b/tutorials/workqueues/new_task/main.cpp index 9b0ef32..48ba449 100644 --- a/tutorials/workqueues/new_task/main.cpp +++ b/tutorials/workqueues/new_task/main.cpp @@ -2,9 +2,9 @@ #include #include -#include "amqp_client.h" -#include "amqp_exchange.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpexchange.h" +#include "qamqpqueue.h" using namespace QAMQP; class TaskCreator : public QObject diff --git a/tutorials/workqueues/worker/main.cpp b/tutorials/workqueues/worker/main.cpp index 07c33a9..445b190 100644 --- a/tutorials/workqueues/worker/main.cpp +++ b/tutorials/workqueues/worker/main.cpp @@ -2,8 +2,8 @@ #include #include -#include "amqp_client.h" -#include "amqp_queue.h" +#include "qamqpclient.h" +#include "qamqpqueue.h" using namespace QAMQP; class Worker : public QObject