From 44135ee3e230b375745d21f54198e3679218647d Mon Sep 17 00:00:00 2001
From: Alexander Semke <alexander.semke@web.de>
Date: Sat, 5 Oct 2024 19:22:07 +0200
Subject: [PATCH] Makes use of TreeViewComboBox::plotColumnTopLevelClasses()
 also in BarPlotDock and in ErrorBarWidget.

---
 src/frontend/dockwidgets/BarPlotDock.cpp | 23 ++++-------------------
 src/frontend/widgets/ErrorBarWidget.cpp  | 14 +-------------
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/src/frontend/dockwidgets/BarPlotDock.cpp b/src/frontend/dockwidgets/BarPlotDock.cpp
index 97a72103e..674c2d1fe 100644
--- a/src/frontend/dockwidgets/BarPlotDock.cpp
+++ b/src/frontend/dockwidgets/BarPlotDock.cpp
@@ -311,24 +311,11 @@ void BarPlotDock::removeXColumn() {
 
 void BarPlotDock::addDataColumn() {
 	auto* cb = new TreeViewComboBox(this);
-
-	static const QList<AspectType> list{AspectType::Folder,
-										AspectType::Workbook,
-										AspectType::Datapicker,
-										AspectType::DatapickerCurve,
-										AspectType::Spreadsheet,
-										AspectType::LiveDataSource,
-										AspectType::Column,
-										AspectType::Worksheet,
-										AspectType::CartesianPlot,
-										AspectType::XYFitCurve,
-										AspectType::XYSmoothCurve,
-										AspectType::Notebook};
-	cb->setTopLevelClasses(list);
+	cb->setTopLevelClasses(TreeViewComboBox::plotColumnTopLevelClasses());
 	cb->setModel(aspectModel());
 	connect(cb, &TreeViewComboBox::currentModelIndexChanged, this, &BarPlotDock::dataColumnChanged);
 
-	int index = m_dataComboBoxes.size();
+	const int index = m_dataComboBoxes.size();
 
 	if (index == 0) {
 		QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Preferred);
@@ -373,11 +360,10 @@ void BarPlotDock::removeDataColumn() {
 	}
 
 	// TODO
-	if (!m_removeButtons.isEmpty()) {
+	if (!m_removeButtons.isEmpty())
 		ui.lDataColumn->setText(i18n("Columns:"));
-	} else {
+	else
 		ui.lDataColumn->setText(i18n("Column:"));
-	}
 
 	if (!m_initializing)
 		setDataColumns();
@@ -385,7 +371,6 @@ void BarPlotDock::removeDataColumn() {
 
 void BarPlotDock::dataColumnChanged(const QModelIndex&) {
 	CONDITIONAL_LOCK_RETURN;
-
 	setDataColumns();
 }
 
diff --git a/src/frontend/widgets/ErrorBarWidget.cpp b/src/frontend/widgets/ErrorBarWidget.cpp
index 45b28e625..bf6b1e6e0 100644
--- a/src/frontend/widgets/ErrorBarWidget.cpp
+++ b/src/frontend/widgets/ErrorBarWidget.cpp
@@ -166,21 +166,9 @@ void ErrorBarWidget::setErrorBars(const QList<ErrorBar*>& errorBars) {
 }
 
 void ErrorBarWidget::setModel(AspectTreeModel* model) {
-	QList<AspectType> list{AspectType::Folder,
-						   AspectType::Workbook,
-						   AspectType::Datapicker,
-						   AspectType::DatapickerCurve,
-						   AspectType::Spreadsheet,
-						   AspectType::LiveDataSource,
-						   AspectType::Column,
-						   AspectType::Worksheet,
-						   AspectType::CartesianPlot,
-						   AspectType::XYFitCurve,
-						   AspectType::XYSmoothCurve,
-						   AspectType::Notebook};
-
 	cbXPlusColumn->setModel(model);
 	cbXMinusColumn->setModel(model);
+	const auto& list = TreeViewComboBox::plotColumnTopLevelClasses();
 	cbXPlusColumn->setTopLevelClasses(list);
 	cbXMinusColumn->setTopLevelClasses(list);