Remove _MDSubItems member

Author: boutinb

QMLComponents/analysisform.cpp

@@ -968,10 +968,7 @@ QString AnalysisForm::helpMD() const
 	for(JASPControl * control : orderedControls)
 	{
 		if (control->hasInfoSomewhere())
-		{
-			control->setMDSubItems();
 			markdown << control->generateMDHelp() << "\n";
-		}
 	}
 
 	markdown << metaHelpMD();

QMLComponents/controls/jaspcontrol.cpp

@@ -602,37 +602,40 @@ bool JASPControl::hasLabelOrInfo() const
 	return !fullLabel().isEmpty() || !info().isEmpty();
 }
 
-void JASPControl::setMDSubItems()
+std::vector<JASPControl*> JASPControl::getMDSubItems() const
 {
-	_MDSubItems.clear();
+	std::vector<JASPControl*> MDSubItems;
 
 	for (JASPControl* childControl : getChildJASPControls(_childControlsArea ? _childControlsArea : this, true))
 	{
 		// In case of RadioButtonGroup, if at least one of the RadioButton has info, then all RadioButtons should be listed even if they don't have any info
 		if (childControl->hasInfoSomewhere() || (controlType() == ControlType::RadioButtonGroup && childControl->controlType() == ControlType::RadioButton))
 		{
-			childControl->setMDSubItems();
+			std::vector<JASPControl*> MDGrandChilren = childControl->getMDSubItems();
 
 			if (!childControl->hasLabelOrInfo())
 				// The child does not have label nor info: just add its own children to the parent
-				_MDSubItems.insert(_MDSubItems.end(), childControl->MDSubItems().begin(), childControl->MDSubItems().end());
+				MDSubItems.insert(MDSubItems.end(), MDGrandChilren.begin(), MDGrandChilren.end());
 			else
-				_MDSubItems.push_back(childControl);
+				MDSubItems.push_back(childControl);
 		}
 	}
+
+	return MDSubItems;
 }
 
 QString JASPControl::generateMDHelp(int depth) const
 {
+	std::vector<JASPControl*> MDSubItems = getMDSubItems();
 	QStringList markdown;
 	markdown << printLabelMD(depth) << info() << "\n";
 
-	if (_MDSubItems.size() == 1)
-		markdown << "\n" << QString{depth * 2, ' '} << _MDSubItems[0]->generateMDHelp(depth + 1);
-	else if (_MDSubItems.size() > 1)
+	if (MDSubItems.size() == 1)
+		markdown << "\n" << QString{depth * 2, ' '} << MDSubItems[0]->generateMDHelp(depth + 1);
+	else if (MDSubItems.size() > 1)
 	{
 		markdown << "\n"; // Before adding bullets, a new line is needed
-		for (const auto& childMD : _MDSubItems)
+		for (const auto& childMD : MDSubItems)
 			markdown << QString{depth * 2, ' '} << "- " << childMD->generateMDHelp(depth + 1);
 	}
 

QMLComponents/controls/jaspcontrol.h

@@ -119,7 +119,7 @@ class JASPControl : public QQuickItem
 	virtual bool		infoLabelItalic()			const	{ return  false;					}
 
 	QString				toolTip()					const	{ return _toolTip;					}
-	void				setMDSubItems();
+	std::vector<JASPControl*> getMDSubItems()		const;
 	virtual QString		generateMDHelp(int depth = 0) const;
 	virtual QString		generateDoxygenHelp()		const;
 	virtual bool		hasInfoSomewhere()					const;
@@ -180,7 +180,6 @@ class JASPControl : public QQuickItem
 
 	virtual QString					friendlyName() const;
 	void							addExplicitDependency();
-	const std::vector<JASPControl*>& MDSubItems() const { return _MDSubItems; }
 	bool							hasLabelOrInfo() const;
 
 public slots:
@@ -321,8 +320,6 @@ private slots:
 	QVariant				_explicitDepends;
 	QString					_info,
 							_infoLabel;
-	std::vector<JASPControl*>	_MDSubItems;
-
 
 	static QMap<QQmlEngine*, QQmlComponent*>		_mouseAreaComponentMap;
 	static QByteArray								_mouseAreaDef;