Merge bcc442c into ae86dfb

CMakeLists.txt

@@ -892,8 +892,8 @@ set(PLUGINS
     support/StandardSupport
     support/ZIPSupport
 
-    thirdParty/BioSignalML
     thirdParty/CellMLAPI
+    thirdParty/libBioSignalML
     thirdParty/libgit2
     thirdParty/libNuML
     thirdParty/libSEDML

src/plugins/dataStore/BioSignalMLDataStore/CMakeLists.txt

@@ -19,6 +19,6 @@ add_plugin(BioSignalMLDataStore
         src/biosignalmldatastoreexporter.h
         src/biosignalmldatastoreplugin.h
     PLUGINS
-        BioSignalML
         DataStore
+        libBioSignalML
 )

src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreplugin.cpp

@@ -47,7 +47,7 @@ PLUGININFO_FUNC BioSignalMLDataStorePluginInfo()
     descriptions.insert("fr", QString::fromUtf8("une extension de magasin de données spécifique à BioSignalML."));
 
     return new PluginInfo(PluginInfo::DataStore, true, false,
-                          QStringList() << "BioSignalML" << "DataStore",
+                          QStringList() << "DataStore" << "libBioSignalML",
                           descriptions);
 }
 

src/plugins/thirdParty/BioSignalML/CMakeLists.txt → src/plugins/thirdParty/libBioSignalML/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(BioSignalMLPlugin)
+project(libBioSignalMLPlugin)
 
 # Name and version of our package
 
@@ -212,14 +212,17 @@ set(BIOSIGNALML_LIBRARIES
 )
 
 # Add the plugin
+# Note: we would normally use '${PACKAGE_NAME}' rather than 'OAuth', but it
+#       can't be done here since the name of our package is different from that
+#       of our plugin...
 
-add_plugin(${PACKAGE_NAME}
+add_plugin(libBioSignalML
     SOURCES
         ../../plugininfo.cpp
 
-        src/biosignalmlplugin.cpp
+        src/libbiosignalmlplugin.cpp
     HEADERS_MOC
-        src/biosignalmlplugin.h
+        src/libbiosignalmlplugin.h
     QT_MODULES
         Core
     EXTERNAL_BINARIES_DIR

src/plugins/thirdParty/BioSignalML/src/biosignalmlplugin.cpp → src/plugins/thirdParty/libBioSignalML/src/libbiosignalmlplugin.cpp

@@ -18,19 +18,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 //==============================================================================
-// BioSignalML plugin
+// libBioSignalML plugin
 //==============================================================================
 
-#include "biosignalmlplugin.h"
+#include "libbiosignalmlplugin.h"
 
 //==============================================================================
 
 namespace OpenCOR {
-namespace BioSignalML {
+namespace libBioSignalML {
 
 //==============================================================================
 
-PLUGININFO_FUNC BioSignalMLPluginInfo()
+PLUGININFO_FUNC libBioSignalMLPluginInfo()
 {
     Descriptions descriptions;
 
@@ -44,7 +44,7 @@ PLUGININFO_FUNC BioSignalMLPluginInfo()
 
 //==============================================================================
 
-}   // namespace BioSignalML
+}   // namespace libBioSignalML
 }   // namespace OpenCOR
 
 //==============================================================================

src/plugins/thirdParty/BioSignalML/src/biosignalmlplugin.h → src/plugins/thirdParty/libBioSignalML/src/libbiosignalmlplugin.h

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 //==============================================================================
-// BioSignalML plugin
+// libBioSignalML plugin
 //==============================================================================
 
 #pragma once
@@ -30,24 +30,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //==============================================================================
 
 namespace OpenCOR {
-namespace BioSignalML {
+namespace libBioSignalML {
 
 //==============================================================================
 
-PLUGININFO_FUNC BioSignalMLPluginInfo();
+PLUGININFO_FUNC libBioSignalMLPluginInfo();
 
 //==============================================================================
 
-class BioSignalMLPlugin : public QObject
+class libBioSignalMLPlugin : public QObject
 {
     Q_OBJECT
 
-    Q_PLUGIN_METADATA(IID "OpenCOR.BioSignalMLPlugin" FILE "biosignalmlplugin.json")
+    Q_PLUGIN_METADATA(IID "OpenCOR.libBioSignalMLPlugin" FILE "libbiosignalmlplugin.json")
 };
 
 //==============================================================================
 
-}   // namespace BioSignalML
+}   // namespace libBioSignalML
 }   // namespace OpenCOR
 
 //==============================================================================

src/plugins/thirdParty/libBioSignalML/src/libbiosignalmlplugin.json

@@ -0,0 +1,3 @@
+{
+    "Keys": [ "libBioSignalMLPlugin" ]
+}

src/plugins/thirdParty/BioSignalML/tests/tests.cpp → src/plugins/thirdParty/libBioSignalML/tests/tests.cpp

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 //==============================================================================
-// BioSignalML tests
+// libBioSignalML tests
 //==============================================================================
 
 #include "tests.h"
@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 void Tests::basicTests()
 {
-    // Some very basic tests to make sure that we have access to BioSignalML
+    // Some very basic tests to make sure that we have access to libBioSignalML
 
     // Check the version of BioSignalML and typedobject
 

src/plugins/thirdParty/BioSignalML/tests/tests.h → src/plugins/thirdParty/libBioSignalML/tests/tests.h

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 //==============================================================================
-// BioSignalML tests
+// libBioSignalML tests
 //==============================================================================
 
 #pragma once