From 3449c14ff58d482ad0a940bf26562004deb1767c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Wed, 24 Apr 2019 13:56:59 +0200
Subject: [PATCH] java/Object: rename class Object to GlobalObject

---
 src/android/Context.hxx     | 4 ++--
 src/android/LogListener.hxx | 4 ++--
 src/java/Object.hxx         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/android/Context.hxx b/src/android/Context.hxx
index 1bf00715c..6cd75f062 100644
--- a/src/android/Context.hxx
+++ b/src/android/Context.hxx
@@ -24,9 +24,9 @@
 
 class AllocatedPath;
 
-class Context : public Java::Object {
+class Context : public Java::GlobalObject {
 public:
-	Context(JNIEnv *env, jobject obj):Java::Object(env, obj) {}
+	Context(JNIEnv *env, jobject obj):Java::GlobalObject(env, obj) {}
 
 	gcc_pure
 	AllocatedPath GetCacheDir(JNIEnv *env) const;
diff --git a/src/android/LogListener.hxx b/src/android/LogListener.hxx
index 2c81078fe..9123fd85c 100644
--- a/src/android/LogListener.hxx
+++ b/src/android/LogListener.hxx
@@ -22,9 +22,9 @@
 
 #include "java/Object.hxx"
 
-class LogListener : public Java::Object {
+class LogListener : public Java::GlobalObject {
 public:
-	LogListener(JNIEnv *env, jobject obj):Java::Object(env, obj) {}
+	LogListener(JNIEnv *env, jobject obj):Java::GlobalObject(env, obj) {}
 
 	void OnLog(JNIEnv *env, int priority, const char *fmt, ...) const;
 };
diff --git a/src/java/Object.hxx b/src/java/Object.hxx
index f16354929..743558a30 100644
--- a/src/java/Object.hxx
+++ b/src/java/Object.hxx
@@ -40,15 +40,15 @@ namespace Java {
 	 */
 	typedef LocalRef<jobject> LocalObject;
 
-	class Object : public GlobalRef<jobject> {
+	class GlobalObject : public GlobalRef<jobject> {
 	public:
 		/**
 		 * Constructs an uninitialized object.  The method
 		 * set() must be called before it is destructed.
 		 */
-		Object() = default;
+		GlobalObject() = default;
 
-		Object(JNIEnv *env, jobject obj) noexcept
+		GlobalObject(JNIEnv *env, jobject obj) noexcept
 			:GlobalRef<jobject>(env, obj) {}
 	};
 }