further disambiguate ThePresentation vs ComboPresentation

GUI/View/Combo/ItemComboWidget.cpp

@@ -48,7 +48,7 @@ void ItemComboWidget::registerWidget(const QString& presentationType, factory_fu
 }
 
 //! Sets stack to show widget corresponding to given presentation
-void ItemComboWidget::setPresentation(const QString& presentationType)
+void ItemComboWidget::setComboPresentation(const QString& presentationType)
 {
     if (presentationType.isEmpty()) {
         m_stackedWidget->setCurrentWidget(m_blankWidget);
@@ -101,7 +101,7 @@ void ItemComboWidget::setTheItem(QObject* job_or_real_item)
 
     setToolbarVisible(!itemPresentation().isEmpty());
     m_toolbar->setPresentationList(presentationList(), activePresentationList());
-    setPresentation(itemPresentation());
+    setThePresentation(itemPresentation());
 }
 
 //! Returns list of active presentations. Active presentation is the one
@@ -139,7 +139,7 @@ QString ItemComboWidget::selectedPresentation() const
 
 void ItemComboWidget::onComboChanged(const QString&)
 {
-    setPresentation(selectedPresentation());
+    setThePresentation(selectedPresentation());
 }
 
 //! Resizes QStackedWidget to currently active page.

GUI/View/Combo/ItemComboWidget.h

@@ -44,13 +44,14 @@ public:
 
     void registerWidget(const QString& presentationType, factory_function_t);
 
-    virtual void setPresentation(const QString& presentationType);
+    virtual void setThePresentation(const QString& presentationType) = 0;
 
     void setTheItem(QObject* job_or_real_item);
     JobItem* jobItem() const;
     DatafileItem* realItem() const;
 
 protected:
+    void setComboPresentation(const QString& presentationType);
     virtual QStringList activePresentationList() const;
     virtual QStringList presentationList() const;
     virtual QString itemPresentation() const;

GUI/View/Data/DatafilePresenter.cpp

@@ -40,9 +40,9 @@ QString DatafilePresenter::itemPresentation() const
     return realItem()->presentationType();
 }
 
-void DatafilePresenter::setPresentation(const QString& presentationType)
+void DatafilePresenter::setThePresentation(const QString& presentationType)
 {
-    ItemComboWidget::setPresentation(presentationType);
+    setComboPresentation(presentationType);
     if (realItem() && !presentationType.isEmpty())
         realItem()->setPresentationType(presentationType);
 }

GUI/View/Data/DatafilePresenter.h

@@ -25,7 +25,7 @@ class DatafilePresenter : public ItemComboWidget {
 public:
     explicit DatafilePresenter(QWidget* parent = nullptr);
 
-    void setPresentation(const QString& presentationType) override;
+    void setThePresentation(const QString& presentationType) override;
     void setModel(QObject*) {}
 
 private:

GUI/View/Job/JobResultsPresenter.cpp

@@ -75,9 +75,9 @@ void JobResultsPresenter::setJobItem(JobItem* jobItem)
     ItemComboWidget::setTheItem(jobItem);
 }
 
-void JobResultsPresenter::setPresentation(const QString& presentationType)
+void JobResultsPresenter::setThePresentation(const QString& presentationType)
 {
-    ItemComboWidget::setPresentation(presentationType);
+    setComboPresentation(presentationType);
     if (jobItem() && !presentationType.isEmpty())
         jobItem()->setPresentationType(presentationType);
 }
@@ -98,7 +98,7 @@ void JobResultsPresenter::setPresentationForActivity(JobViewActivity activity)
         presentation = defaultPresentationOfInstrument(jobItem());
         break;
     }
-    setPresentation(presentation);
+    setThePresentation(presentation);
 }
 
 //! Returns list of presentation types, available for given item. JobItem with fitting abilities

GUI/View/Job/JobResultsPresenter.h

@@ -29,7 +29,7 @@ public:
     explicit JobResultsPresenter(QWidget* parent = nullptr);
 
     void setJobItem(JobItem* jobItem);
-    void setPresentation(const QString& presentationType) override;
+    void setThePresentation(const QString& presentationType) override;
     void setPresentationForActivity(JobViewActivity activity);
 
 private: