Renamed the following files for consistency:

broker/BrokerExchange.cpp -> Exchange.cpp
broker/BrokerExchange.h -> Exchange.h
broker/BrokerQueue.cpp -> Queue.cpp
broker/BrokerQueue.h -> Queue.h
client/ClientChannel.cpp -> Channel.cpp
client/ClientChannel.h -> Channel.h
client/ClientConnection.cpp -> Connection.cpp
client/ClientExchange.cpp -> Exchange.cpp
client/ClientExchange.h -> Exchange.h
client/ClientMessage.h -> Message.h
client/ClientQueue.cpp -> Queue.cpp
client/ClientQueue.h -> Queue.h


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@579340 13f79535-47bb-0310-9956-ffa450edef68

33 files changed, 53 insertions, 53 deletions

diff --git a/cpp/src/qpid/broker/Deliverable.h b/cpp/src/qpid/broker/Deliverable.h
index cd1dbaa85d..bdea550159 100644
--- a/cpp/src/qpid/broker/Deliverable.h
+++ b/cpp/src/qpid/broker/Deliverable.h
@@ -21,7 +21,7 @@
 #ifndef _Deliverable_
 #define _Deliverable_
 
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/DeliverableMessage.h b/cpp/src/qpid/broker/DeliverableMessage.h
index 9719d972fc..07bca40461 100644
--- a/cpp/src/qpid/broker/DeliverableMessage.h
+++ b/cpp/src/qpid/broker/DeliverableMessage.h
@@ -22,7 +22,7 @@
 #define _DeliverableMessage_
 
 #include "Deliverable.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Message.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/DeliveryRecord.cpp b/cpp/src/qpid/broker/DeliveryRecord.cpp
index 36e6c22f88..f9218655a4 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/cpp/src/qpid/broker/DeliveryRecord.cpp
@@ -21,7 +21,7 @@
 #include "DeliveryRecord.h"
 #include "DeliverableMessage.h"
 #include "SemanticState.h"
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/log/Statement.h"
 
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/DeliveryRecord.h b/cpp/src/qpid/broker/DeliveryRecord.h
index 3c833fcaa8..f2c343e27a 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.h
+++ b/cpp/src/qpid/broker/DeliveryRecord.h
@@ -26,7 +26,7 @@
 #include <vector>
 #include <ostream>
 #include "qpid/framing/AccumulatedAck.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Consumer.h"
 #include "DeliveryId.h"
 #include "Message.h"
diff --git a/cpp/src/qpid/broker/DirectExchange.h b/cpp/src/qpid/broker/DirectExchange.h
index 7b20bd610c..243f51d6a8 100644
--- a/cpp/src/qpid/broker/DirectExchange.h
+++ b/cpp/src/qpid/broker/DirectExchange.h
@@ -23,10 +23,10 @@
 
 #include <map>
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/BrokerExchange.cpp b/cpp/src/qpid/broker/Exchange.cpp
index 4eaf40dbc8..04407eb774 100644
--- a/cpp/src/qpid/broker/BrokerExchange.cpp
+++ b/cpp/src/qpid/broker/Exchange.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "ExchangeRegistry.h"
 
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/BrokerExchange.h b/cpp/src/qpid/broker/Exchange.h
index c3dd7b998d..5febca0ae9 100644
--- a/cpp/src/qpid/broker/BrokerExchange.h
+++ b/cpp/src/qpid/broker/Exchange.h
@@ -1,5 +1,5 @@
-#ifndef _broker_BrokerExchange_h
-#define _broker_BrokerExchange_h
+#ifndef _broker_Exchange_h
+#define _broker_Exchange_h
 
 /*
  *
@@ -24,7 +24,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include "Deliverable.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "MessageStore.h"
 #include "PersistableExchange.h"
 #include "qpid/framing/FieldTable.h"
@@ -80,4 +80,4 @@ namespace qpid {
 }
 
 
-#endif  /*!_broker_BrokerExchange_h*/
+#endif  /*!_broker_Exchange.cpp_h*/
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.h b/cpp/src/qpid/broker/ExchangeRegistry.h
index 5505a4074a..f7f29ff0ea 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.h
+++ b/cpp/src/qpid/broker/ExchangeRegistry.h
@@ -23,7 +23,7 @@
  */
 
 #include <map>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "MessageStore.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
diff --git a/cpp/src/qpid/broker/FanOutExchange.h b/cpp/src/qpid/broker/FanOutExchange.h
index 070e438bcc..625afc8cce 100644
--- a/cpp/src/qpid/broker/FanOutExchange.h
+++ b/cpp/src/qpid/broker/FanOutExchange.h
@@ -23,10 +23,10 @@
 
 #include <map>
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/HeadersExchange.h b/cpp/src/qpid/broker/HeadersExchange.h
index 48d115c1ec..f7abf3514b 100644
--- a/cpp/src/qpid/broker/HeadersExchange.h
+++ b/cpp/src/qpid/broker/HeadersExchange.h
@@ -22,10 +22,10 @@
 #define _HeadersExchange_
 
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/MessageDelivery.cpp b/cpp/src/qpid/broker/MessageDelivery.cpp
index edacd7a1c1..2eea97ced0 100644
--- a/cpp/src/qpid/broker/MessageDelivery.cpp
+++ b/cpp/src/qpid/broker/MessageDelivery.cpp
@@ -22,7 +22,7 @@
 
 #include "DeliveryToken.h"
 #include "Message.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/framing/BasicDeliverBody.h"
 #include "qpid/framing/BasicGetOkBody.h"
diff --git a/cpp/src/qpid/broker/MessageStoreModule.h b/cpp/src/qpid/broker/MessageStoreModule.h
index 271da92b1e..46dbd35ec9 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/cpp/src/qpid/broker/MessageStoreModule.h
@@ -22,7 +22,7 @@
 #define _MessageStoreModule_
 
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "RecoveryManager.h"
 #include "qpid/sys/Module.h"
 
diff --git a/cpp/src/qpid/broker/NullMessageStore.h b/cpp/src/qpid/broker/NullMessageStore.h
index c27a0ad53a..5698d8a16d 100644
--- a/cpp/src/qpid/broker/NullMessageStore.h
+++ b/cpp/src/qpid/broker/NullMessageStore.h
@@ -23,7 +23,7 @@
 
 #include <set>
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/BrokerQueue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 74ba4f24ed..95fff2e789 100644
--- a/cpp/src/qpid/broker/BrokerQueue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -22,8 +22,8 @@
 #include <boost/format.hpp>
 
 #include "qpid/log/Statement.h"
-#include "BrokerQueue.h"
-#include "BrokerExchange.h"
+#include "Queue.h"
+#include "Exchange.h"
 #include "DeliverableMessage.h"
 #include "MessageStore.h"
 #include "qpid/sys/Monitor.h"
diff --git a/cpp/src/qpid/broker/BrokerQueue.h b/cpp/src/qpid/broker/Queue.h
index 4b6070d11c..17ace522c3 100644
--- a/cpp/src/qpid/broker/BrokerQueue.h
+++ b/cpp/src/qpid/broker/Queue.h
@@ -1,5 +1,5 @@
-#ifndef _broker_BrokerQueue_h
-#define _broker_BrokerQueue_h
+#ifndef _broker_Queue_h
+#define _broker_Queue_h
 
 /*
  *
@@ -189,4 +189,4 @@ namespace qpid {
 }
 
 
-#endif  /*!_broker_BrokerQueue_h*/
+#endif  /*!_broker_Queue_h*/
diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/cpp/src/qpid/broker/QueueRegistry.h
index 22a89d7825..1a766b810a 100644
--- a/cpp/src/qpid/broker/QueueRegistry.h
+++ b/cpp/src/qpid/broker/QueueRegistry.h
@@ -23,7 +23,7 @@
 
 #include <map>
 #include "qpid/sys/Mutex.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/RecoveredDequeue.h b/cpp/src/qpid/broker/RecoveredDequeue.h
index 9dcc9d4233..a6d64e6faf 100644
--- a/cpp/src/qpid/broker/RecoveredDequeue.h
+++ b/cpp/src/qpid/broker/RecoveredDequeue.h
@@ -27,7 +27,7 @@
 #include "Deliverable.h"
 #include "Message.h"
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "TxOp.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.h b/cpp/src/qpid/broker/RecoveredEnqueue.h
index a571343e93..9ada62e62b 100644
--- a/cpp/src/qpid/broker/RecoveredEnqueue.h
+++ b/cpp/src/qpid/broker/RecoveredEnqueue.h
@@ -27,7 +27,7 @@
 #include "Deliverable.h"
 #include "Message.h"
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "TxOp.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp b/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
index 45b7c588b6..1e3168137e 100644
--- a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
+++ b/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
@@ -21,7 +21,7 @@
 #include "RecoveryManagerImpl.h"
 
 #include "Message.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "RecoveredEnqueue.h"
 #include "RecoveredDequeue.h"
 
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/cpp/src/qpid/broker/SemanticState.cpp
index 059f99077c..a3858d0989 100644
--- a/cpp/src/qpid/broker/SemanticState.cpp
+++ b/cpp/src/qpid/broker/SemanticState.cpp
@@ -21,7 +21,7 @@
 
 #include "SessionState.h"
 #include "BrokerAdapter.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Connection.h"
 #include "DeliverableMessage.h"
 #include "DtxAck.h"
diff --git a/cpp/src/qpid/broker/TopicExchange.h b/cpp/src/qpid/broker/TopicExchange.h
index c411fb1965..e2cc1a3535 100644
--- a/cpp/src/qpid/broker/TopicExchange.h
+++ b/cpp/src/qpid/broker/TopicExchange.h
@@ -23,10 +23,10 @@
 
 #include <map>
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/TxPublish.h b/cpp/src/qpid/broker/TxPublish.h
index 564e021c5a..2e3268010a 100644
--- a/cpp/src/qpid/broker/TxPublish.h
+++ b/cpp/src/qpid/broker/TxPublish.h
@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <functional>
 #include <list>
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Deliverable.h"
 #include "Message.h"
 #include "MessageStore.h"
diff --git a/cpp/src/qpid/client/ClientChannel.cpp b/cpp/src/qpid/client/Channel.cpp
index f5362bf688..cef34630db 100644
--- a/cpp/src/qpid/client/ClientChannel.cpp
+++ b/cpp/src/qpid/client/Channel.cpp
@@ -21,9 +21,9 @@
 #include "qpid/log/Statement.h"
 #include <iostream>
 #include <sstream>
-#include "ClientChannel.h"
+#include "Channel.h"
 #include "qpid/sys/Monitor.h"
-#include "ClientMessage.h"
+#include "Message.h"
 #include "qpid/QpidError.h"
 #include "Connection.h"
 #include "Demux.h"
diff --git a/cpp/src/qpid/client/ClientChannel.h b/cpp/src/qpid/client/Channel.h
index 527f5d418f..bf0b289077 100644
--- a/cpp/src/qpid/client/ClientChannel.h
+++ b/cpp/src/qpid/client/Channel.h
@@ -1,5 +1,5 @@
-#ifndef _client_ClientChannel_h
-#define _client_ClientChannel_h
+#ifndef _client_Channel_h
+#define _client_Channel_h
 
 /*
  *
@@ -25,9 +25,9 @@
 #include <boost/scoped_ptr.hpp>
 #include "qpid/framing/amqp_framing.h"
 #include "qpid/framing/Uuid.h"
-#include "ClientExchange.h"
-#include "ClientMessage.h"
-#include "ClientQueue.h"
+#include "Exchange.h"
+#include "Message.h"
+#include "Queue.h"
 #include "ConnectionImpl.h"
 #include "qpid/client/Session.h"
 #include "qpid/Exception.h"
@@ -313,4 +313,4 @@ class Channel : private sys::Runnable
 
 }}
 
-#endif  /*!_client_ClientChannel_h*/
+#endif  /*!_client_Channel_h*/
diff --git a/cpp/src/qpid/client/ClientConnection.cpp b/cpp/src/qpid/client/Connection.cpp
index 8c5f83f9f5..cef076527f 100644
--- a/cpp/src/qpid/client/ClientConnection.cpp
+++ b/cpp/src/qpid/client/Connection.cpp
@@ -23,8 +23,8 @@
 #include <boost/bind.hpp>
 
 #include "Connection.h"
-#include "ClientChannel.h"
-#include "ClientMessage.h"
+#include "Channel.h"
+#include "Message.h"
 #include "ScopedAssociation.h"
 #include "qpid/log/Logger.h"
 #include "qpid/log/Options.h"
diff --git a/cpp/src/qpid/client/Connection.h b/cpp/src/qpid/client/Connection.h
index e309b5c63e..f5d6a387a9 100644
--- a/cpp/src/qpid/client/Connection.h
+++ b/cpp/src/qpid/client/Connection.h
@@ -24,7 +24,7 @@
 #include <map>
 #include <string>
 #include "qpid/QpidError.h"
-#include "ClientChannel.h"
+#include "Channel.h"
 #include "ConnectionImpl.h"
 #include "qpid/client/Session.h"
 #include "qpid/framing/AMQP_HighestVersion.h"
diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/cpp/src/qpid/client/Dispatcher.cpp
index 8f3ed8bcbe..fd437725ce 100644
--- a/cpp/src/qpid/client/Dispatcher.cpp
+++ b/cpp/src/qpid/client/Dispatcher.cpp
@@ -25,7 +25,7 @@
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/log/Statement.h"
 #include "BlockingQueue.h"
-#include "ClientMessage.h"
+#include "Message.h"
 
 using qpid::framing::FrameSet;
 using qpid::framing::MessageTransferBody;
diff --git a/cpp/src/qpid/client/ClientExchange.cpp b/cpp/src/qpid/client/Exchange.cpp
index d5914beea2..e7fbdeb47e 100644
--- a/cpp/src/qpid/client/ClientExchange.cpp
+++ b/cpp/src/qpid/client/Exchange.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "ClientExchange.h"
+#include "Exchange.h"
 
 qpid::client::Exchange::Exchange(std::string _name, std::string _type) : name(_name), type(_type){}
 const std::string& qpid::client::Exchange::getName() const { return name; }
diff --git a/cpp/src/qpid/client/ClientExchange.h b/cpp/src/qpid/client/Exchange.h
index a8ac21fa9b..a8ac21fa9b 100644
--- a/cpp/src/qpid/client/ClientExchange.h
+++ b/cpp/src/qpid/client/Exchange.h
diff --git a/cpp/src/qpid/client/ClientMessage.h b/cpp/src/qpid/client/Message.h
index a573e17940..dab7f3c8d8 100644
--- a/cpp/src/qpid/client/ClientMessage.h
+++ b/cpp/src/qpid/client/Message.h
@@ -1,5 +1,5 @@
-#ifndef _client_ClientMessage_h
-#define _client_ClientMessage_h
+#ifndef _client_Message_h
+#define _client_Message_h
 
 /*
  *
@@ -83,4 +83,4 @@ private:
 
 }}
 
-#endif  /*!_client_ClientMessage_h*/
+#endif  /*!_client_Message_h*/
diff --git a/cpp/src/qpid/client/MessageListener.h b/cpp/src/qpid/client/MessageListener.h
index 501862a3ef..86e5dd63dc 100644
--- a/cpp/src/qpid/client/MessageListener.h
+++ b/cpp/src/qpid/client/MessageListener.h
@@ -23,7 +23,7 @@
 #ifndef _MessageListener_
 #define _MessageListener_
 
-#include "ClientMessage.h"
+#include "Message.h"
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/ClientQueue.cpp b/cpp/src/qpid/client/Queue.cpp
index 613cf8d288..1752a48a3a 100644
--- a/cpp/src/qpid/client/ClientQueue.cpp
+++ b/cpp/src/qpid/client/Queue.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "ClientQueue.h"
+#include "Queue.h"
 
 qpid::client::Queue::Queue() : name(""), autodelete(true), exclusive(true), durable(false){}
 
diff --git a/cpp/src/qpid/client/ClientQueue.h b/cpp/src/qpid/client/Queue.h
index b37a44b004..9ab8c70b08 100644
--- a/cpp/src/qpid/client/ClientQueue.h
+++ b/cpp/src/qpid/client/Queue.h
@@ -1,5 +1,5 @@
-#ifndef _client_ClientQueue_h
-#define _client_ClientQueue_h
+#ifndef _client_Queue_h
+#define _client_Queue_h
 
 /*
  *
@@ -100,4 +100,4 @@ namespace client {
 }
 }
 
-#endif  /*!_client_ClientQueue_h*/
+#endif  /*!_client_Queue_h*/