Revert "PathColumn : ABI compatibility workaround"

This reverts commit 488fd35.
GafferHQ · Feb 14, 2025 · efd1322 · efd1322
1 parent e907964
commit efd1322
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/include/GafferUI/PathColumn.h b/include/GafferUI/PathColumn.h
@@ -78,7 +78,6 @@ class GAFFERUI_API PathColumn : public IECore::RefCounted, public Gaffer::Signal
 		};
 
 		explicit PathColumn( SizeMode sizeMode = Default );
-		~PathColumn();
 
 		/// Returns the current column size mode.
 		SizeMode getSizeMode() const;
@@ -199,6 +198,10 @@ class GAFFERUI_API PathColumn : public IECore::RefCounted, public Gaffer::Signal
 		ContextMenuSignal m_contextMenuSignal;
 		KeySignal m_keyPressSignal;
 		KeySignal m_keyReleaseSignal;
+		DragDropSignal m_dragEnterSignal;
+		DragDropSignal m_dragMoveSignal;
+		DragDropSignal m_dragLeaveSignal;
+		DragDropSignal m_dropSignal;
 
 		SizeMode m_sizeMode;
 

diff --git a/src/GafferUI/PathColumn.cpp b/src/GafferUI/PathColumn.cpp
@@ -47,9 +47,6 @@
 
 #include "fmt/format.h"
 
-#include <memory>
-#include <unordered_map>
-
 using namespace IECore;
 using namespace Gaffer;
 using namespace GafferUI;
@@ -72,11 +69,6 @@ const std::string basisName( StandardCubicBasis basis )
 	return "Unknown";
 }
 
-std::unordered_map<const PathColumn *, std::unique_ptr<PathColumn::DragDropSignal>> g_dragEnterSignals;
-std::unordered_map<const PathColumn *, std::unique_ptr<PathColumn::DragDropSignal>> g_dragMoveSignals;
-std::unordered_map<const PathColumn *, std::unique_ptr<PathColumn::DragDropSignal>> g_dragLeaveSignals;
-std::unordered_map<const PathColumn *, std::unique_ptr<PathColumn::DragDropSignal>> g_dropSignals;
-
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////////
@@ -86,18 +78,6 @@ std::unordered_map<const PathColumn *, std::unique_ptr<PathColumn::DragDropSigna
 PathColumn::PathColumn( SizeMode sizeMode )
 	:	m_sizeMode( sizeMode )
 {
-	g_dragEnterSignals[this] = std::make_unique<PathColumn::DragDropSignal>();
-	g_dragMoveSignals[this] = std::make_unique<PathColumn::DragDropSignal>();
-	g_dragLeaveSignals[this] = std::make_unique<PathColumn::DragDropSignal>();
-	g_dropSignals[this] = std::make_unique<PathColumn::DragDropSignal>();
-}
-
-PathColumn::~PathColumn()
-{
-	g_dragEnterSignals.erase( this );
-	g_dragMoveSignals.erase( this );
-	g_dragLeaveSignals.erase( this );
-	g_dropSignals.erase( this );
 }
 
 PathColumn::SizeMode PathColumn::getSizeMode() const
@@ -147,22 +127,22 @@ PathColumn::KeySignal &PathColumn::keyReleaseSignal()
 
 PathColumn::DragDropSignal &PathColumn::dragEnterSignal()
 {
-	return *( g_dragEnterSignals[this] );
+	return m_dragEnterSignal;
 }
 
 PathColumn::DragDropSignal &PathColumn::dragMoveSignal()
 {
-	return *( g_dragMoveSignals[this] );
+	return m_dragMoveSignal;
 }
 
 PathColumn::DragDropSignal &PathColumn::dragLeaveSignal()
 {
-	return *( g_dragLeaveSignals[this] );
+	return m_dragLeaveSignal;
 }
 
 PathColumn::DragDropSignal &PathColumn::dropSignal()
 {
-	return *( g_dropSignals[this] );
+	return m_dropSignal;
 }
 
 PathColumn::PathColumnSignal &PathColumn::instanceCreatedSignal()