Cleaned up some un-necessary #include dependencies.

Removed un-used LatencyMetric hack.


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

12 files changed, 16 insertions, 7 deletions

diff --git a/cpp/src/qpid/client/Completion.h b/cpp/src/qpid/client/Completion.h
index c4979d7934..5c5a0bb512 100644
--- a/cpp/src/qpid/client/Completion.h
+++ b/cpp/src/qpid/client/Completion.h
@@ -24,11 +24,12 @@
 
 #include <boost/shared_ptr.hpp>
 #include "Future.h"
-#include "SessionImpl.h"
 
 namespace qpid {
 namespace client {
 
+class SessionImpl;
+
 /** 
  * Asynchronous commands that do not return a result will return a
  * Completion. You can use the completion to wait for that specific
diff --git a/cpp/src/qpid/client/Connection.cpp b/cpp/src/qpid/client/Connection.cpp
index cc62d724cb..e8415403ca 100644
--- a/cpp/src/qpid/client/Connection.cpp
+++ b/cpp/src/qpid/client/Connection.cpp
@@ -19,6 +19,7 @@
  *
  */
 #include "Connection.h"
+#include "ConnectionImpl.h"
 #include "ConnectionSettings.h"
 #include "Message.h"
 #include "SessionImpl.h"
diff --git a/cpp/src/qpid/client/Connection.h b/cpp/src/qpid/client/Connection.h
index 846ac33790..d898ea70d9 100644
--- a/cpp/src/qpid/client/Connection.h
+++ b/cpp/src/qpid/client/Connection.h
@@ -25,6 +25,7 @@
 #include <string>
 #include "qpid/client/Session.h"
 #include "qpid/client/ClientImportExport.h"
+#include "qpid/client/ConnectionSettings.h"
 
 namespace qpid {
 
@@ -32,7 +33,6 @@ struct Url;
 
 namespace client {
 
-struct ConnectionSettings;
 class ConnectionImpl;
 
 /**
diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/cpp/src/qpid/client/Dispatcher.cpp
index 8d8574520a..8ae763b4f3 100644
--- a/cpp/src/qpid/client/Dispatcher.cpp
+++ b/cpp/src/qpid/client/Dispatcher.cpp
@@ -49,6 +49,9 @@ Dispatcher::Dispatcher(const Session& s, const std::string& q)
         session.getExecution().getDemux().get(q); 
 }
 
+Dispatcher::~Dispatcher() {}
+    
+
 void Dispatcher::start()
 {
     worker = Thread(this);
diff --git a/cpp/src/qpid/client/Dispatcher.h b/cpp/src/qpid/client/Dispatcher.h
index e84f8f303d..4dbb75dcf2 100644
--- a/cpp/src/qpid/client/Dispatcher.h
+++ b/cpp/src/qpid/client/Dispatcher.h
@@ -30,7 +30,6 @@
 #include "qpid/sys/Runnable.h"
 #include "qpid/sys/Thread.h"
 #include "MessageListener.h"
-#include "SubscriptionImpl.h"
 
 namespace qpid {
 namespace client {
@@ -61,6 +60,7 @@ class Dispatcher : public sys::Runnable
 
 public:
     Dispatcher(const Session& session, const std::string& queue = "");
+    ~Dispatcher();
 
     void start();
     void wait();
diff --git a/cpp/src/qpid/client/FailoverListener.cpp b/cpp/src/qpid/client/FailoverListener.cpp
index 16370f8912..ed9354d528 100644
--- a/cpp/src/qpid/client/FailoverListener.cpp
+++ b/cpp/src/qpid/client/FailoverListener.cpp
@@ -20,6 +20,9 @@
  */
 #include "FailoverListener.h"
 #include "SessionBase_0_10Access.h"
+#include "qpid/client/SessionImpl.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/SubscriptionImpl.h"
 #include "qpid/client/SubscriptionManager.h"
 #include "qpid/framing/Uuid.h"
 #include "qpid/log/Statement.h"
diff --git a/cpp/src/qpid/client/FailoverListener.h b/cpp/src/qpid/client/FailoverListener.h
index fe73a26611..7afee736ac 100644
--- a/cpp/src/qpid/client/FailoverListener.h
+++ b/cpp/src/qpid/client/FailoverListener.h
@@ -33,6 +33,7 @@ namespace qpid {
 namespace client {
 
 class SubscriptionManager;
+class ConnectionImpl;
 
 /**
  * @internal Listen for failover updates from the amq.failover exchange.
diff --git a/cpp/src/qpid/client/Future.cpp b/cpp/src/qpid/client/Future.cpp
index 6a0c78ae4b..fda40219ba 100644
--- a/cpp/src/qpid/client/Future.cpp
+++ b/cpp/src/qpid/client/Future.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "Future.h"
+#include "SessionImpl.h"
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/Future.h b/cpp/src/qpid/client/Future.h
index ea01522fe8..b26af06348 100644
--- a/cpp/src/qpid/client/Future.h
+++ b/cpp/src/qpid/client/Future.h
@@ -29,7 +29,6 @@
 #include "qpid/framing/StructHelper.h"
 #include "FutureCompletion.h"
 #include "FutureResult.h"
-#include "SessionImpl.h"
 #include "ClientImportExport.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/client/LocalQueue.cpp b/cpp/src/qpid/client/LocalQueue.cpp
index e449c9f795..481dc0f946 100644
--- a/cpp/src/qpid/client/LocalQueue.cpp
+++ b/cpp/src/qpid/client/LocalQueue.cpp
@@ -21,6 +21,7 @@
 #include "LocalQueue.h"
 #include "qpid/Exception.h"
 #include "qpid/framing/FrameSet.h"
+#include "qpid/framing/MessageTransferBody.h"
 #include "qpid/framing/reply_exceptions.h"
 #include "HandlePrivate.h"
 #include "SubscriptionImpl.h"
diff --git a/cpp/src/qpid/client/SessionBase_0_10.cpp b/cpp/src/qpid/client/SessionBase_0_10.cpp
index e81b78ecd3..66878c7672 100644
--- a/cpp/src/qpid/client/SessionBase_0_10.cpp
+++ b/cpp/src/qpid/client/SessionBase_0_10.cpp
@@ -20,6 +20,7 @@
  */
 #include "SessionBase_0_10.h"
 #include "Connection.h"
+#include "qpid/client/SessionImpl.h"
 #include "qpid/framing/all_method_bodies.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/client/SessionBase_0_10.h b/cpp/src/qpid/client/SessionBase_0_10.h
index 3ae21936f6..afea0cea59 100644
--- a/cpp/src/qpid/client/SessionBase_0_10.h
+++ b/cpp/src/qpid/client/SessionBase_0_10.h
@@ -28,9 +28,7 @@
 #include "qpid/framing/MethodContent.h"
 #include "qpid/framing/TransferContent.h"
 #include "qpid/client/Completion.h"
-#include "qpid/client/ConnectionImpl.h"
 #include "qpid/client/Execution.h"
-#include "qpid/client/SessionImpl.h"
 #include "qpid/client/TypedResult.h"
 #include "qpid/shared_ptr.h"
 #include "qpid/client/ClientImportExport.h"
@@ -62,7 +60,7 @@ enum CreditUnit { MESSAGE_CREDIT=0, BYTE_CREDIT=1, UNLIMITED_CREDIT=0xFFFFFFFF }
  */
 class SessionBase_0_10 {
   public:
-    
+
     typedef framing::TransferContent DefaultContent;
 
     ///@internal