move ARDOUR::Configuration and ARDOUR::ConfigVariable into libpbd

3 files changed, 10 insertions, 9 deletions

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index aa975b6b94..7ff5bc5adb 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -22,7 +22,8 @@
 #include <gtkmm/alignment.h>
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/configuration.h"
+#include "pbd/configuration.h"
+
 #include "ardour/rc_configuration.h"
 #include "ardour/utils.h"
 #include "ardour/dB.h"
@@ -377,7 +378,7 @@ OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t)
  *  @param o Configuration to edit.
  *  @param t Title for the dialog.
  */
-OptionEditor::OptionEditor (Configuration* c, std::string const & t)
+OptionEditor::OptionEditor (PBD::Configuration* c, std::string const & t)
 	: ArdourWindow (t), _config (c)
 {
 	using namespace Notebook_Helpers;
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index cb5f76f31d..a91c2404fc 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -46,7 +46,7 @@
  *  options dialog.
  */
 
-namespace ARDOUR {
+namespace PBD {
 	class Configuration;
 }
 
@@ -647,7 +647,7 @@ public:
 class OptionEditor : public ArdourWindow
 {
 public:
-	OptionEditor (ARDOUR::Configuration *, std::string const &);
+	OptionEditor (PBD::Configuration *, std::string const &);
 	~OptionEditor ();
 
 	void add_option (std::string const &, OptionEditorComponent *);
@@ -658,8 +658,8 @@ public:
 protected:
 
 	virtual void parameter_changed (std::string const &);
-
-	ARDOUR::Configuration* _config;
+	
+	PBD::Configuration* _config;
 
 private:
 
diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h
index 244c1a0a82..c9f950d947 100644
--- a/gtk2_ardour/ui_config.h
+++ b/gtk2_ardour/ui_config.h
@@ -29,7 +29,7 @@
 
 #include "pbd/stateful.h"
 #include "pbd/xml++.h"
-#include "ardour/configuration_variable.h"
+#include "pbd/configuration_variable.h"
 
 #include "canvas/colors.h"
 
@@ -96,11 +96,11 @@ class UIConfiguration : public PBD::Stateful
 	/* declare variables */
 
 #undef  UI_CONFIG_VARIABLE
-#define UI_CONFIG_VARIABLE(Type,var,name,value) ARDOUR::ConfigVariable<Type> var;
+#define UI_CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
 #include "ui_config_vars.h"
 #undef UI_CONFIG_VARIABLE
 
-#define CANVAS_FONT_VARIABLE(var,name) ARDOUR::ConfigVariable<std::string> var;
+#define CANVAS_FONT_VARIABLE(var,name) PBD::ConfigVariable<std::string> var;
 #include "canvas_vars.h"
 #undef CANVAS_FONT_VARIABLE