Code cleanup in broker directory.

- Removed un-necessary #includes for broker/Queue.h
- Removed "using std::string" in header files.


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

2 files changed, 7 insertions, 7 deletions

diff --git a/cpp/src/qpid/management/ManagementDirectExchange.h b/cpp/src/qpid/management/ManagementDirectExchange.h
index ab691afa70..7507179c06 100644
--- a/cpp/src/qpid/management/ManagementDirectExchange.h
+++ b/cpp/src/qpid/management/ManagementDirectExchange.h
@@ -36,15 +36,15 @@ class ManagementDirectExchange : public virtual DirectExchange
   public:
     static const std::string typeName;
 
-    ManagementDirectExchange(const string& name, Manageable* _parent = 0, Broker* broker = 0);
-    ManagementDirectExchange(const string& _name, bool _durable, 
+    ManagementDirectExchange(const std::string& name, Manageable* _parent = 0, Broker* broker = 0);
+    ManagementDirectExchange(const std::string& _name, bool _durable, 
                              const qpid::framing::FieldTable& _args,
                              Manageable* _parent = 0, Broker* broker = 0);
 
     virtual std::string getType() const { return typeName; }
 
     virtual void route(Deliverable& msg,
-                       const string& routingKey,
+                       const std::string& routingKey,
                        const qpid::framing::FieldTable* args);
 
     void setManagmentAgent(management::ManagementAgent* agent, int qmfVersion);
diff --git a/cpp/src/qpid/management/ManagementTopicExchange.h b/cpp/src/qpid/management/ManagementTopicExchange.h
index ece1c88ecf..232300265e 100644
--- a/cpp/src/qpid/management/ManagementTopicExchange.h
+++ b/cpp/src/qpid/management/ManagementTopicExchange.h
@@ -36,19 +36,19 @@ class ManagementTopicExchange : public virtual TopicExchange
   public:
     static const std::string typeName;
 
-    ManagementTopicExchange(const string& name, Manageable* _parent = 0, Broker* broker = 0);
-    ManagementTopicExchange(const string& _name, bool _durable, 
+    ManagementTopicExchange(const std::string& name, Manageable* _parent = 0, Broker* broker = 0);
+    ManagementTopicExchange(const std::string& _name, bool _durable, 
                             const qpid::framing::FieldTable& _args,
                             Manageable* _parent = 0, Broker* broker = 0);
 
     virtual std::string getType() const { return typeName; }
 
     virtual void route(Deliverable& msg,
-                       const string& routingKey,
+                       const std::string& routingKey,
                        const qpid::framing::FieldTable* args);
 
     virtual bool bind(Queue::shared_ptr queue,
-                      const string& routingKey,
+                      const std::string& routingKey,
                       const qpid::framing::FieldTable* args);
 
     void setManagmentAgent(management::ManagementAgent* agent, int qmfVersion);