From a0f8685453bf25451b937b99cf1a4ab12f27bdcc Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Wed, 15 Apr 2015 14:44:30 -0700
Subject: [PATCH] cleanup

---
 one.cpp                  | 5 ++++-
 service/ControlPlane.cpp | 4 ++--
 service/ControlPlane.hpp | 6 +++---
 service/OneService.hpp   | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/one.cpp b/one.cpp
index 7d38c4634..ad1472fc5 100644
--- a/one.cpp
+++ b/one.cpp
@@ -30,7 +30,10 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "service/One.hpp"
+#include <string>
+#include <stdexcept>
+
+#include "service/OneService.hpp"
 
 using namespace ZeroTier;
 
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp
index 146c20d6b..f65a9ee54 100644
--- a/service/ControlPlane.cpp
+++ b/service/ControlPlane.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "ControlPlane.hpp"
-#include "One.hpp"
+#include "OneService.hpp"
 
 #include "../version.h"
 #include "../include/ZeroTierOne.h"
@@ -196,7 +196,7 @@ static void _jsonAppend(std::string &buf,const ZT1_Peer *peer)
 	buf.append(json);
 }
 
-ControlPlane::ControlPlane(One *svc,Node *n) :
+ControlPlane::ControlPlane(OneService *svc,Node *n) :
 	_svc(svc),
 	_node(n)
 {
diff --git a/service/ControlPlane.hpp b/service/ControlPlane.hpp
index a181eb5c8..96d11762d 100644
--- a/service/ControlPlane.hpp
+++ b/service/ControlPlane.hpp
@@ -36,7 +36,7 @@
 
 namespace ZeroTier {
 
-class One;
+class OneService;
 class Node;
 struct InetAddress;
 
@@ -46,7 +46,7 @@ struct InetAddress;
 class ControlPlane
 {
 public:
-	ControlPlane(One *svc,Node *n);
+	ControlPlane(OneService *svc,Node *n);
 	~ControlPlane();
 
 	/**
@@ -71,7 +71,7 @@ public:
 		std::string &responseContentType);
 
 private:
-	One *const _svc;
+	OneService *const _svc;
 	Node *const _node;
 	std::set<std::string> _authTokens;
 };
diff --git a/service/OneService.hpp b/service/OneService.hpp
index 56f4fc3c8..bba3b9b80 100644
--- a/service/OneService.hpp
+++ b/service/OneService.hpp
@@ -130,8 +130,8 @@ protected:
 	OneService() {}
 
 private:
-	OneService(const One &one) {}
-	inline One &operator=(const One &one) { return *this; }
+	OneService(const OneService &one) {}
+	inline OneService &operator=(const OneService &one) { return *this; }
 };
 
 } // namespace ZeroTier