Use struct/class consistently

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

7 files changed, 49 insertions, 49 deletions

diff --git a/cpp/src/qmf/BrokerProxyImpl.h b/cpp/src/qmf/BrokerProxyImpl.h
index 3b85191f85..5b0b22e038 100644
--- a/cpp/src/qmf/BrokerProxyImpl.h
+++ b/cpp/src/qmf/BrokerProxyImpl.h
@@ -135,9 +135,9 @@ namespace qmf {
         void staticRelease() { decOutstanding(); }
 
     private:
-        friend class StaticContext;
-        friend class QueryContext;
-        friend class MethodContext;
+        friend struct StaticContext;
+        friend struct QueryContext;
+        friend struct MethodContext;
         BrokerProxy& publicObject;
         mutable qpid::sys::Mutex lock;
         ConsoleEngine& console;
diff --git a/cpp/src/qmf/ConsoleEngine.h b/cpp/src/qmf/ConsoleEngine.h
index a5aa990a76..455ec69901 100644
--- a/cpp/src/qmf/ConsoleEngine.h
+++ b/cpp/src/qmf/ConsoleEngine.h
@@ -32,13 +32,13 @@
 namespace qmf {
 
     class ConsoleEngine;
-    class ConsoleEngineImpl;
+    struct ConsoleEngineImpl;
     class BrokerProxyImpl;
     class AgentProxy;
-    class AgentProxyImpl;
-    class MethodResponseImpl;
-    class QueryResponseImpl;
-    class QueryContext;
+    struct AgentProxyImpl;
+    struct MethodResponseImpl;
+    struct QueryResponseImpl;
+    struct QueryContext;
 
     /**
      *
@@ -52,8 +52,8 @@ namespace qmf {
         const Value* getArgs() const;
 
     private:
-        friend class MethodResponseImpl;
-        friend class ConsoleEngineImpl;
+        friend struct MethodResponseImpl;
+        friend struct ConsoleEngineImpl;
         MethodResponse(MethodResponseImpl* impl);
         MethodResponseImpl* impl;
     };
@@ -70,8 +70,8 @@ namespace qmf {
         const Object* getObject(uint32_t idx) const;
 
     private:
-        friend class QueryResponseImpl;
-        friend class QueryContext;
+        friend struct QueryResponseImpl;
+        friend struct QueryContext;
         QueryResponse(QueryResponseImpl* impl);
         QueryResponseImpl *impl;
     };
@@ -135,7 +135,7 @@ namespace qmf {
         const char* getLabel() const;
 
     private:
-        friend class AgentProxyImpl;
+        friend struct AgentProxyImpl;
         friend class BrokerProxyImpl;
         AgentProxy(AgentProxyImpl* impl);
         AgentProxyImpl* impl;
@@ -165,8 +165,8 @@ namespace qmf {
         void sendQuery(const Query& query, void* context, const AgentProxy* agent = 0);
 
     private:
-        friend class ConsoleEngineImpl;
-        friend class StaticContext;
+        friend struct ConsoleEngineImpl;
+        friend struct StaticContext;
         BrokerProxyImpl* impl;
     };
 
@@ -217,7 +217,7 @@ namespace qmf {
 
     private:
         friend class BrokerProxyImpl;
-        friend class AgentProxyImpl;
+        friend struct AgentProxyImpl;
         ConsoleEngineImpl* impl;
     };
 }
diff --git a/cpp/src/qmf/Object.h b/cpp/src/qmf/Object.h
index 58ab12365e..f32095cba4 100644
--- a/cpp/src/qmf/Object.h
+++ b/cpp/src/qmf/Object.h
@@ -43,8 +43,8 @@ namespace qmf {
         void merge(const Object& from);
 
     private:
-        friend class ObjectImpl;
-        friend class AgentEngineImpl;
+        friend struct ObjectImpl;
+        friend class  AgentEngineImpl;
         Object(ObjectImpl* impl);
         ObjectImpl* impl;
     };
diff --git a/cpp/src/qmf/ObjectId.h b/cpp/src/qmf/ObjectId.h
index 0e603bc898..9097230fd9 100644
--- a/cpp/src/qmf/ObjectId.h
+++ b/cpp/src/qmf/ObjectId.h
@@ -45,12 +45,12 @@ namespace qmf {
         bool operator>=(const ObjectId& other) const;
 
     private:
-        friend class ObjectIdImpl;
-        friend class ObjectImpl;
-        friend class BrokerProxyImpl;
-        friend class QueryImpl;
-        friend class ValueImpl;
-        friend class AgentEngineImpl;
+        friend struct ObjectIdImpl;
+        friend struct ObjectImpl;
+        friend class  BrokerProxyImpl;
+        friend struct QueryImpl;
+        friend struct ValueImpl;
+        friend class  AgentEngineImpl;
         ObjectId(ObjectIdImpl* impl);
         ObjectIdImpl* impl;
     };
diff --git a/cpp/src/qmf/Query.h b/cpp/src/qmf/Query.h
index 96ad2b0d24..bd3ed6b862 100644
--- a/cpp/src/qmf/Query.h
+++ b/cpp/src/qmf/Query.h
@@ -25,11 +25,11 @@
 
 namespace qmf {
 
-    struct Object;
+    class Object;
     struct QueryElementImpl;
     struct QueryImpl;
     struct QueryExpressionImpl;
-    struct SchemaClassKey;
+    class  SchemaClassKey;
 
     enum ValueOper {
         O_EQ = 1,
@@ -97,7 +97,7 @@ namespace qmf {
         bool getDecreasing() const;
 
     private:
-        friend class QueryImpl;
+        friend struct QueryImpl;
         friend class BrokerProxyImpl;
         Query(QueryImpl* impl);
         QueryImpl* impl;
diff --git a/cpp/src/qmf/Schema.h b/cpp/src/qmf/Schema.h
index 92801c40fe..a7757756ea 100644
--- a/cpp/src/qmf/Schema.h
+++ b/cpp/src/qmf/Schema.h
@@ -54,9 +54,9 @@ namespace qmf {
         const char* getDesc() const;
 
     private:
-        friend class SchemaArgumentImpl;
-        friend class SchemaMethodImpl;
-        friend class SchemaEventClassImpl;
+        friend struct SchemaArgumentImpl;
+        friend struct SchemaMethodImpl;
+        friend struct SchemaEventClassImpl;
         SchemaArgument(SchemaArgumentImpl* impl);
         SchemaArgumentImpl* impl;
     };
@@ -76,9 +76,9 @@ namespace qmf {
         const SchemaArgument* getArgument(int idx) const;
 
     private:
-        friend class SchemaMethodImpl;
-        friend class SchemaObjectClassImpl;
-        friend class AgentEngineImpl;
+        friend struct SchemaMethodImpl;
+        friend struct SchemaObjectClassImpl;
+        friend class  AgentEngineImpl;
         SchemaMethod(SchemaMethodImpl* impl);
         SchemaMethodImpl* impl;
     };
@@ -104,8 +104,8 @@ namespace qmf {
         const char* getDesc() const;
 
     private:
-        friend class SchemaPropertyImpl;
-        friend class SchemaObjectClassImpl;
+        friend struct SchemaPropertyImpl;
+        friend struct SchemaObjectClassImpl;
         SchemaProperty(SchemaPropertyImpl* impl);
         SchemaPropertyImpl* impl;
     };
@@ -125,8 +125,8 @@ namespace qmf {
         const char* getDesc() const;
 
     private:
-        friend class SchemaStatisticImpl;
-        friend class SchemaObjectClassImpl;
+        friend struct SchemaStatisticImpl;
+        friend struct SchemaObjectClassImpl;
         SchemaStatistic(SchemaStatisticImpl* impl);
         SchemaStatisticImpl* impl;
     };
@@ -146,9 +146,9 @@ namespace qmf {
         bool operator<(const SchemaClassKey& other) const;
 
     private:
-        friend class SchemaClassKeyImpl;
+        friend struct SchemaClassKeyImpl;
         friend class BrokerProxyImpl;
-        friend class ConsoleEngineImpl;
+        friend struct ConsoleEngineImpl;
         SchemaClassKey(SchemaClassKeyImpl* impl);
         SchemaClassKeyImpl* impl;
     };
@@ -173,9 +173,9 @@ namespace qmf {
         const SchemaMethod* getMethod(int idx) const;
 
     private:
-        friend class SchemaObjectClassImpl;
-        friend class BrokerProxyImpl;
-        friend class AgentEngineImpl;
+        friend struct SchemaObjectClassImpl;
+        friend class  BrokerProxyImpl;
+        friend class  AgentEngineImpl;
         SchemaObjectClass(SchemaObjectClassImpl* impl);
         SchemaObjectClassImpl* impl;
     };
@@ -195,9 +195,9 @@ namespace qmf {
         const SchemaArgument* getArgument(int idx) const;
 
     private:
-        friend class SchemaEventClassImpl;
-        friend class BrokerProxyImpl;
-        friend class AgentEngineImpl;
+        friend struct SchemaEventClassImpl;
+        friend class  BrokerProxyImpl;
+        friend class  AgentEngineImpl;
         SchemaEventClass(SchemaEventClassImpl* impl);
         SchemaEventClassImpl* impl;
     };
diff --git a/cpp/src/qmf/Value.h b/cpp/src/qmf/Value.h
index 449872764b..81ff5a8783 100644
--- a/cpp/src/qmf/Value.h
+++ b/cpp/src/qmf/Value.h
@@ -106,10 +106,10 @@ namespace qmf {
         void deleteArrayItem(uint32_t idx);
 
     private:
-        friend class ValueImpl;
-        friend class BrokerProxyImpl;
-        friend class ObjectImpl;
-        friend class AgentEngineImpl;
+        friend struct ValueImpl;
+        friend class  BrokerProxyImpl;
+        friend struct ObjectImpl;
+        friend class  AgentEngineImpl;
         Value(ValueImpl* impl);
         ValueImpl* impl;
     };