From 5016c950d0c90f77da0699b564dc2a2c83f8a225 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Mon, 17 Oct 2022 23:22:39 +0200
Subject: [PATCH] Move ControllableSet up in PBD's namespace

This is in preparation to supersede AutomationControlSet
with a lower level generic std::set usable in any relevant
context.
---
 libs/pbd/controllable.cc    | 2 +-
 libs/pbd/pbd/controllable.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index 4cdd134559..6f2819a067 100644
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -145,7 +145,7 @@ Controllable::by_id (const ID& id)
 	return boost::shared_ptr<Controllable>();
 }
 
-Controllable::ControllableSet
+ControllableSet
 Controllable::registered_controllables ()
 {
 	ControllableSet rv;
diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h
index 6494484ae5..7a781c4d90 100644
--- a/libs/pbd/pbd/controllable.h
+++ b/libs/pbd/pbd/controllable.h
@@ -38,6 +38,9 @@ class XMLNode;
 
 namespace PBD {
 
+class Controllable;
+typedef std::set<boost::shared_ptr<Controllable>> ControllableSet;
+
 /** This is a pure virtual class to represent a scalar control.
  *
  * Note that it contains no storage/state for the controllable thing that it
@@ -168,9 +171,6 @@ public:
 
 	static boost::shared_ptr<Controllable> by_id (const PBD::ID&);
 	static void dump_registry ();
-
-
-	typedef std::set<boost::shared_ptr<Controllable>> ControllableSet;
 	static ControllableSet registered_controllables ();
 
 	static const std::string xml_node_name;