Applied PIMPL pattern to SubscriptionManager.

Cleaned up some sloppy #includes.


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

9 files changed, 11 insertions, 3 deletions

diff --git a/cpp/src/tests/BrokerFixture.h b/cpp/src/tests/BrokerFixture.h
index b32b7f44ba..c691e351e7 100644
--- a/cpp/src/tests/BrokerFixture.h
+++ b/cpp/src/tests/BrokerFixture.h
@@ -29,6 +29,7 @@
 #include "qpid/client/ConnectionImpl.h"
 #include "qpid/client/Session.h"
 #include "qpid/client/SubscriptionManager.h"
+#include "qpid/client/LocalQueue.h"
 #include "qpid/log/Logger.h"
 #include "qpid/log/Options.h"
 #include "qpid/sys/Thread.h"
diff --git a/cpp/src/tests/ClientSessionTest.cpp b/cpp/src/tests/ClientSessionTest.cpp
index 1c719d16dc..0a72facd86 100644
--- a/cpp/src/tests/ClientSessionTest.cpp
+++ b/cpp/src/tests/ClientSessionTest.cpp
@@ -22,7 +22,9 @@
 #include "test_tools.h"
 #include "BrokerFixture.h"
 #include "qpid/client/QueueOptions.h"
+#include "qpid/client/MessageListener.h"
 #include "qpid/client/SubscriptionManager.h"
+#include "qpid/client/AsyncSession.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/sys/Thread.h"
 #include "qpid/sys/Runnable.h"
diff --git a/cpp/src/tests/echotest.cpp b/cpp/src/tests/echotest.cpp
index 7cbf3e7df4..98590e35ff 100644
--- a/cpp/src/tests/echotest.cpp
+++ b/cpp/src/tests/echotest.cpp
@@ -21,7 +21,7 @@
 
 #include <qpid/client/Connection.h>
 #include <qpid/client/SubscriptionManager.h>
-#include <qpid/client/Session.h>
+#include <qpid/client/AsyncSession.h>
 #include <qpid/client/Message.h>
 #include <qpid/client/MessageListener.h>
 #include <qpid/sys/Time.h>
diff --git a/cpp/src/tests/exception_test.cpp b/cpp/src/tests/exception_test.cpp
index e420bf2f0b..379e957ef1 100644
--- a/cpp/src/tests/exception_test.cpp
+++ b/cpp/src/tests/exception_test.cpp
@@ -23,6 +23,7 @@
 #include "test_tools.h"
 #include "BrokerFixture.h"
 #include "qpid/client/SubscriptionManager.h"
+#include "qpid/client/MessageListener.h"
 #include "qpid/sys/Runnable.h"
 #include "qpid/sys/Thread.h"
 #include "qpid/framing/reply_exceptions.h"
diff --git a/cpp/src/tests/latencytest.cpp b/cpp/src/tests/latencytest.cpp
index 81ac610001..6ad84e1b82 100644
--- a/cpp/src/tests/latencytest.cpp
+++ b/cpp/src/tests/latencytest.cpp
@@ -28,6 +28,7 @@
 #include <vector>
 
 #include "TestOptions.h"
+#include "qpid/sys/Thread.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/Message.h"
 #include "qpid/client/AsyncSession.h"
diff --git a/cpp/src/tests/perftest.cpp b/cpp/src/tests/perftest.cpp
index 18491d72a0..78606e46cd 100644
--- a/cpp/src/tests/perftest.cpp
+++ b/cpp/src/tests/perftest.cpp
@@ -28,6 +28,7 @@
 #include "qpid/client/Message.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Time.h"
+#include "qpid/sys/Thread.h"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/bind.hpp>
diff --git a/cpp/src/tests/topic_listener.cpp b/cpp/src/tests/topic_listener.cpp
index 1f0b3f5377..44070cd4c9 100644
--- a/cpp/src/tests/topic_listener.cpp
+++ b/cpp/src/tests/topic_listener.cpp
@@ -36,6 +36,7 @@
 #include "qpid/client/Connection.h"
 #include "qpid/client/MessageListener.h"
 #include "qpid/client/Session.h"
+#include "qpid/client/AsyncSession.h"
 #include "qpid/client/SubscriptionManager.h"
 #include "qpid/sys/SystemInfo.h"
 #include "qpid/sys/Time.h"
diff --git a/cpp/src/tests/txshift.cpp b/cpp/src/tests/txshift.cpp
index dd67710526..97135c9829 100644
--- a/cpp/src/tests/txshift.cpp
+++ b/cpp/src/tests/txshift.cpp
@@ -61,7 +61,7 @@ struct Transfer : MessageListener
 
     Transfer(const std::string control_) : control(control_), expected(0), transfered(0) {}
 
-    void subscribeToSource(SubscriptionManager& manager) 
+    void subscribeToSource(SubscriptionManager manager) 
     {
         sourceSettings.autoAck = 0;//will accept once at the end of the batch
         sourceSettings.flowControl = FlowControl::messageCredit(expected);
@@ -69,7 +69,7 @@ struct Transfer : MessageListener
         QPID_LOG(info, "Subscribed to source: " << source << " expecting: " << expected);
     }
 
-    void subscribeToControl(SubscriptionManager& manager) 
+    void subscribeToControl(SubscriptionManager manager) 
     {
         controlSettings.flowControl = FlowControl::messageCredit(1);
         controlSubscription = manager.subscribe(*this, control, controlSettings);
diff --git a/cpp/src/tests/txtest.cpp b/cpp/src/tests/txtest.cpp
index fb1d19ca8a..c1ee246e2c 100644
--- a/cpp/src/tests/txtest.cpp
+++ b/cpp/src/tests/txtest.cpp
@@ -34,6 +34,7 @@
 #include "qpid/framing/Array.h"
 #include "qpid/framing/Buffer.h"
 #include "qpid/sys/uuid.h"
+#include "qpid/sys/Thread.h"
 
 using namespace qpid;
 using namespace qpid::client;