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; +using OBSScript = OBSPtr; struct ScriptData { std::vector 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 class OBSObj { +template 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; -using OBSView = OBSObj; +using OBSDisplay = OBSPtr; +using OBSView = OBSPtr; /* signal handler connection */ class OBSSignal {