Rename OGCounterQueryType to OGGraphCounterQueryType

Author: jcmosc

Sources/OpenGraphCxx/Graph/OGGraph.cpp

@@ -152,33 +152,33 @@ void OGGraphSetUpdateCallback(OGGraphRef graph,
     graph->context.set_update_callback(OG::ClosureFunction<void>(function, context));
 }
 
-uint64_t OGGraphGetCounter(OGGraphRef graph, OGCounterQueryType query) {
+uint64_t OGGraphGetCounter(OGGraphRef graph, OGGraphCounterQueryType query) {
     if (graph->context.isInvalid()) {
         OG::precondition_failure("invalidated graph");
     }
     OG::Graph::Context& context = graph->context;
     switch (query) {
-        case OGCounterQueryTypeNodes:
+        case OGGraphCounterQueryTypeNodes:
             return context.get_graph().get_counter_0();
-        case OGCounterQueryTypeTransactions:
+        case OGGraphCounterQueryTypeTransactions:
             return context.get_graph().get_counter_1();
-        case OGCounterQueryTypeUpdates:
+        case OGGraphCounterQueryTypeUpdates:
             return context.get_graph().get_counter_2();
-        case OGCounterQueryTypeChanges:
+        case OGGraphCounterQueryTypeChanges:
             return context.get_graph().get_counter_3();
-        case OGCounterQueryTypeContextID:
+        case OGGraphCounterQueryTypeContextID:
             return context.get_graph().get_counter_4();
-        case OGCounterQueryTypeGraphID:
+        case OGGraphCounterQueryTypeGraphID:
             return context.get_graph().get_counter_5();
-        case OGCounterQueryTypeContextThreadUpdating:
+        case OGGraphCounterQueryTypeContextThreadUpdating:
             return context.thread_is_updating();
-        case OGCounterQueryTypeThreadUpdating:
+        case OGGraphCounterQueryTypeThreadUpdating:
             return context.get_graph().thread_is_updating();
-        case OGCounterQueryTypeContextNeedsUpdate:
+        case OGGraphCounterQueryTypeContextNeedsUpdate:
             return context.get_graph().get_counter_8();
-        case OGCounterQueryTypeNeedsUpdate:
+        case OGGraphCounterQueryTypeNeedsUpdate:
             return context.get_graph().get_counter_9();
-        case OGCounterQueryTypeMainThreadUpdates:
+        case OGGraphCounterQueryTypeMainThreadUpdates:
             return context.get_graph().get_counter_10();
         default:
             return 0;

Sources/OpenGraphCxx/include/OpenGraph/OGCounterQueryType.h

@@ -7,7 +7,7 @@
 
 #include <OpenGraph/OGBase.h>
 #include <OpenGraph/Private/CFRuntime.h>
-#include <OpenGraph/OGCounterQueryType.h>
+#include <OpenGraph/OGGraphCounterQueryType.h>
 
 // Note: Place all structure declaration in a single place to avoid header cycle dependency
 
@@ -87,7 +87,7 @@ void OGGraphSetUpdateCallback(OGGraphRef graph,
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-uint64_t OGGraphGetCounter(OGGraphRef graph, OGCounterQueryType query) OG_SWIFT_NAME(OGGraphRef.counter(self:for:));
+uint64_t OGGraphGetCounter(OGGraphRef graph, OGGraphCounterQueryType query) OG_SWIFT_NAME(OGGraphRef.counter(self:for:));
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT

Sources/OpenGraphCxx/include/OpenGraph/OGGraph.h

@@ -0,0 +1,27 @@
+//
+//  OGGraphCounterQueryType.h
+//  OpenGraphCxx
+
+#ifndef OGGraphCounterQueryType_h
+#define OGGraphCounterQueryType_h
+
+#include <OpenGraph/OGBase.h>
+
+typedef OG_ENUM(uint32_t, OGGraphCounterQueryType) {
+    OGGraphCounterQueryTypeNodes,
+    OGGraphCounterQueryTypeTransactions,
+    OGGraphCounterQueryTypeUpdates,
+    OGGraphCounterQueryTypeChanges,
+    OGGraphCounterQueryTypeContextID,
+    OGGraphCounterQueryTypeGraphID,
+    OGGraphCounterQueryTypeContextThreadUpdating,
+    OGGraphCounterQueryTypeThreadUpdating,
+    OGGraphCounterQueryTypeContextNeedsUpdate,
+    OGGraphCounterQueryTypeNeedsUpdate,
+    OGGraphCounterQueryTypeMainThreadUpdates,
+    OGGraphCounterQueryTypeCreatedNodes,
+    OGGraphCounterQueryTypeSubgraphs,
+    OGGraphCounterQueryTypeCreatedSubgraphs,
+} OG_SWIFT_NAME(OGGraphRef.CounterQueryType);
+
+#endif /* OGGraphCounterQueryType_h */

Sources/OpenGraphCxx/include/OpenGraph/OGGraphCounterQueryType.h

@@ -8,10 +8,10 @@
 #include <OpenGraph/OGChangedValueFlags.h>
 #include <OpenGraph/OGClosure.h>
 #include <OpenGraph/OGComparison.h>
-#include <OpenGraph/OGCounterQueryType.h>
 #include <OpenGraph/OGDebugServer.h>
 #include <OpenGraph/OGGraph.h>
 #include <OpenGraph/OGGraphContext.h>
+#include <OpenGraph/OGGraphCounterQueryType.h>
 #include <OpenGraph/OGGraphDescription.h>
 #include <OpenGraph/OGGraphTracing.h>
 #include <OpenGraph/OGInputOptions.h>

Sources/OpenGraphCxx/include/OpenGraph/OpenGraph-umbrella.h

@@ -8,7 +8,7 @@ public typealias OGAttributeInfo = AGAttributeInfo
 public typealias OGAttributeType = AGAttributeType
 public typealias OGCachedValueOptions = AGCachedValueOptions
 public typealias OGChangedValueFlags = AGChangedValueFlags
-public typealias OGCounterQueryType = AGCounterQueryType
+public typealias OGGraphCounterQueryType = AGCounterQueryType
 public typealias OGInputOptions = AGInputOptions
 public typealias OGTypeApplyOptions = AGTypeApplyOptions
 public typealias OGUniqueID = AGUniqueID

Sources/OpenGraphShims/GraphShims.swift

@@ -8,7 +8,7 @@ public typealias OGAttributeInfo = AGAttributeInfo
 public typealias OGAttributeType = AGAttributeType
 public typealias OGCachedValueOptions = AGCachedValueOptions
 public typealias OGChangedValueFlags = AGChangedValueFlags
-public typealias OGCounterQueryType = AGCounterQueryType
+public typealias OGGraphCounterQueryType = AGCounterQueryType
 public typealias OGInputOptions = AGInputOptions
 public typealias OGTypeApplyOptions = AGTypeApplyOptions
 public typealias OGUniqueID = AGUniqueID