Set connections in TableView not in Bound object

Author: boutinb

QMLComponents/boundcontrols/boundcontrolbase.h

@@ -44,8 +44,6 @@ class BoundControlBase : public BoundControl
 	const Json::Value&			defaultBoundValue()											const	override { return _defaultValue; }
 	void						setDefaultBoundValue(const Json::Value& defaultValue)				override { _defaultValue = defaultValue; }
 
-	JASPControl			*		control() { return _control; }
-
 protected:
 	std::string					getName()													const;
 	bool						setValueType();

QMLComponents/boundcontrols/boundcontroltableview.cpp

@@ -23,9 +23,6 @@
 BoundControlTableView::BoundControlTableView(TableViewBase* tableView)
 	: BoundControlBase(tableView), _tableView(tableView)
 {
-	QObject::connect(qobject_cast<ListModelTableViewBase*>(_tableView->model()), &ListModelTableViewBase::requestComputedColumnCreation,		control(), &JASPControl::requestComputedColumnCreation);
-	QObject::connect(qobject_cast<ListModelTableViewBase*>(_tableView->model()), &ListModelTableViewBase::requestComputedColumnDestruction,		control(), &JASPControl::requestComputedColumnDestruction);
-	
 }
 
 bool BoundControlTableView::isJsonValid(const Json::Value &value) const

QMLComponents/controls/tableviewbase.cpp

@@ -54,6 +54,8 @@ void TableViewBase::setUpModel()
 	connect(_tableModel, &ListModelTableViewBase::columnCountChanged,	this, &TableViewBase::columnCountChanged);
 	connect(_tableModel, &ListModelTableViewBase::rowCountChanged,		this, &TableViewBase::rowCountChanged);
 	connect(_tableModel, &ListModelTableViewBase::variableCountChanged,	this, &TableViewBase::variableCountChanged);
+	connect(_tableModel, &ListModelTableViewBase::requestComputedColumnCreation,	this, &TableViewBase::requestComputedColumnCreation);
+	connect(_tableModel, &ListModelTableViewBase::requestComputedColumnDestruction,	this, &TableViewBase::requestComputedColumnDestruction);
 }
 
 void TableViewBase::setUp()

QMLComponents/controls/textinputbase.cpp

@@ -288,7 +288,7 @@ void TextInputBase::checkIfColumnIsFreeOrMine()
 	if(form() && !form()->isColumnFreeOrMine(val))
 	{
 		setHasScriptError(true);
-		control()->addControlError(tr("Column '%1' already exists and is not created by this analysis.").arg(val));
+		addControlError(tr("Column '%1' already exists and is not created by this analysis.").arg(val));
 	}
 	else
 		setHasScriptError(false);