Merge pull request GafferHQ#6158 from ericmehl/removeDeprecatedStanda…

…rdNoduleMethod StandardNodule : Remove deprecated `setCompatibleLabelsVisible()`
johnhaddon · Nov 25, 2024 · 10c8f0e · 10c8f0e
2 parents 249b61e + 5595d14
commit 10c8f0e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 43 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,6 +1,11 @@
 1.x.x.x (relative to 1.5.x.x)
 =======
 
+Breaking Changes
+----------------
+
+- StandardNodule : Removed deprecated `setCompatibleLabelsVisible()`.
+
 
 
 1.5.x.x (relative to 1.5.1.0)

diff --git a/include/GafferUI/StandardNodule.h b/include/GafferUI/StandardNodule.h
@@ -89,10 +89,6 @@ class GAFFERUI_API StandardNodule : public Nodule
 		bool dragEnd( GadgetPtr gadget, const DragDropEvent &event );
 		bool drop( GadgetPtr gadget, const DragDropEvent &event );
 
-		/// \deprecated Use overloaded method without `visible` when setting `visible = true`
-		/// or `StandardNodeGadget::applyNoduleLabelVisibilityMetadata()` to restore
-		/// metadata-aware visibility.
-		void setCompatibleLabelsVisible( const DragDropEvent &event, bool visible );
 		void setCompatibleLabelsVisible( const DragDropEvent &event );
 
 	private :

diff --git a/src/GafferUI/StandardNodule.cpp b/src/GafferUI/StandardNodule.cpp
@@ -401,10 +401,6 @@ bool StandardNodule::dragLeave( GadgetPtr gadget, const DragDropEvent &event )
 				{
 					nodeGadget->applyNoduleLabelVisibilityMetadata();
 				}
-				else
-				{
-					setCompatibleLabelsVisible( event, false );
-				}
 			}
 		}
 		else if( NodeGadget *newDestination = IECore::runTimeCast<NodeGadget>( event.destinationGadget.get() ) )
@@ -415,10 +411,6 @@ bool StandardNodule::dragLeave( GadgetPtr gadget, const DragDropEvent &event )
 				{
 					nodeGadget->applyNoduleLabelVisibilityMetadata();
 				}
-				else
-				{
-					setCompatibleLabelsVisible( event, false );
-				}
 			}
 		}
 		else
@@ -427,10 +419,6 @@ bool StandardNodule::dragLeave( GadgetPtr gadget, const DragDropEvent &event )
 			{
 				nodeGadget->applyNoduleLabelVisibilityMetadata();
 			}
-			else
-			{
-				setCompatibleLabelsVisible( event, false );
-			}
 		}
 		dirty( DirtyType::Render );
 	}
@@ -459,10 +447,6 @@ bool StandardNodule::drop( GadgetPtr gadget, const DragDropEvent &event )
 	{
 		nodeGadget->applyNoduleLabelVisibilityMetadata();
 	}
-	else
-	{
-		setCompatibleLabelsVisible( event, false );
-	}
 
 	if( ConnectionCreator *creator = IECore::runTimeCast<ConnectionCreator>( event.sourceGadget.get() ) )
 	{
@@ -479,29 +463,6 @@ bool StandardNodule::drop( GadgetPtr gadget, const DragDropEvent &event )
 	return false;
 }
 
-void StandardNodule::setCompatibleLabelsVisible( const DragDropEvent &event, bool visible )
-{
-	NodeGadget *nodeGadget = ancestor<NodeGadget>();
-	if( !nodeGadget )
-	{
-		return;
-	}
-
-	ConnectionCreator *creator = IECore::runTimeCast<ConnectionCreator>( event.sourceGadget.get() );
-	if( !creator )
-	{
-		return;
-	}
-
-	for( StandardNodule::RecursiveIterator it( nodeGadget ); !it.done(); ++it )
-	{
-		if( creator->canCreateConnection( it->get()->plug() ) )
-		{
-			(*it)->setLabelVisible( visible );
-		}
-	}
-}
-
 void StandardNodule::setCompatibleLabelsVisible( const DragDropEvent &event )
 {
 	NodeGadget *nodeGadget = ancestor<NodeGadget>();