More changes preparatory to changing all #include lines

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

10 files changed, 16 insertions, 16 deletions

diff --git a/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index 2b96e55444..165680457b 100644
--- a/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
@@ -31,7 +31,7 @@
 
 #include <sstream>
 
-#include "ProtocolVersion.h"
+#include "../lib/common/framing/ProtocolVersion.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
index 6a0e6eedb3..e3602e20b7 100644
--- a/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
@@ -27,8 +27,8 @@
  */
 #include <sstream>
 #include "AMQP_ClientProxy.h"
-#include "framing/ChannelAdapter.h"
-#include "framing/amqp_types_full.h"
+#include "../lib/common/framing/ChannelAdapter.h"
+#include "../lib/common/framing/amqp_types_full.h"
 
 %{MLIST} ${cpc_method_body_include}
 
diff --git a/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index b43b3a6747..05ff2aa5b1 100644
--- a/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
@@ -29,7 +29,7 @@
 #ifndef qpid_framing_AMQP_ClientProxy__
 #define qpid_framing_AMQP_ClientProxy__
 
-#include "framing/Proxy.h"
+#include "../lib/common/framing/Proxy.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl b/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
index 9753b454ba..3d5dacf4dc 100644
--- a/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_HighestVersion.h.tmpl
@@ -28,7 +28,7 @@
 #ifndef qpid_framing_highestProtocolVersion__
 #define qpid_framing_highestProtocolVersion__
 
-#include <ProtocolVersion.h>
+#include "../lib/common/framing/ProtocolVersion.h"
 
 
 namespace qpid {
diff --git a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
index 6fc79180b2..bfb9ce1307 100644
--- a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
@@ -27,7 +27,7 @@
  */
 
 #include <sstream>
-#include "framing/ProtocolVersionException.h"
+#include "../lib/common/framing/ProtocolVersionException.h"
 #include "AMQP_MethodVersionMap.h"
 
 namespace qpid
diff --git a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
index 84596ea5a0..530f76f599 100644
--- a/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
@@ -30,7 +30,7 @@
 #define qpid_framing_AMQP_MethodVersionMap__
 
 #include <map>
-#include <AMQMethodBody.h>
+#include "../lib/common/framing/AMQMethodBody.h"
 
 %{MLIST} ${mc_method_body_include}
 
diff --git a/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
index 7f47ac8efb..1508815144 100644
--- a/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
@@ -29,7 +29,7 @@
 #ifndef qpid_framing_AMQP_ServerOperations__
 #define qpid_framing_AMQP_ServerOperations__
 
-#include "ProtocolVersion.h"
+#include "../lib/common/framing/ProtocolVersion.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
index 5575f3b1df..c45af6a996 100644
--- a/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
@@ -28,8 +28,8 @@
 
 #include <sstream>
 #include "AMQP_ServerProxy.h"
-#include "framing/ChannelAdapter.h"
-#include "framing/amqp_types_full.h"
+#include "../lib/common/framing/ChannelAdapter.h"
+#include "../lib/common/framing/amqp_types_full.h"
 
 %{MLIST} ${spc_method_body_include}
 
diff --git a/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index 5b8a12ee34..5e9ced4375 100644
--- a/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/cpp/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
@@ -29,7 +29,7 @@
 #ifndef qpid_framing_AMQP_ServerProxy__
 #define qpid_framing_AMQP_ServerProxy__
 
-#include "framing/Proxy.h"
+#include "../lib/common/framing/Proxy.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 351399a991..2b5b6a541c 100644
--- a/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/cpp/gentools/templ.cpp/MethodBodyClass.h.tmpl
@@ -32,11 +32,11 @@
 #include <string>
 #include <sstream>
 
-#include <amqp_types.h>
-#include <${mb_base_class}.h>
-#include <Buffer.h>
-#include <FieldTable.h>
-#include <FramingContent.h>
+#include "../lib/common/framing/amqp_types.h"
+#include "${mb_base_class}.h"
+#include "../lib/common/framing/Buffer.h"
+#include "../lib/common/framing/FieldTable.h"
+#include "../lib/common/framing/FramingContent.h"
 
 namespace qpid
 {