Minor cleanup edits to examples (from jrobie@redhat.com)

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

10 files changed, 14 insertions, 21 deletions

diff --git a/qpid/cpp/examples/direct/declare_queues.cpp b/qpid/cpp/examples/direct/declare_queues.cpp
index 07e34007a4..9a51d1982b 100644
--- a/qpid/cpp/examples/direct/declare_queues.cpp
+++ b/qpid/cpp/examples/direct/declare_queues.cpp
@@ -47,15 +47,10 @@
 #include <qpid/client/Connection.h>
 #include <qpid/client/Session.h>
 
-#include <unistd.h>
-#include <cstdlib>
-#include <iostream>
 
 using namespace qpid::client;
 using namespace qpid::framing;
 
-using std::string;
-
 
 int main(int argc, char** argv) {
     const char* host = argc>1 ? argv[1] : "127.0.0.1";
diff --git a/qpid/cpp/examples/direct/direct_producer.cpp b/qpid/cpp/examples/direct/direct_producer.cpp
index 8719fa263f..7cca1955cf 100644
--- a/qpid/cpp/examples/direct/direct_producer.cpp
+++ b/qpid/cpp/examples/direct/direct_producer.cpp
@@ -68,7 +68,6 @@ int main(int argc, char** argv) {
     int count = argc>3 ? atoi(argv[3]) : 10;
   
     Connection connection;
-    Message message;
     try {
         connection.open(host, port);
         Session session =  connection.newSession();
@@ -80,6 +79,7 @@ int main(int argc, char** argv) {
 	// just once. (In most simple cases, there is no need to set
 	// other message properties.)
 
+    	Message message;
 	message.getDeliveryProperties().setRoutingKey("routing_key"); 
 
 	// Now send some messages ...
diff --git a/qpid/cpp/examples/direct/listener.cpp b/qpid/cpp/examples/direct/listener.cpp
index 5fe7138f1e..55229df8a3 100644
--- a/qpid/cpp/examples/direct/listener.cpp
+++ b/qpid/cpp/examples/direct/listener.cpp
@@ -46,6 +46,7 @@
 #include <qpid/client/Connection.h>
 #include <qpid/client/Session.h>
 #include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
 #include <qpid/client/SubscriptionManager.h>
 
 #include <unistd.h>
@@ -79,8 +80,9 @@ void Listener::received(Message& message) {
 int main(int argc, char** argv) {
     const char* host = argc>1 ? argv[1] : "127.0.0.1";
     int port = argc>2 ? atoi(argv[2]) : 5672;
+
     Connection connection;
-    Message msg;
+
     try {
       connection.open(host, port);
       Session session =  connection.newSession();
diff --git a/qpid/cpp/examples/fanout/fanout_producer.cpp b/qpid/cpp/examples/fanout/fanout_producer.cpp
index 18338717b9..fb16f7e8b1 100644
--- a/qpid/cpp/examples/fanout/fanout_producer.cpp
+++ b/qpid/cpp/examples/fanout/fanout_producer.cpp
@@ -65,7 +65,6 @@ int main(int argc, char** argv) {
     int port = argc>2 ? atoi(argv[2]) : 5672;
 
     Connection connection;
-    Message message;
     try {
         connection.open(host, port);
         Session session =  connection.newSession();
diff --git a/qpid/cpp/examples/fanout/listener.cpp b/qpid/cpp/examples/fanout/listener.cpp
index dd9bf3c7ba..b6050ef728 100644
--- a/qpid/cpp/examples/fanout/listener.cpp
+++ b/qpid/cpp/examples/fanout/listener.cpp
@@ -45,6 +45,7 @@
 #include <qpid/client/Connection.h>
 #include <qpid/client/Session.h>
 #include <qpid/client/Message.h>
+#include <qpid/client/MessageListener.h>
 #include <qpid/client/SubscriptionManager.h>
 
 #include <unistd.h>
@@ -80,7 +81,6 @@ int main(int argc, char** argv) {
     int port = argc>2 ? atoi(argv[2]) : 5672;
 
     Connection connection;
-    Message msg;
     try {
         connection.open(host, port);
         Session session =  connection.newSession();
diff --git a/qpid/cpp/examples/pub-sub/topic_listener.cpp b/qpid/cpp/examples/pub-sub/topic_listener.cpp
index 14c5777bfc..fe0280cb7e 100644
--- a/qpid/cpp/examples/pub-sub/topic_listener.cpp
+++ b/qpid/cpp/examples/pub-sub/topic_listener.cpp
@@ -52,7 +52,6 @@
 #include <unistd.h>
 #include <cstdlib>
 #include <iostream>
-#include <set>
 
 using namespace qpid::client;
 using namespace qpid::framing;
diff --git a/qpid/cpp/examples/pub-sub/topic_publisher.cpp b/qpid/cpp/examples/pub-sub/topic_publisher.cpp
index 8186c5d5bb..72ba572f75 100644
--- a/qpid/cpp/examples/pub-sub/topic_publisher.cpp
+++ b/qpid/cpp/examples/pub-sub/topic_publisher.cpp
@@ -104,7 +104,6 @@ int main(int argc, char** argv) {
     int port = argc>2 ? atoi(argv[2]) : 5672;
 
     Connection connection;
-    Message message;
     try {
         connection.open(host, port);
         Session session =  connection.newSession();
diff --git a/qpid/cpp/examples/request-response/client.cpp b/qpid/cpp/examples/request-response/client.cpp
index aace2109fa..a71a6368b0 100644
--- a/qpid/cpp/examples/request-response/client.cpp
+++ b/qpid/cpp/examples/request-response/client.cpp
@@ -55,12 +55,11 @@
  *
  */
 
-
 #include <qpid/client/Connection.h>
-#include <qpid/client/SubscriptionManager.h>
 #include <qpid/client/Session.h>
 #include <qpid/client/Message.h>
 #include <qpid/client/MessageListener.h>
+#include <qpid/client/SubscriptionManager.h>
 
 #include <unistd.h>
 #include <cstdlib>
@@ -71,6 +70,9 @@
 using namespace qpid::client;
 using namespace qpid::framing;
 
+using std::stringstream;
+using std::string;
+
 class Listener : public MessageListener{
   private:
     SubscriptionManager& subscriptions;
@@ -94,14 +96,11 @@ void Listener::received(Message& message) {
 }
 
 
-using std::stringstream;
-using std::string;
 
 int main(int argc, char** argv) {
     const char* host = argc>1 ? argv[1] : "127.0.0.1";
     int port = argc>2 ? atoi(argv[2]) : 5672;
     Connection connection;
-    Message request;
     try {
         connection.open(host, port);
         Session session =  connection.newSession();
@@ -123,6 +122,7 @@ int main(int argc, char** argv) {
 	// Each client sends the name of their own response queue so
 	// the service knows where to route messages.
 
+    	Message request;
 	request.getDeliveryProperties().setRoutingKey("request");
 	request.getMessageProperties().setReplyTo(ReplyTo("amq.direct", response_queue.str()));
 
diff --git a/qpid/cpp/examples/request-response/server.cpp b/qpid/cpp/examples/request-response/server.cpp
index fb3b78d47b..2d62638dff 100644
--- a/qpid/cpp/examples/request-response/server.cpp
+++ b/qpid/cpp/examples/request-response/server.cpp
@@ -57,17 +57,16 @@
 
 
 #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/client/SubscriptionManager.h>
 
 #include <unistd.h>
 #include <cstdlib>
 #include <iostream>
-#include <algorithm>
 
 #include <sstream>
 #include <string>
@@ -123,7 +122,7 @@ int main(int argc, char** argv) {
     const char* host = argc>1 ? argv[1] : "127.0.0.1";
     int port = argc>2 ? atoi(argv[2]) : 5672;
     Connection connection;
-    Message message;
+
     try {
         connection.open(host, port);
         Session session =  connection.newSession();
diff --git a/qpid/cpp/examples/xml-exchange/listener.cpp b/qpid/cpp/examples/xml-exchange/listener.cpp
index 2c9a1e7a55..02b722c745 100644
--- a/qpid/cpp/examples/xml-exchange/listener.cpp
+++ b/qpid/cpp/examples/xml-exchange/listener.cpp
@@ -79,8 +79,8 @@ void Listener::received(Message& message) {
 int main(int argc, char** argv) {
     const char* host = argc>1 ? argv[1] : "127.0.0.1";
     int port = argc>2 ? atoi(argv[2]) : 5672;
+
     Connection connection;
-    Message msg;
     try {
       connection.open(host, port);
       Session session =  connection.newSession();