Skip to content
Snippets Groups Projects
Commit c114eaf2 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

disambiguate fct name

parent 996aab90
No related branches found
No related tags found
1 merge request!1637Provide loader for Motofit MFT files, and simplify command flow in RealModel context
Pipeline #99767 passed
......@@ -191,7 +191,7 @@ QList<QAction*> RealDataSelectorWidget::getOverlayActions(const QModelIndex& ind
removeAction->setIconText("Remove");
removeAction->setToolTip("Remove this data");
connect(removeAction, &QAction::triggered, [this, item]() {
m_treeModel->removeItem(item);
m_treeModel->removeDataItem(item);
gProjectDocument.value()->setModified();
});
......@@ -267,7 +267,7 @@ void RealDataSelectorWidget::importData1D()
if (errorText.isEmpty())
setCurrentItem(realItem);
else {
m_treeModel->removeItem(realItem);
m_treeModel->removeDataItem(realItem);
GUI::View::Helpers::warning(this, "File import",
QString("The file '%1' could not be imported.")
.arg(QDir::toNativeSeparators(fileName)),
......@@ -324,7 +324,7 @@ void RealDataSelectorWidget::importData2D()
realItem->setDatafield(data.release());
setCurrentItem(realItem);
} catch (std::exception& ex) {
m_treeModel->removeItem(realItem);
m_treeModel->removeDataItem(realItem);
const QString message = QString("Error while trying to read file\n\n'%1'\n\n%2")
.arg(fileName)
......@@ -350,7 +350,7 @@ void RealDataSelectorWidget::renameCurrentItem()
void RealDataSelectorWidget::removeCurrentItem()
{
m_treeModel->removeItem(currentItem());
m_treeModel->removeDataItem(currentItem());
gProjectDocument.value()->setModified();
}
......
......@@ -59,7 +59,7 @@ void RealDataTreeModel::refreshAfterModelChange()
updateSubscriptions();
}
void RealDataTreeModel::removeItem(RealItem* item)
void RealDataTreeModel::removeDataItem(RealItem* item)
{
QModelIndex index = indexForItem(item);
if (!index.isValid())
......
......@@ -42,7 +42,7 @@ public:
void refreshAfterModelChange();
void removeItem(RealItem* item);
void removeDataItem(RealItem* item);
RealItem* injectDataItem(int rank);
//! The topmost visible item. Can be null of course.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment