Merge 0a86892 into 4b81bda

opencor · Nov 21, 2018 · a1919ed · a1919ed
2 parents 4b81bda + 0a86892
commit a1919ed
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 22 deletions.
diff --git a/src/plugins/dataStore/CSVDataStore/src/csvdatastoreexporter.cpp b/src/plugins/dataStore/CSVDataStore/src/csvdatastoreexporter.cpp
@@ -75,14 +75,10 @@ void CsvDataStoreExporter::execute(QString &pErrorMessage) const
         //          is much faster than preventing ourselves from adding
         //          duplicates in the first place...
 
-        QStringList variablesUri = QStringList();
         QList<DataStore::DataStoreVariables> variablesRuns = QList<DataStore::DataStoreVariables>();
 
-        foreach (DataStore::DataStoreVariable *variable, variables) {
-            variablesUri << variable->uri();
-
+        for (int i = 0, iMax = variables.count(); i < iMax; ++i)
             variablesRuns << DataStore::DataStoreVariables();
-        }
 
         int nbOfRuns = dataStore->runsCount();
         QList<quint64> runsIndex = QList<quint64>();
@@ -100,15 +96,10 @@ void CsvDataStoreExporter::execute(QString &pErrorMessage) const
 
             // Variables
 
-            int j = 0;
+            int j = -1;
 
-            foreach (DataStore::DataStoreVariable *variable, dataStore->variables()) {
-                if (variablesUri.contains(variable->uri())) {
-                    variablesRuns[j] << variable;
-
-                    ++j;
-                }
-            }
+            foreach (DataStore::DataStoreVariable *variable, variables)
+                variablesRuns[++j] << variable;
         }
 
         voiValues = voiValues.toSet().toList();

diff --git a/src/plugins/support/COMBINESupport/src/combinefilemanager.cpp b/src/plugins/support/COMBINESupport/src/combinefilemanager.cpp
@@ -45,11 +45,11 @@ CombineFileManager * CombineFileManager::instance()
 
 //==============================================================================
 
-bool CombineFileManager::isCombineArchive(const QString &pFileName) const
+bool CombineFileManager::isCombineArchive(const QString &pFileName)
 {
     // Return whether the given file is a COMBINE archive
 
-    return instance()->isFile(pFileName);
+    return isFile(pFileName);
 }
 
 //==============================================================================

diff --git a/src/plugins/support/COMBINESupport/src/combinefilemanager.h b/src/plugins/support/COMBINESupport/src/combinefilemanager.h
@@ -43,7 +43,7 @@ class COMBINESUPPORT_EXPORT CombineFileManager : public StandardSupport::Standar
 public:
     static CombineFileManager * instance();
 
-    bool isCombineArchive(const QString &pFileName) const;
+    bool isCombineArchive(const QString &pFileName);
 
     CombineArchive * combineArchive(const QString &pFileName);
 

diff --git a/src/plugins/support/CellMLSupport/src/cellmlfilemanager.cpp b/src/plugins/support/CellMLSupport/src/cellmlfilemanager.cpp
@@ -50,11 +50,11 @@ CellmlFileManager * CellmlFileManager::instance()
 
 //==============================================================================
 
-bool CellmlFileManager::isCellmlFile(const QString &pFileName) const
+bool CellmlFileManager::isCellmlFile(const QString &pFileName)
 {
     // Return whether the given file is a CellML file
 
-    return instance()->isFile(pFileName);
+    return isFile(pFileName);
 }
 
 //==============================================================================

diff --git a/src/plugins/support/CellMLSupport/src/cellmlfilemanager.h b/src/plugins/support/CellMLSupport/src/cellmlfilemanager.h
@@ -47,7 +47,7 @@ class CELLMLSUPPORT_EXPORT CellmlFileManager : public StandardSupport::StandardF
 public:
     static CellmlFileManager * instance();
 
-    bool isCellmlFile(const QString &pFileName) const;
+    bool isCellmlFile(const QString &pFileName);
 
     CellmlFile * cellmlFile(const QString &pFileName);
 

diff --git a/src/plugins/support/SEDMLSupport/src/sedmlfilemanager.cpp b/src/plugins/support/SEDMLSupport/src/sedmlfilemanager.cpp
@@ -52,11 +52,11 @@ SedmlFileManager * SedmlFileManager::instance()
 
 //==============================================================================
 
-bool SedmlFileManager::isSedmlFile(const QString &pFileName) const
+bool SedmlFileManager::isSedmlFile(const QString &pFileName)
 {
     // Return whether the given file is a SED-ML file
 
-    return instance()->isFile(pFileName);
+    return isFile(pFileName);
 }
 
 //==============================================================================

diff --git a/src/plugins/support/SEDMLSupport/src/sedmlfilemanager.h b/src/plugins/support/SEDMLSupport/src/sedmlfilemanager.h
@@ -43,7 +43,7 @@ class SEDMLSUPPORT_EXPORT SedmlFileManager : public StandardSupport::StandardFil
 public:
     static SedmlFileManager * instance();
 
-    bool isSedmlFile(const QString &pFileName) const;
+    bool isSedmlFile(const QString &pFileName);
 
     SedmlFile * sedmlFile(const QString &pFileName);