From 19caeca990d5a83eb02ddd7933c4a59af54b8f06 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Tue, 6 Nov 2018 22:13:52 -0800
Subject: [PATCH] cscore: Use more standard naming for Instance public
 variables

---
 cscore/src/main/native/cpp/Instance.cpp   | 2 +-
 cscore/src/main/native/cpp/Instance.h     | 4 ++--
 cscore/src/main/native/cpp/cscore_cpp.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cscore/src/main/native/cpp/Instance.cpp b/cscore/src/main/native/cpp/Instance.cpp
index e6cb69a0a9..655eecf917 100644
--- a/cscore/src/main/native/cpp/Instance.cpp
+++ b/cscore/src/main/native/cpp/Instance.cpp
@@ -38,7 +38,7 @@ static void def_log_func(unsigned int level, const char* file,
   wpi::errs() << oss.str();
 }
 
-Instance::Instance() : telemetry(notifier), network_listener(logger, notifier) {
+Instance::Instance() : telemetry(notifier), networkListener(logger, notifier) {
   SetDefaultLogger();
 }
 
diff --git a/cscore/src/main/native/cpp/Instance.h b/cscore/src/main/native/cpp/Instance.h
index 8e84a370a2..9123f54263 100644
--- a/cscore/src/main/native/cpp/Instance.h
+++ b/cscore/src/main/native/cpp/Instance.h
@@ -54,14 +54,14 @@ class Instance {
   wpi::Logger logger;
   Notifier notifier;
   Telemetry telemetry;
-  NetworkListener network_listener;
+  NetworkListener networkListener;
 
  private:
   UnlimitedHandleResource<Handle, SourceData, Handle::kSource> m_sources;
   UnlimitedHandleResource<Handle, SinkData, Handle::kSink> m_sinks;
 
  public:
-  wpi::EventLoopRunner event_loop;
+  wpi::EventLoopRunner eventLoop;
 
   std::pair<CS_Sink, std::shared_ptr<SinkData>> FindSink(const SinkImpl& sink);
   std::pair<CS_Source, std::shared_ptr<SourceData>> FindSource(
diff --git a/cscore/src/main/native/cpp/cscore_cpp.cpp b/cscore/src/main/native/cpp/cscore_cpp.cpp
index d838a35531..c1ae30f803 100644
--- a/cscore/src/main/native/cpp/cscore_cpp.cpp
+++ b/cscore/src/main/native/cpp/cscore_cpp.cpp
@@ -606,7 +606,7 @@ CS_Listener AddListener(std::function<void(const RawEvent& event)> callback,
   int uid = inst.notifier.AddListener(callback, eventMask);
   if ((eventMask & CS_NETWORK_INTERFACES_CHANGED) != 0) {
     // start network interface event listener
-    inst.network_listener.Start();
+    inst.networkListener.Start();
     if (immediateNotify) inst.notifier.NotifyNetworkInterfacesChanged();
   }
   if (immediateNotify) {