Remove final vestiges of old client API references from messaging and agent header files

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

7 files changed, 20 insertions, 9 deletions

diff --git a/cpp/include/qpid/messaging/Address.h b/cpp/include/qpid/messaging/Address.h
index 99e41bb253..10d00ba18e 100644
--- a/cpp/include/qpid/messaging/Address.h
+++ b/cpp/include/qpid/messaging/Address.h
@@ -21,10 +21,12 @@
  * under the License.
  *
  */
-#include <string>
+#include "qpid/messaging/ImportExport.h"
+
 #include "qpid/messaging/exceptions.h"
 #include "qpid/types/Variant.h"
-#include "qpid/messaging/ImportExport.h"
+
+#include <string>
 #include <ostream>
 
 namespace qpid {
diff --git a/cpp/include/qpid/messaging/Connection.h b/cpp/include/qpid/messaging/Connection.h
index 59fc471fe7..ae5ed4c12e 100644
--- a/cpp/include/qpid/messaging/Connection.h
+++ b/cpp/include/qpid/messaging/Connection.h
@@ -21,12 +21,14 @@
  * under the License.
  *
  */
-#include <string>
 #include "qpid/messaging/ImportExport.h"
+
 #include "qpid/messaging/Handle.h"
 #include "qpid/messaging/exceptions.h"
 #include "qpid/types/Variant.h"
 
+#include <string>
+
 namespace qpid {
 namespace messaging {
 
diff --git a/cpp/include/qpid/messaging/Duration.h b/cpp/include/qpid/messaging/Duration.h
index f38a1c33bc..2791e188d7 100644
--- a/cpp/include/qpid/messaging/Duration.h
+++ b/cpp/include/qpid/messaging/Duration.h
@@ -23,6 +23,7 @@
  */
 
 #include "qpid/messaging/ImportExport.h"
+
 #include "qpid/sys/IntegerTypes.h"
 
 namespace qpid {
diff --git a/cpp/include/qpid/messaging/Message.h b/cpp/include/qpid/messaging/Message.h
index c4b031046a..9ab98ae0ce 100644
--- a/cpp/include/qpid/messaging/Message.h
+++ b/cpp/include/qpid/messaging/Message.h
@@ -21,12 +21,13 @@
  * under the License.
  *
  */
+#include "qpid/messaging/ImportExport.h"
 
-#include <string>
-#include "qpid/Exception.h"
 #include "qpid/messaging/Duration.h"
+#include "qpid/types/Exception.h"
 #include "qpid/types/Variant.h"
-#include "qpid/messaging/ImportExport.h"
+
+#include <string>
 
 namespace qpid {
 namespace messaging {
@@ -104,7 +105,7 @@ class Message
     friend struct MessageImplAccess;
 };
 
-struct EncodingException : qpid::Exception
+struct EncodingException : qpid::types::Exception
 {
     EncodingException(const std::string& msg);
 };
diff --git a/cpp/include/qpid/messaging/Receiver.h b/cpp/include/qpid/messaging/Receiver.h
index 738ff82507..65581d06c5 100644
--- a/cpp/include/qpid/messaging/Receiver.h
+++ b/cpp/include/qpid/messaging/Receiver.h
@@ -21,8 +21,9 @@
  * under the License.
  *
  */
-#include "qpid/messaging/exceptions.h"
 #include "qpid/messaging/ImportExport.h"
+
+#include "qpid/messaging/exceptions.h"
 #include "qpid/messaging/Handle.h"
 #include "qpid/messaging/Duration.h"
 
diff --git a/cpp/include/qpid/messaging/Sender.h b/cpp/include/qpid/messaging/Sender.h
index 80fa174d80..4b64224596 100644
--- a/cpp/include/qpid/messaging/Sender.h
+++ b/cpp/include/qpid/messaging/Sender.h
@@ -22,8 +22,10 @@
  *
  */
 #include "qpid/messaging/ImportExport.h"
+
 #include "qpid/messaging/Handle.h"
 #include "qpid/sys/IntegerTypes.h"
+
 #include <string>
 
 namespace qpid {
diff --git a/cpp/include/qpid/messaging/Session.h b/cpp/include/qpid/messaging/Session.h
index ac0ea425f6..7413417058 100644
--- a/cpp/include/qpid/messaging/Session.h
+++ b/cpp/include/qpid/messaging/Session.h
@@ -21,10 +21,12 @@
  * under the License.
  *
  */
+#include "qpid/messaging/ImportExport.h"
+
 #include "qpid/messaging/exceptions.h"
 #include "qpid/messaging/Duration.h"
-#include "qpid/messaging/ImportExport.h"
 #include "qpid/messaging/Handle.h"
+
 #include <string>
 
 namespace qpid {