disambiguate and protect

GUI/View/Access/DataAccessWidget.cpp

@@ -28,7 +28,7 @@ DataAccessWidget::~DataAccessWidget() = default;
 void DataAccessWidget::setBaseItem(QObject* item)
 {
     m_item = item;
-    ASSERT(jobItem() || realItem());
+    ASSERT(jobItem() || realxItem());
 
     disconnect(m_item, &QObject::destroyed, this, nullptr);
     connect(m_item, &QObject::destroyed, [this] { m_item = nullptr; });
@@ -44,7 +44,7 @@ JobItem* DataAccessWidget::jobItem() const
     return dynamic_cast<JobItem*>(m_item);
 }
 
-DatafileItem* DataAccessWidget::realItem() const
+DatafileItem* DataAccessWidget::realxItem() const
 {
     return dynamic_cast<DatafileItem*>(m_item);
 }
@@ -55,8 +55,8 @@ Data1DItem* DataAccessWidget::realData1DItem() const
             return dynamic_cast<Data1DItem*>(ii->dataItem());
         return nullptr;
     }
-    if (realItem())
-        return dynamic_cast<Data1DItem*>(realItem()->dataItem());
+    if (realxItem())
+        return dynamic_cast<Data1DItem*>(realxItem()->dataItem());
     return nullptr;
 }
 
@@ -67,8 +67,8 @@ Data2DItem* DataAccessWidget::realData2DItem() const
             return dynamic_cast<Data2DItem*>(ii->dataItem());
         return nullptr;
     }
-    if (realItem())
-        return dynamic_cast<Data2DItem*>(realItem()->dataItem());
+    if (realxItem())
+        return dynamic_cast<Data2DItem*>(realxItem()->dataItem());
     return nullptr;
 }
 

GUI/View/Access/DataAccessWidget.h

@@ -38,7 +38,6 @@ public:
     virtual QList<QAction*> actionList();
 
     JobItem* jobItem() const;
-    DatafileItem* realItem() const;
     QObject* jobRealBase() const { return m_item; }
 
     //... Access to concrete items:
@@ -63,6 +62,9 @@ public:
     Data1DItem* currentData1DItem() const;
     Data2DItem* currentData2DItem() const;
 
+protected:
+    DatafileItem* realxItem() const;
+
 private:
     QObject* m_item;
 };

GUI/View/Access/DataPropertyWidget.cpp

@@ -61,9 +61,9 @@ InstrumentItem* DataPropertyWidget::instrumentItem()
 {
     if (jobItem())
         return jobItem()->instrumentItem();
-    else if (realItem()) {
+    else if (realxItem()) {
         ASSERT(gDoc);
-        return gDoc->instrumentModel()->findInstrumentItemById(realItem()->instrumentId());
+        return gDoc->instrumentModel()->findInstrumentItemById(realxItem()->instrumentId());
     } else
         ASSERT_NEVER;
     return nullptr;