rename member

GUI/View/SampleDesigner/SampleView.cpp

@@ -54,21 +54,20 @@ SampleView::SampleView(QWidget* parent, ProjectDocument* document)
     sampleSelectionLayout->setSpacing(0);
 
     auto* sampleSelectionToolbar = new StyledToolbar(sampleSelectionPane);
-    m_sampleSelectionView = new SampleListing(this, m_document);
-    sampleSelectionToolbar->addAction(m_sampleSelectionView->newSampleAction());
+    m_listing = new SampleListing(this, m_document);
+    sampleSelectionToolbar->addAction(m_listing->newSampleAction());
 #ifdef BORNAGAIN_PYTHON
-    sampleSelectionToolbar->addAction(m_sampleSelectionView->importSampleAction());
+    sampleSelectionToolbar->addAction(m_listing->importSampleAction());
 #endif
-    sampleSelectionToolbar->addAction(m_sampleSelectionView->chooseFromLibraryAction());
-    if (auto* btn = dynamic_cast<QToolButton*>(sampleSelectionToolbar->widgetForAction(
-            m_sampleSelectionView->chooseFromLibraryAction())))
+    sampleSelectionToolbar->addAction(m_listing->chooseFromLibraryAction());
+    if (auto* btn = dynamic_cast<QToolButton*>(
+            sampleSelectionToolbar->widgetForAction(m_listing->chooseFromLibraryAction())))
         btn->setPopupMode(QToolButton::InstantPopup);
 
     sampleSelectionToolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     sampleSelectionLayout->addWidget(sampleSelectionToolbar);
-    sampleSelectionLayout->addWidget(m_sampleSelectionView);
-    m_sampleSelectionView->setSizePolicy(QSizePolicy::MinimumExpanding,
-                                         QSizePolicy::MinimumExpanding);
+    sampleSelectionLayout->addWidget(m_listing);
+    m_listing->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
     auto* scriptPanel = new ScriptPanel(this);
     m_realspacePanel = new RealspacePanel(this);
@@ -79,26 +78,25 @@ SampleView::SampleView(QWidget* parent, ProjectDocument* document)
     m_docks->addWidget(REALSPACEPANEL, m_realspacePanel, Qt::BottomDockWidgetArea);
     m_docks->addWidget(PYTHONPANEL, scriptPanel, Qt::BottomDockWidgetArea);
 
-    connect(m_sampleSelectionView, &SampleListing::currentSampleChanged, editor,
+    connect(m_listing, &SampleListing::currentSampleChanged, editor,
             &SampleEditor::setCurrentSample);
 
-    connect(m_sampleSelectionView, &SampleListing::currentSampleChanged,
+    connect(m_listing, &SampleListing::currentSampleChanged,
             [&](SampleItem* m) { onRequestViewInRealspace(m); });
 
-    connect(m_sampleSelectionView, &SampleListing::currentSampleChanged, scriptPanel,
+    connect(m_listing, &SampleListing::currentSampleChanged, scriptPanel,
             &ScriptPanel::setCurrentSample);
 
     connect(editor, &SampleEditor::modified, scriptPanel, &ScriptPanel::onSampleModified);
 
-    connect(editor, &SampleEditor::modified, m_sampleSelectionView,
-            &SampleListing::onSampleModified);
+    connect(editor, &SampleEditor::modified, m_listing, &SampleListing::onSampleModified);
 
     connect(editor, &SampleEditor::requestViewInRealspace, this,
             &SampleView::onRequestViewInRealspace);
 
     connect(editor, &SampleEditor::aboutToRemoveItem, this, &SampleView::onAboutToRemoveItem);
 
-    connect(editor, &SampleEditor::requestCreateNewSample, m_sampleSelectionView->newSampleAction(),
+    connect(editor, &SampleEditor::requestCreateNewSample, m_listing->newSampleAction(),
             &QAction::trigger, Qt::QueuedConnection);
 
     connect(editor, &SampleEditor::modified, m_realspacePanel->widget(),
@@ -124,7 +122,7 @@ void SampleView::onRequestViewInRealspace(Item3D* item)
     }
 
     m_docks->setDockVisible(REALSPACEPANEL);
-    m_realspacePanel->widget()->setDisplayedItem(m_sampleSelectionView->currentSampleItem(), item);
+    m_realspacePanel->widget()->setDisplayedItem(m_listing->currentSampleItem(), item);
 }
 
 void SampleView::onAboutToRemoveItem(Item3D* item)
@@ -183,8 +181,8 @@ void SampleView::fillViewMenu(QMenu* menu)
 
 void SampleView::showEvent(QShowEvent*)
 {
-    if (!m_sampleSelectionView->currentSampleItem())
-        m_sampleSelectionView->restoreSelection();
+    if (!m_listing->currentSampleItem())
+        m_listing->restoreSelection();
 }
 
 void SampleView::resetLayout()

GUI/View/SampleDesigner/SampleView.h

@@ -51,7 +51,7 @@ private:
     DocksController* m_docks = nullptr;
     ProjectDocument* m_document = nullptr;
     RealspacePanel* m_realspacePanel = nullptr;
-    SampleListing* m_sampleSelectionView = nullptr;
+    SampleListing* m_listing = nullptr;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEVIEW_H