From 09d9938ecdcbf68fcb30f507eb2d2c650e3dd82f Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sun, 28 Mar 2021 04:31:11 +0200
Subject: [PATCH] Remove duplicate symbol ColumnInfo from global namespace
 #8637

---
 gtk2_ardour/editor_regions.cc      | 16 +++++++---------
 gtk2_ardour/editor_route_groups.cc | 15 +++++++--------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 8b7e0e359b..04513a70c5 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -72,14 +72,6 @@ using namespace Glib;
 using namespace Editing;
 using Gtkmm2ext::Keyboard;
 
-struct ColumnInfo {
-	int                index;
-	int                sort_idx;
-	Gtk::AlignmentEnum al;
-	const char*        label;
-	const char*        tooltip;
-};
-
 //#define SHOW_REGION_EXTRAS
 
 EditorRegions::EditorRegions (Editor* e)
@@ -177,8 +169,14 @@ EditorRegions::EditorRegions (Editor* e)
 	TreeViewColumn* col;
 	Gtk::Label*     l;
 
+	struct ColumnInfo {
+		int                index;
+		int                sort_idx;
+		Gtk::AlignmentEnum al;
+		const char*        label;
+		const char*        tooltip;
+	} ci[] = {
 	/* clang-format off */
-	ColumnInfo ci[] = {
 		{ 0,  0,  ALIGN_LEFT,    _("Name"),      _("Region name") },
 		{ 1,  1,  ALIGN_LEFT,    _("# Ch"),      _("# Channels in the region") },
 		{ 2,  2,  ALIGN_LEFT,    _("Tags"),      _("Tags") },
diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 73d65de171..4b6503677e 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -62,12 +62,6 @@ using namespace PBD;
 using namespace Gtk;
 using Gtkmm2ext::Keyboard;
 
-struct ColumnInfo {
-	int         index;
-	const char* label;
-	const char* tooltip;
-};
-
 EditorRouteGroups::EditorRouteGroups (Editor* e)
 	: EditorComponent (e)
 	, _in_row_change (false)
@@ -98,7 +92,12 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
 	TreeViewColumn* col;
 	Gtk::Label* l;
 
-	ColumnInfo ci[] = {
+	struct ColumnInfo {
+		int         index;
+		const char* label;
+		const char* tooltip;
+	} ci[] = {
+	/* clang-format off */
 		{ 0,   _("Col"),            _("Group Tab Color") },
 		{ 1,   _("Name"),           _("Name of Group") },
 		{ 2,  S_("Visible|V"),      _("Group is visible?") },
@@ -113,7 +112,7 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
 		{ 11, S_("Active|A"),       _("Sharing Active Status?") },
 		{ -1, 0, 0 }
 	};
-
+	/* clang-format on */
 
 	for (int i = 0; ci[i].index >= 0; ++i) {
 		col = _display.get_column (ci[i].index);