From fc1207a95f1af840876c8b514e90c6736e649b7d Mon Sep 17 00:00:00 2001
From: John Haddon <thehaddonyoof@gmail.com>
Date: Thu, 2 Nov 2023 09:53:07 +0000
Subject: [PATCH] ValuePlug : Remove deprecated `getObjectValue()` method

This was superceded by the overload with the `owner` argument in Gaffer 1.3, and was only kept for backwards compatibility. Likewise, remove the equivalent  `getValueInternal()` method, which we needed to keep in 1.3 despite it being private, because it was called by inline public methods.
---
 Changes.md                   |  1 +
 include/Gaffer/ValuePlug.h   |  5 -----
 include/Gaffer/ValuePlug.inl | 17 -----------------
 src/Gaffer/ValuePlug.cpp     | 10 ++--------
 4 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/Changes.md b/Changes.md
index 912599d0011..3b1d6c9ccde 100644
--- a/Changes.md
+++ b/Changes.md
@@ -4,6 +4,7 @@
 Breaking Changes
 ----------------
 
+- ValuePlug : Removed deprecated `getObjectValue()` overload.
 - Dispatcher : Removed `createMatching()` method.
 - Process : Removed non-const variant of the `handleException()` method.
 - StringPlug : Removed deprecated `precomputedHash` argument from `getValue()` method.
diff --git a/include/Gaffer/ValuePlug.h b/include/Gaffer/ValuePlug.h
index c59be00535a..5705a1f13f3 100644
--- a/include/Gaffer/ValuePlug.h
+++ b/include/Gaffer/ValuePlug.h
@@ -251,9 +251,6 @@ class GAFFER_API ValuePlug : public Plug
 		/// so this feature is not suitable for use in classes that override that method.
 		template<typename T = IECore::Object>
 		const T *getObjectValue( IECore::ConstObjectPtr &owner, const IECore::MurmurHash *precomputedHash = nullptr ) const;
-		/// \deprecated
-		template<typename T = IECore::Object>
-		boost::intrusive_ptr<const T> getObjectValue( const IECore::MurmurHash *precomputedHash = nullptr ) const;
 		/// Should be called by derived classes when they wish to set the plug
 		/// value - the value is referenced directly (not copied) and so must
 		/// not be changed following the call.
@@ -271,8 +268,6 @@ class GAFFER_API ValuePlug : public Plug
 		class SetValueAction;
 
 		const IECore::Object *getValueInternal( IECore::ConstObjectPtr &owner, const IECore::MurmurHash *precomputedHash = nullptr ) const;
-		/// \deprecated
-		IECore::ConstObjectPtr getValueInternal( const IECore::MurmurHash *precomputedHash = nullptr ) const;
 		void setValueInternal( IECore::ConstObjectPtr value, bool propagateDirtiness );
 		void childAddedOrRemoved();
 		// Emits the appropriate Node::plugSetSignal() for this plug and all its
diff --git a/include/Gaffer/ValuePlug.inl b/include/Gaffer/ValuePlug.inl
index 276e7ce952a..86bf3151d3a 100644
--- a/include/Gaffer/ValuePlug.inl
+++ b/include/Gaffer/ValuePlug.inl
@@ -54,21 +54,4 @@ const T *ValuePlug::getObjectValue( IECore::ConstObjectPtr &owner, const IECore:
 	) );
 }
 
-template<typename T>
-boost::intrusive_ptr<const T> ValuePlug::getObjectValue( const IECore::MurmurHash *precomputedHash ) const
-{
-	IECore::ConstObjectPtr owner;
-	const T *value = getObjectValue<T>( owner, precomputedHash );
-	if( owner )
-	{
-		// Avoid unnecessary reference count manipulations.
-		return boost::static_pointer_cast<const T>( std::move( owner ) );
-	}
-	else
-	{
-		return value;
-	}
-
-}
-
 } // namespace Gaffer
diff --git a/src/Gaffer/ValuePlug.cpp b/src/Gaffer/ValuePlug.cpp
index 378c0cc68dd..689ff6cd814 100644
--- a/src/Gaffer/ValuePlug.cpp
+++ b/src/Gaffer/ValuePlug.cpp
@@ -967,7 +967,8 @@ void ValuePlug::resetDefault()
 {
 	if( m_defaultValue != nullptr )
 	{
-		IECore::ConstObjectPtr newDefault = getObjectValue();
+		IECore::ConstObjectPtr newDefaultOwner;
+		IECore::ConstObjectPtr newDefault = getObjectValue( newDefaultOwner );
 		IECore::ConstObjectPtr oldDefault = m_defaultValue;
 		Action::enact(
 			this,
@@ -1040,13 +1041,6 @@ const IECore::Object *ValuePlug::getValueInternal( IECore::ConstObjectPtr &owner
 	return ComputeProcess::value( this, owner, precomputedHash );
 }
 
-IECore::ConstObjectPtr ValuePlug::getValueInternal( const IECore::MurmurHash *precomputedHash ) const
-{
-	IECore::ConstObjectPtr owner;
-	const IECore::Object *result = getValueInternal( owner, precomputedHash );
-	return owner ? owner : result;
-}
-
 void ValuePlug::setObjectValue( IECore::ConstObjectPtr value )
 {
 	bool haveInput = getInput();