disambiguate

GUI/View/Access/DataAccessWidget.cpp

@@ -28,7 +28,7 @@ DataAccessWidget::~DataAccessWidget() = default;
 void DataAccessWidget::setBaseItem(QObject* item)
 {
     m_item = item;
-    ASSERT(jobItem() || realxItem());
+    ASSERT(jobxItem() || realxItem());
 
     disconnect(m_item, &QObject::destroyed, this, nullptr);
     connect(m_item, &QObject::destroyed, [this] { m_item = nullptr; });
@@ -39,7 +39,7 @@ QList<QAction*> DataAccessWidget::actionList()
     return {};
 }
 
-JobItem* DataAccessWidget::jobItem() const
+JobItem* DataAccessWidget::jobxItem() const
 {
     return dynamic_cast<JobItem*>(m_item);
 }
@@ -50,8 +50,8 @@ DatafileItem* DataAccessWidget::realxItem() const
 }
 Data1DItem* DataAccessWidget::realData1DItem() const
 {
-    if (jobItem()) {
-        if (const DatafileItem* ii = jobItem()->realItem())
+    if (jobxItem()) {
+        if (const DatafileItem* ii = jobxItem()->realItem())
             return dynamic_cast<Data1DItem*>(ii->dataItem());
         return nullptr;
     }
@@ -62,8 +62,8 @@ Data1DItem* DataAccessWidget::realData1DItem() const
 
 Data2DItem* DataAccessWidget::realData2DItem() const
 {
-    if (jobItem()) {
-        if (const DatafileItem* ii = jobItem()->realItem())
+    if (jobxItem()) {
+        if (const DatafileItem* ii = jobxItem()->realItem())
             return dynamic_cast<Data2DItem*>(ii->dataItem());
         return nullptr;
     }
@@ -74,22 +74,22 @@ Data2DItem* DataAccessWidget::realData2DItem() const
 
 Data1DItem* DataAccessWidget::simuData1DItem() const
 {
-    return jobItem() ? dynamic_cast<Data1DItem*>(jobItem()->simulatedDataItem()) : nullptr;
+    return jobxItem() ? dynamic_cast<Data1DItem*>(jobxItem()->simulatedDataItem()) : nullptr;
 }
 
 Data2DItem* DataAccessWidget::simuData2DItem() const
 {
-    return jobItem() ? dynamic_cast<Data2DItem*>(jobItem()->simulatedDataItem()) : nullptr;
+    return jobxItem() ? dynamic_cast<Data2DItem*>(jobxItem()->simulatedDataItem()) : nullptr;
 }
 
 Data1DItem* DataAccessWidget::diffData1DItem() const
 {
-    return jobItem() ? dynamic_cast<Data1DItem*>(jobItem()->diffDataItem()) : nullptr;
+    return jobxItem() ? dynamic_cast<Data1DItem*>(jobxItem()->diffDataItem()) : nullptr;
 }
 
 Data2DItem* DataAccessWidget::diffData2DItem() const
 {
-    return jobItem() ? dynamic_cast<Data2DItem*>(jobItem()->diffDataItem()) : nullptr;
+    return jobxItem() ? dynamic_cast<Data2DItem*>(jobxItem()->diffDataItem()) : nullptr;
 }
 
 QList<Data1DItem*> DataAccessWidget::mainData1DItems() const

GUI/View/Access/DataAccessWidget.h

@@ -37,7 +37,7 @@ public:
 
     virtual QList<QAction*> actionList();
 
-    JobItem* jobItem() const;
+    JobItem* jobxItem() const;
     QObject* jobRealBase() const { return m_item; }
 
     //... Access to concrete items:

GUI/View/Access/DataPropertyWidget.cpp

@@ -59,8 +59,8 @@ void DataPropertyWidget::updateUIValues()
 
 InstrumentItem* DataPropertyWidget::instrumentItem()
 {
-    if (jobItem())
-        return jobItem()->instrumentItem();
+    if (jobxItem())
+        return jobxItem()->instrumentItem();
     else if (realxItem()) {
         ASSERT(gDoc);
         return gDoc->instrumentModel()->findInstrumentItemById(realxItem()->instrumentId());

GUI/View/Frame/Fit2DFrame.cpp

@@ -80,7 +80,6 @@ Fit2DFrame::Fit2DFrame(JobItem* job_item)
 
     ASSERT(job_item);
     setBaseItem(job_item);
-    ASSERT(jobItem());
 
     GUI::View::RangeUtil::setCommonRangeZ(mainData2DItems());
     updateDiffData();