Merge 9e4430e into fe89380

opencor · Dec 5, 2018 · d8fb868 · d8fb868
2 parents fe89380 + 9e4430e
commit d8fb868
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 24 deletions.
diff --git a/src/plugins/datastoreinterface.cpp b/src/plugins/datastoreinterface.cpp
@@ -42,7 +42,7 @@ extern "C" Q_DECL_EXPORT int dataStoreInterfaceVersion()
 {
     // Version of the data store interface
 
-    return 5;
+    return 4;
 }
 
 //==============================================================================

diff --git a/src/plugins/datastoreinterface.h b/src/plugins/datastoreinterface.h
@@ -192,7 +192,7 @@ class DataStoreExporterWorker : public QObject
     void done(DataStoreExportData *pDataStoreData, const QString &pErrorMessage);
 
 public slots:
-   virtual void run() = 0;
+    virtual void run() = 0;
 };
 
 //==============================================================================

diff --git a/src/plugins/support/COMBINESupport/src/combinefilemanager.cpp b/src/plugins/support/COMBINESupport/src/combinefilemanager.cpp
@@ -45,7 +45,7 @@ CombineFileManager * CombineFileManager::instance()
 
 //==============================================================================
 
-bool CombineFileManager::isCombineArchive(const QString &pFileName)
+bool CombineFileManager::isCombineArchive(const QString &pFileName) const
 {
     // Return whether the given file is a COMBINE archive
 
@@ -54,11 +54,11 @@ bool CombineFileManager::isCombineArchive(const QString &pFileName)
 
 //==============================================================================
 
-CombineArchive * CombineFileManager::combineArchive(const QString &pFileName)
+CombineArchive * CombineFileManager::combineArchive(const QString &pFileName) const
 {
     // Return the CombineArchive object, if any, associated with the given file
 
-    return static_cast<CombineArchive *>(instance()->file(pFileName));
+    return static_cast<CombineArchive *>(file(pFileName));
 }
 
 //==============================================================================

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

diff --git a/src/plugins/support/CellMLSupport/src/cellmlfile.h b/src/plugins/support/CellMLSupport/src/cellmlfile.h
@@ -67,7 +67,7 @@ struct CellmlFileException
     QString message() const;
 
 private:
-   QString mMessage;
+    QString mMessage;
 };
 
 //==============================================================================

diff --git a/src/plugins/support/CellMLSupport/src/cellmlfilemanager.cpp b/src/plugins/support/CellMLSupport/src/cellmlfilemanager.cpp
@@ -50,7 +50,7 @@ CellmlFileManager * CellmlFileManager::instance()
 
 //==============================================================================
 
-bool CellmlFileManager::isCellmlFile(const QString &pFileName)
+bool CellmlFileManager::isCellmlFile(const QString &pFileName) const
 {
     // Return whether the given file is a CellML file
 
@@ -59,11 +59,11 @@ bool CellmlFileManager::isCellmlFile(const QString &pFileName)
 
 //==============================================================================
 
-CellmlFile * CellmlFileManager::cellmlFile(const QString &pFileName)
+CellmlFile * CellmlFileManager::cellmlFile(const QString &pFileName) const
 {
     // Return the CellmlFile object, if any, associated with the given file
 
-    return static_cast<CellmlFile *>(instance()->file(pFileName));
+    return static_cast<CellmlFile *>(file(pFileName));
 }
 
 //==============================================================================

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

diff --git a/src/plugins/support/SEDMLSupport/src/sedmlfilemanager.cpp b/src/plugins/support/SEDMLSupport/src/sedmlfilemanager.cpp
@@ -52,7 +52,7 @@ SedmlFileManager * SedmlFileManager::instance()
 
 //==============================================================================
 
-bool SedmlFileManager::isSedmlFile(const QString &pFileName)
+bool SedmlFileManager::isSedmlFile(const QString &pFileName) const
 {
     // Return whether the given file is a SED-ML file
 
@@ -61,11 +61,11 @@ bool SedmlFileManager::isSedmlFile(const QString &pFileName)
 
 //==============================================================================
 
-SedmlFile * SedmlFileManager::sedmlFile(const QString &pFileName)
+SedmlFile * SedmlFileManager::sedmlFile(const QString &pFileName) const
 {
     // Return the SedmlFile object, if any, associated with the given file
 
-    return static_cast<SedmlFile *>(instance()->file(pFileName));
+    return static_cast<SedmlFile *>(file(pFileName));
 }
 
 //==============================================================================

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

diff --git a/src/plugins/support/StandardSupport/src/standardfilemanager.cpp b/src/plugins/support/StandardSupport/src/standardfilemanager.cpp
@@ -63,7 +63,7 @@ StandardFileManager::~StandardFileManager()
 
 //==============================================================================
 
-bool StandardFileManager::isFile(const QString &pFileName, bool pForceChecking)
+bool StandardFileManager::isFile(const QString &pFileName, bool pForceChecking) const
 {
     // If the given file is already managed, then we consider that it's of the
     // right type (e.g. CellML file), even though it may not be of the right
@@ -91,7 +91,7 @@ bool StandardFileManager::isFile(const QString &pFileName, bool pForceChecking)
 
 //==============================================================================
 
-bool StandardFileManager::isFile(const QString &pFileName)
+bool StandardFileManager::isFile(const QString &pFileName) const
 {
     // Check whether the given file is of the right type, i.e. whether it can be
     // loaded
@@ -101,7 +101,7 @@ bool StandardFileManager::isFile(const QString &pFileName)
 
 //==============================================================================
 
-StandardFile * StandardFileManager::file(const QString &pFileName)
+StandardFile * StandardFileManager::file(const QString &pFileName) const
 {
     // Return the File object, if any, associated with the given file
 

diff --git a/src/plugins/support/StandardSupport/src/standardfilemanager.h b/src/plugins/support/StandardSupport/src/standardfilemanager.h
@@ -45,9 +45,9 @@ class STANDARDSUPPORT_EXPORT StandardFileManager : public QObject
     Q_OBJECT
 
 public:
-    bool isFile(const QString &pFileName);
+    bool isFile(const QString &pFileName) const;
 
-    StandardFile * file(const QString &pFileName);
+    StandardFile * file(const QString &pFileName) const;
 
 protected:
     QMap<QString, StandardFile *> mFiles;
@@ -60,7 +60,7 @@ class STANDARDSUPPORT_EXPORT StandardFileManager : public QObject
     virtual StandardFile * create(const QString &pFileName) const = 0;
 
 private:
-    bool isFile(const QString &pFileName, bool pForceChecking);
+    bool isFile(const QString &pFileName, bool pForceChecking) const;
 
     void reload(const QString &pFileName, bool pForceChecking);