[glibmm/refptr_as_sharedptr_v2: 3/5] Use RefPtr<>::get() instead of RefPtr<>::operator->().
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm/refptr_as_sharedptr_v2: 3/5] Use RefPtr<>::get() instead of RefPtr<>::operator->().
- Date: Sat, 19 Nov 2016 20:38:19 +0000 (UTC)
commit 4a3c4bde78a00d9ce96fd12060afffe9fb1eb5ce
Author: Murray Cumming <murrayc murrayc com>
Date: Sun Apr 10 12:31:48 2016 +0200
Use RefPtr<>::get() instead of RefPtr<>::operator->().
This is possible now that we RefPtr<> is an alias for std::shared_ptr<>.
glib/glibmm/object.h | 4 ++--
glib/glibmm/value.h | 4 ++--
glib/glibmm/weakref.h | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/glib/glibmm/object.h b/glib/glibmm/object.h
index 0181619..def08e3 100644
--- a/glib/glibmm/object.h
+++ b/glib/glibmm/object.h
@@ -257,7 +257,7 @@ public:
static GType value_type() { return T::get_base_type(); }
- void set(const CppType& data) { set_object(data.operator->()); }
+ void set(const CppType& data) { set_object(data.get()); }
CppType get() const { return Glib::make_refptr_for_instance<T>::cast_dynamic(get_object_copy()); }
};
@@ -276,7 +276,7 @@ public:
static GType value_type() { return T::get_base_type(); }
- void set(const CppType& data) { set_object(const_cast<T*>(data.operator->())); }
+ void set(const CppType& data) { set_object(const_cast<T*>(data.get())); }
CppType get() const { return Glib::make_refptr_for_instance<T>::cast_dynamic(get_object_copy()); }
};
#endif /* GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS */
diff --git a/glib/glibmm/value.h b/glib/glibmm/value.h
index 80c885a..8f983ce 100644
--- a/glib/glibmm/value.h
+++ b/glib/glibmm/value.h
@@ -239,7 +239,7 @@ public:
static GType value_type() { return T::get_base_type(); }
- void set(const CppType& data) { set_object(data.operator->()); }
+ void set(const CppType& data) { set_object(data.get()); }
CppType get() const { return Glib::RefPtr<T>::cast_dynamic(get_object_copy()); }
};
@@ -258,7 +258,7 @@ public:
static GType value_type() { return T::get_base_type(); }
- void set(const CppType& data) { set_object(const_cast<T*>(data.operator->())); }
+ void set(const CppType& data) { set_object(const_cast<T*>(data.get())); }
CppType get() const { return Glib::RefPtr<T>::cast_dynamic(get_object_copy()); }
};
#endif // GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS
diff --git a/glib/glibmm/weakref.h b/glib/glibmm/weakref.h
index 628d110..99d6c66 100644
--- a/glib/glibmm/weakref.h
+++ b/glib/glibmm/weakref.h
@@ -247,7 +247,7 @@ WeakRef<T_CppObject>::WeakRef(WeakRef<T_CastFrom>&& src) noexcept : pCppObject_(
template <typename T_CppObject>
template <typename T_CastFrom>
WeakRef<T_CppObject>::WeakRef(const RefPtr<T_CastFrom>& src) noexcept
- : pCppObject_(src.operator->()),
+ : pCppObject_(src.get()),
gobject_(nullptr)
{
if (pCppObject_)
@@ -320,7 +320,7 @@ template <typename T_CastFrom>
WeakRef<T_CppObject>&
WeakRef<T_CppObject>::operator=(const RefPtr<T_CastFrom>& src) noexcept
{
- T_CppObject* pCppObject = src.operator->();
+ T_CppObject* pCppObject = src.get();
set(pCppObject, nullptr);
return *this;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]