Some minor cleaning up.

opencor · Jan 25, 2019 · 5dadc8b · 5dadc8b
1 parent cd21ea7
commit 5dadc8b
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 47 deletions.
diff --git a/src/plugins/editing/CellMLTextView/src/cellmltextviewwidget.cpp b/src/plugins/editing/CellMLTextView/src/cellmltextviewwidget.cpp
@@ -453,15 +453,6 @@ void CellmlTextViewWidget::retranslateUi()
 
 //==============================================================================
 
-bool CellmlTextViewWidget::contains(const QString &pFileName) const
-{
-    // Return whether we know about the given file
-
-    return mData.contains(pFileName);
-}
-
-//==============================================================================
-
 void CellmlTextViewWidget::initialize(const QString &pFileName, bool pUpdate)
 {
     // Retrieve the editing widget associated with the given file, if any

diff --git a/src/plugins/editing/CellMLTextView/src/cellmltextviewwidget.h b/src/plugins/editing/CellMLTextView/src/cellmltextviewwidget.h
@@ -139,8 +139,6 @@ class CellmlTextViewWidget : public Core::ViewWidget
 
     void retranslateUi() override;
 
-    bool contains(const QString &pFileName) const;
-
     void initialize(const QString &pFileName, bool pUpdate = true);
     void finalize(const QString &pFileName);
 

diff --git a/src/plugins/editing/RawCellMLView/src/rawcellmlviewwidget.cpp b/src/plugins/editing/RawCellMLView/src/rawcellmlviewwidget.cpp
@@ -102,15 +102,6 @@ void RawCellmlViewWidget::retranslateUi()
 
 //==============================================================================
 
-bool RawCellmlViewWidget::contains(const QString &pFileName) const
-{
-    // Return whether we know about the given file
-
-    return mEditingWidgets.contains(pFileName);
-}
-
-//==============================================================================
-
 void RawCellmlViewWidget::initialize(const QString &pFileName, bool pUpdate)
 {
     // Retrieve the editing widget associated with the given file, if any
@@ -240,7 +231,7 @@ void RawCellmlViewWidget::fileReloaded(const QString &pFileName)
     //       file). However, we want to the 'old' file to remain the active one,
     //       hence the extra argument we pass to initialize()...
 
-    if (contains(pFileName)) {
+    if (mEditingWidgets.contains(pFileName)) {
         bool update = mEditingWidget == mEditingWidgets.value(pFileName);
 
         finalize(pFileName);

diff --git a/src/plugins/editing/RawCellMLView/src/rawcellmlviewwidget.h b/src/plugins/editing/RawCellMLView/src/rawcellmlviewwidget.h
@@ -67,8 +67,6 @@ class RawCellmlViewWidget : public Core::ViewWidget
 
     void retranslateUi() override;
 
-    bool contains(const QString &pFileName) const;
-
     void initialize(const QString &pFileName, bool pUpdate = true);
     void finalize(const QString &pFileName);
 

diff --git a/src/plugins/editing/RawSEDMLView/src/rawsedmlviewwidget.cpp b/src/plugins/editing/RawSEDMLView/src/rawsedmlviewwidget.cpp
@@ -93,15 +93,6 @@ void RawSedmlViewWidget::retranslateUi()
 
 //==============================================================================
 
-bool RawSedmlViewWidget::contains(const QString &pFileName) const
-{
-    // Return whether we know about the given file
-
-    return mEditingWidgets.contains(pFileName);
-}
-
-//==============================================================================
-
 void RawSedmlViewWidget::initialize(const QString &pFileName, bool pUpdate)
 {
     // Retrieve the editing widget associated with the given file, if any
@@ -220,7 +211,7 @@ void RawSedmlViewWidget::fileReloaded(const QString &pFileName)
     //       file). However, we want to the 'old' file to remain the active one,
     //       hence the extra argument we pass to initialize()...
 
-    if (contains(pFileName)) {
+    if (mEditingWidgets.contains(pFileName)) {
         bool update = mEditingWidget == mEditingWidgets.value(pFileName);
 
         finalize(pFileName);

diff --git a/src/plugins/editing/RawSEDMLView/src/rawsedmlviewwidget.h b/src/plugins/editing/RawSEDMLView/src/rawsedmlviewwidget.h
@@ -66,8 +66,6 @@ class RawSedmlViewWidget : public Core::ViewWidget
 
     void retranslateUi() override;
 
-    bool contains(const QString &pFileName) const;
-
     void initialize(const QString &pFileName, bool pUpdate = true);
     void finalize(const QString &pFileName);
 

diff --git a/src/plugins/editing/RawTextView/src/rawtextviewwidget.cpp b/src/plugins/editing/RawTextView/src/rawtextviewwidget.cpp
@@ -81,15 +81,6 @@ void RawTextViewWidget::retranslateUi()
 
 //==============================================================================
 
-bool RawTextViewWidget::contains(const QString &pFileName) const
-{
-    // Return whether we know about the given file
-
-    return mEditors.contains(pFileName);
-}
-
-//==============================================================================
-
 void RawTextViewWidget::initialize(const QString &pFileName, bool pUpdate)
 {
     // Retrieve the editor associated with the given file, if any
@@ -206,7 +197,7 @@ void RawTextViewWidget::fileReloaded(const QString &pFileName)
     //       file). However, we want to the 'old' file to remain the active one,
     //       hence the extra argument we pass to initialize()...
 
-    if (contains(pFileName)) {
+    if (mEditors.contains(pFileName)) {
         bool update = mEditor == mEditors.value(pFileName);
 
         finalize(pFileName);

diff --git a/src/plugins/editing/RawTextView/src/rawtextviewwidget.h b/src/plugins/editing/RawTextView/src/rawtextviewwidget.h
@@ -59,8 +59,6 @@ class RawTextViewWidget : public Core::ViewWidget
 
     void retranslateUi() override;
 
-    bool contains(const QString &pFileName) const;
-
     void initialize(const QString &pFileName, bool pUpdate = true);
     void finalize(const QString &pFileName);