From ed598378aee4dab1f9d66a842a8bb92f3d7a6432 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Mon, 3 May 2021 21:06:00 -0400
Subject: [PATCH] [ox/oc] Cleanup

---
 deps/ox/src/ox/oc/read.hpp  |  6 +++---
 deps/ox/src/ox/oc/write.cpp |  2 +-
 deps/ox/src/ox/oc/write.hpp | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deps/ox/src/ox/oc/read.hpp b/deps/ox/src/ox/oc/read.hpp
index 8662c3fe..cefafc5e 100644
--- a/deps/ox/src/ox/oc/read.hpp
+++ b/deps/ox/src/ox/oc/read.hpp
@@ -63,7 +63,7 @@ class OrganicClawReader {
 		Error field(const char *key, UnionView<U> val);
 
 		template<std::size_t L>
-		Error field(const char *key, ox::BString<L> *val);
+		Error field(const char *key, BString<L> *val);
 
 		Error field(const char *key, SerStr val);
 
@@ -141,7 +141,7 @@ Error OrganicClawReader::field(const char *key, UnionView<U> val) {
 }
 
 template<std::size_t L>
-Error OrganicClawReader::field(const char *name, ox::BString<L> *val) {
+Error OrganicClawReader::field(const char *name, BString<L> *val) {
 	return field(name, SerStr(val->data(), val->cap()));
 }
 
@@ -196,7 +196,7 @@ template<typename T>
 Result<T> readOC(const char *json, std::size_t jsonLen) {
 	T val;
 	oxReturnError(readOC(json, jsonLen, &val));
-	return ox::move(val);
+	return move(val);
 }
 
 template<typename T>
diff --git a/deps/ox/src/ox/oc/write.cpp b/deps/ox/src/ox/oc/write.cpp
index d1a60817..8890a451 100644
--- a/deps/ox/src/ox/oc/write.cpp
+++ b/deps/ox/src/ox/oc/write.cpp
@@ -91,7 +91,7 @@ Error OrganicClawWriter::field(const char *key, bool *val) {
 	return OxError(0);
 }
 
-Error OrganicClawWriter::field(const char *key, ox::String val) {
+Error OrganicClawWriter::field(const char *key, String val) {
 	if (targetValid() && val.len()) {
 		value(key) = val.c_str();
 	}
diff --git a/deps/ox/src/ox/oc/write.hpp b/deps/ox/src/ox/oc/write.hpp
index 8daf6612..b1637f55 100644
--- a/deps/ox/src/ox/oc/write.hpp
+++ b/deps/ox/src/ox/oc/write.hpp
@@ -55,9 +55,9 @@ class OrganicClawWriter {
 		Error field(const char*, HashMap<String, T> *val);
 
 		template<std::size_t L>
-		Error field(const char*, ox::BString<L> *val);
+		Error field(const char*, BString<L> *val);
 
-		Error field(const char*, ox::String val);
+		Error field(const char*, String val);
 
 		Error field(const char*, SerStr val);
 
@@ -97,7 +97,7 @@ Error OrganicClawWriter::field(const char *key, T *val, std::size_t len) {
 }
 
 template<std::size_t L>
-Error OrganicClawWriter::field(const char *key, ox::BString<L> *val) {
+Error OrganicClawWriter::field(const char *key, BString<L> *val) {
 	return field(key, SerStr(val->data(), val->cap()));
 }
 
@@ -130,12 +130,12 @@ Error OrganicClawWriter::field(const char *key, UnionView<U> val) {
 }
 
 template<typename T>
-Error OrganicClawWriter::field(const char *key, ox::HashMap<String, T> *val) {
+Error OrganicClawWriter::field(const char *key, HashMap<String, T> *val) {
 	if (targetValid()) {
 		const auto &keys = val->keys();
 		OrganicClawWriter w;
 		for (std::size_t i = 0; i < keys.size(); ++i) {
-			auto k = keys[i].c_str();
+			const auto k = keys[i].c_str();
 			oxReturnError(w.field(k, &val->operator[](k)));
 		}
 		value(key) = w.m_json;