Some minor cleaning up.

opencor · Sep 4, 2020 · c810b51 · c810b51
1 parent 97cddee
commit c810b51
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 43 deletions.
diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.cpp b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.cpp
@@ -43,12 +43,6 @@ CellMLZincMappingViewWidget::CellMLZincMappingViewWidget(QWidget *pParent) :
 
 //==============================================================================
 
-CellMLZincMappingViewWidget::~CellMLZincMappingViewWidget()
-{
-}
-
-//==============================================================================
-
 void CellMLZincMappingViewWidget::retranslateUi()
 {
     // Retranslate our editing widgets
@@ -83,7 +77,7 @@ void CellMLZincMappingViewWidget::loadSettings(QSettings &pSettings)
     mEditingWidgetHorizontalSizes = qVariantListToIntList(pSettings.value(SettingsCellmlZincMappingViewEditingWidgetHorizontalSizes, DefaultEditingWidgetHorizontalSizes).toList());
     mEditingWidgetVerticalSizes = qVariantListToIntList(pSettings.value(SettingsCellmlZincMappingViewEditingWidgetVerticalSizes, DefaultEditingWidgetVerticalSizes).toList());
 
-    mMeshFileNames= pSettings.value(SettingsCellmlZincMappingViewMeshFileNames, DefaultMeshFileNames).toStringList();
+    mMeshFileNames = pSettings.value(SettingsCellmlZincMappingViewMeshFileNames, DefaultMeshFileNames).toStringList();
 }
 
 //==============================================================================
@@ -166,24 +160,6 @@ void CellMLZincMappingViewWidget::finalize(const QString &pFileName)
 
 //==============================================================================
 
-CellMLZincMappingViewEditingWidget* CellMLZincMappingViewWidget::editingWidget(const QString &pFileName) const
-{
-    // Return the requested simulation widget
-
-    return mEditingWidgets.value(pFileName);
-}
-
-//==============================================================================
-
-QWidget * CellMLZincMappingViewWidget::widget(const QString &pFileName)
-{
-    // Return the requested (simulation) widget
-
-    return editingWidget(pFileName);
-}
-
-//==============================================================================
-
 void CellMLZincMappingViewWidget::filePermissionsChanged(const QString &pFileName)
 {
     // The given file has been un/locked, so enable/disable parts of our GUI,
@@ -198,53 +174,64 @@ void CellMLZincMappingViewWidget::filePermissionsChanged(const QString &pFileNam
 
 //==============================================================================
 
-void CellMLZincMappingViewWidget::fileSaved(const QString &pFileName)
-{
-    Q_UNUSED(pFileName);
-}
-
-//==============================================================================
-
 void CellMLZincMappingViewWidget::fileReloaded(const QString &pFileName)
 {
     // The given file has been reloaded, so reload it, should it be managed
 
     if (mEditingWidgets.contains(pFileName)) {
         finalize(pFileName);
         initialize(pFileName);
-        mEditingWidget->setSizes(mEditingWidgetHorizontalSizes,mEditingWidgetVerticalSizes);
     }
 }
 
 //==============================================================================
 
-void CellMLZincMappingViewWidget::fileRenamed(const QString &pOldFileName, const QString &pNewFileName)
+void CellMLZincMappingViewWidget::fileRenamed(const QString &pOldFileName,
+                                              const QString &pNewFileName)
 {
     // The given file has been renamed, so update our editing widgets mapping
 
     CellMLZincMappingViewEditingWidget *editingWidget = mEditingWidgets.value(pOldFileName);
 
-    if (editingWidget!=nullptr) {
+    if (editingWidget != nullptr) {
         mEditingWidgets.insert(pNewFileName, editingWidget);
         mEditingWidgets.remove(pOldFileName);
     }
 }
 
 //==============================================================================
 
+QWidget * CellMLZincMappingViewWidget::widget(const QString &pFileName)
+{
+    // Return the requested (editing) widget
+
+    return mEditingWidgets.value(pFileName);
+}
+
+//==============================================================================
+
 void CellMLZincMappingViewWidget::setDefaultMeshFiles(const QStringList &pFileNames)
 {
       mMeshFileNames = pFileNames;
 }
 
+//==============================================================================
 
 void CellMLZincMappingViewWidget::EditingWidgetHorizontalSplitterMoved(const QIntList &pSizes)
 {
+    // The horizontal splitter of our editing widget has moved, so keep track of
+    // its new sizes
+
     mEditingWidgetHorizontalSizes = pSizes;
 }
 
+//==============================================================================
+
 void CellMLZincMappingViewWidget::EditingWidgetVerticalSplitterMoved(const QIntList &pSizes)
 {
+    // The vertical splitter of our editing widget has moved, so keep track of
+    // its new sizes
+
     mEditingWidgetVerticalSizes = pSizes;
 }
 

diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.h b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewwidget.h
@@ -54,25 +54,21 @@ class CellMLZincMappingViewWidget : public Core::ViewWidget
 
 public:
     explicit CellMLZincMappingViewWidget(QWidget *pParent);
-    ~CellMLZincMappingViewWidget() override;
-
-    void retranslateUi() override;
 
     void loadSettings(QSettings &pSettings) override;
     void saveSettings(QSettings &pSettings) const override;
 
+    void retranslateUi() override;
+
     void initialize(const QString &pFileName);
     void finalize(const QString &pFileName);
 
-    CellMLZincMappingViewEditingWidget * editingWidget(const QString &pFileName) const;
-
-    QWidget * widget(const QString &pFileName) override;
-
     void filePermissionsChanged(const QString &pFileName);
-    void fileSaved(const QString &pFileName);
     void fileReloaded(const QString &pFileName);
     void fileRenamed(const QString &pOldFileName, const QString &pNewFileName);
 
+    QWidget * widget(const QString &pFileName) override;
+
     void setDefaultMeshFiles(const QStringList &pFileNames);
 
 private: