From 6b944a2f3cdb5af6b2c7f67f049683768498a3e5 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Wed, 2 Feb 2022 21:54:39 -0800
Subject: [PATCH] libobs: Rename OBSObj to OBSPtr

Makes it a bit more explicit that it's just a pointer RAII, and because
an OBSObject will be added
---
 .../frontend-tools/scripts.cpp                |  2 +-
 libobs/obs.hpp                                | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/UI/frontend-plugins/frontend-tools/scripts.cpp b/UI/frontend-plugins/frontend-tools/scripts.cpp
index e47ad444d..345ba5f17 100644
--- a/UI/frontend-plugins/frontend-tools/scripts.cpp
+++ b/UI/frontend-plugins/frontend-tools/scripts.cpp
@@ -49,7 +49,7 @@
 
 /* ----------------------------------------------------------------- */
 
-using OBSScript = OBSObj<obs_script_t *, obs_script_destroy>;
+using OBSScript = OBSPtr<obs_script_t *, obs_script_destroy>;
 
 struct ScriptData {
 	std::vector<OBSScript> scripts;
diff --git a/libobs/obs.hpp b/libobs/obs.hpp
index 2cbb1650c..37748353c 100644
--- a/libobs/obs.hpp
+++ b/libobs/obs.hpp
@@ -253,26 +253,26 @@ inline OBSWeakService OBSGetWeakRef(obs_service_t *service)
 }
 
 /* objects that are not meant to be instanced */
-template<typename T, void destroy(T)> class OBSObj {
+template<typename T, void destroy(T)> class OBSPtr {
 	T obj;
 
 public:
-	inline OBSObj() : obj(nullptr) {}
-	inline OBSObj(T obj_) : obj(obj_) {}
-	inline OBSObj(const OBSObj &) = delete;
-	inline OBSObj(OBSObj &&other) : obj(other.obj) { other.obj = nullptr; }
+	inline OBSPtr() : obj(nullptr) {}
+	inline OBSPtr(T obj_) : obj(obj_) {}
+	inline OBSPtr(const OBSPtr &) = delete;
+	inline OBSPtr(OBSPtr &&other) : obj(other.obj) { other.obj = nullptr; }
 
-	inline ~OBSObj() { destroy(obj); }
+	inline ~OBSPtr() { destroy(obj); }
 
-	inline OBSObj &operator=(T obj_)
+	inline OBSPtr &operator=(T obj_)
 	{
 		if (obj_ != obj)
 			destroy(obj);
 		obj = obj_;
 		return *this;
 	}
-	inline OBSObj &operator=(const OBSObj &) = delete;
-	inline OBSObj &operator=(OBSObj &&other)
+	inline OBSPtr &operator=(const OBSPtr &) = delete;
+	inline OBSPtr &operator=(OBSPtr &&other)
 	{
 		if (obj)
 			destroy(obj);
@@ -287,8 +287,8 @@ public:
 	inline bool operator!=(T p) const { return obj != p; }
 };
 
-using OBSDisplay = OBSObj<obs_display_t *, obs_display_destroy>;
-using OBSView = OBSObj<obs_view_t *, obs_view_destroy>;
+using OBSDisplay = OBSPtr<obs_display_t *, obs_display_destroy>;
+using OBSView = OBSPtr<obs_view_t *, obs_view_destroy>;
 
 /* signal handler connection */
 class OBSSignal {