Merge pull request #186 from sbmlteam/const-ref-for-getElement

Const ref for get element
sbmlteam · Dec 15, 2021 · 0e80a8e · 0e80a8e
2 parents 7168f09 + ed392fa
commit 0e80a8e
Show file tree

Hide file tree

Showing 69 changed files with 150 additions and 150 deletions.
diff --git a/src/sbml/SBMLDocument.cpp b/src/sbml/SBMLDocument.cpp
@@ -1691,7 +1691,7 @@ SBMLDocument::readAttributes (const XMLAttributes& attributes,
     int numxmlns= xmlns->getLength();
     for (int i=0; i < numxmlns; i++)
     {
-      const std::string &uri = xmlns->getURI(i);
+      const std::string& uri = xmlns->getURI(i);
       const SBMLExtension* sbmlext = SBMLExtensionRegistry::getInstance().getExtensionInternal(uri);
 
       if (sbmlext && sbmlext->isEnabled())

diff --git a/src/sbml/SBMLNamespaces.cpp b/src/sbml/SBMLNamespaces.cpp
@@ -480,7 +480,7 @@ SBMLNamespaces::addPkgNamespaces (const XMLNamespaces *xmlns)
 /** @endcond */
 
 int
-SBMLNamespaces::addNamespace(const std::string &uri, const std::string &prefix)
+SBMLNamespaces::addNamespace(const std::string& uri, const std::string &prefix)
 {
   if (!mNamespaces) 
   {
@@ -492,7 +492,7 @@ SBMLNamespaces::addNamespace(const std::string &uri, const std::string &prefix)
 
 
 int
-SBMLNamespaces::removeNamespace(const std::string &uri)
+SBMLNamespaces::removeNamespace(const std::string& uri)
 {
   if (!mNamespaces) 
   {

diff --git a/src/sbml/SBase.cpp b/src/sbml/SBase.cpp
@@ -182,7 +182,7 @@ SBase::renameUnitSIdRefs(const std::string& oldid, const std::string& newid)
 
 /** @cond doxygenLibsbmlInternal */
 SBase*
-SBase::getElementFromPluginsBySId(std::string id)
+SBase::getElementFromPluginsBySId(const std::string& id)
 {
   for (size_t i=0; i < mPlugins.size(); i++)
   {
@@ -196,7 +196,7 @@ SBase::getElementFromPluginsBySId(std::string id)
 
 /** @cond doxygenLibsbmlInternal */
 SBase*
-SBase::getElementFromPluginsByMetaId(std::string metaid)
+SBase::getElementFromPluginsByMetaId(const std::string& metaid)
 {
   for (size_t i=0; i < mPlugins.size(); i++)
   {
@@ -615,7 +615,7 @@ SBase::loadPlugins(SBMLNamespaces *sbmlns)
 
     for (int i=0; i < numxmlns; i++)
     {
-      const std::string &uri = xmlns->getURI(i);
+      const std::string& uri = xmlns->getURI(i);
       const SBMLExtension* sbmlext = SBMLExtensionRegistry::getInstance().getExtensionInternal(uri);
 
       if (sbmlext && sbmlext->isEnabled())
@@ -7015,7 +7015,7 @@ SBase::setSBaseFields (const XMLToken& element)
  *
  */
 int
-SBase::setElementNamespace(const std::string &uri)
+SBase::setElementNamespace(const std::string& uri)
 {
   mURI = uri;
 

diff --git a/src/sbml/SBase.h b/src/sbml/SBase.h
@@ -350,7 +350,7 @@ class LIBSBML_EXTERN SBase
    *
    * @return pointer to the first element found with the given @p id.
    */
-  virtual SBase* getElementFromPluginsBySId(std::string id);
+  virtual SBase* getElementFromPluginsBySId(const std::string& id);
   /** @endcond */
 
 
@@ -364,7 +364,7 @@ class LIBSBML_EXTERN SBase
    *
    * @return pointer to the first element found with the given @p metaid.
    */
-  virtual SBase* getElementFromPluginsByMetaId(std::string metaid);
+  virtual SBase* getElementFromPluginsByMetaId(const std::string& metaid);
   /** @endcond */
 
 
@@ -3564,7 +3564,7 @@ newModel.addSpecies(s1);
    * @li @sbmlconstant{LIBSBML_OPERATION_SUCCESS, OperationReturnValues_t}
    * @li @sbmlconstant{LIBSBML_INVALID_ATTRIBUTE_VALUE, OperationReturnValues_t}
    */
-  int setElementNamespace(const std::string &uri);
+  int setElementNamespace(const std::string& uri);
 
 
   /**

diff --git a/src/sbml/common/common-documentation.h b/src/sbml/common/common-documentation.h
@@ -2348,11 +2348,11 @@ const std::string& GroupsExtension::getXmlnsL3V1V1 ()
  * method returns the nickname of the package (e.g., "layout",
  * "groups").
  *
- * @li <code>virtual unsigned int getLevel(const std::string &uri) const
+ * @li <code>virtual unsigned int getLevel(const std::string& uri) const
  * =0</code>. This method returns the SBML Level with the given URI of
  * this package.
  *
- * @li <code>virtual unsigned int getVersion(const std::string &uri)
+ * @li <code>virtual unsigned int getVersion(const std::string& uri)
  * const =0</code>. This method returns the SBML Version with the given
  * URI of this package.
  *
@@ -2377,23 +2377,23 @@ const std::string& GroupsExtension::getName() const
   return getPackageName();
 }
 
-unsigned int GroupsExtension::getLevel(const std::string &uri) const
+unsigned int GroupsExtension::getLevel(const std::string& uri) const
 {
   if (uri == getXmlnsL3V1V1())
     return 3;
   else
     return 0;
 }
 
-unsigned int GroupsExtension::getVersion(const std::string &uri) const
+unsigned int GroupsExtension::getVersion(const std::string& uri) const
 {
   if (uri == getXmlnsL3V1V1())
     return 1;
   else
     return 0;
 }
 
-unsigned int GroupsExtension::getPackageVersion(const std::string &uri) const
+unsigned int GroupsExtension::getPackageVersion(const std::string& uri) const
 {
   if (uri == getXmlnsL3V1V1())
     return 1;
@@ -2479,7 +2479,7 @@ Group g = new Group(&gpns);        // Creates a Group object.
  * is overridden in the class <code>GroupsExtension</code> as follows:
 @code{.cpp}
 SBMLNamespaces*
-GroupsExtension::getSBMLExtensionNamespaces(const std::string &uri) const
+GroupsExtension::getSBMLExtensionNamespaces(const std::string& uri) const
 {
   GroupsPkgNamespaces* pkgns = NULL;
   if ( uri == getXmlnsL3V1V1())

diff --git a/src/sbml/extension/ASTBasePlugin.cpp b/src/sbml/extension/ASTBasePlugin.cpp
@@ -280,7 +280,7 @@ int ASTBasePlugin::allowedInFunctionDefinition(ASTNodeType_t type) const
 /*
  * Constructor
  */
-ASTBasePlugin::ASTBasePlugin(const std::string &uri)
+ASTBasePlugin::ASTBasePlugin(const std::string& uri)
   : mSBMLExt(SBMLExtensionRegistry::getInstance().getExtensionInternal(uri))
   , mParentASTNode(NULL)
   , mURI(uri)
@@ -408,7 +408,7 @@ ASTBasePlugin::connectToParent(ASTNode* astbase)
  *
  */
 int
-ASTBasePlugin::setElementNamespace(const std::string &uri)
+ASTBasePlugin::setElementNamespace(const std::string& uri)
 {
   mURI = uri;
 

diff --git a/src/sbml/extension/ASTBasePlugin.h b/src/sbml/extension/ASTBasePlugin.h
@@ -291,7 +291,7 @@ class LIBSBML_EXTERN ASTBasePlugin
   * @li @sbmlconstant{LIBSBML_OPERATION_SUCCESS, OperationReturnValues_t}
   * @li @sbmlconstant{LIBSBML_INVALID_ATTRIBUTE_VALUE, OperationReturnValues_t}
   */
-  int setElementNamespace(const std::string &uri);
+  int setElementNamespace(const std::string& uri);
 
   /**
   * Returns the SBML level of the package extension of
@@ -406,7 +406,7 @@ class LIBSBML_EXTERN ASTBasePlugin
   * Constructor. Creates an ASTBasePlugin object with the URI and
   * prefix of an package extension.
   */
-  ASTBasePlugin(const std::string &uri);
+  ASTBasePlugin(const std::string& uri);
 
   ASTBasePlugin();
 

diff --git a/src/sbml/extension/SBMLDocumentPlugin.cpp b/src/sbml/extension/SBMLDocumentPlugin.cpp
@@ -52,7 +52,7 @@ using namespace std;
 
 LIBSBML_CPP_NAMESPACE_BEGIN
 
-SBMLDocumentPlugin::SBMLDocumentPlugin (const std::string &uri,
+SBMLDocumentPlugin::SBMLDocumentPlugin (const std::string& uri,
                                         const std::string &prefix,
                                         SBMLNamespaces *sbmlns)
   : SBasePlugin(uri,prefix,sbmlns)

diff --git a/src/sbml/extension/SBMLDocumentPlugin.h b/src/sbml/extension/SBMLDocumentPlugin.h
@@ -99,7 +99,7 @@ class LIBSBML_EXTERN SBMLDocumentPlugin : public SBasePlugin
    *
    * @param sbmlns the SBMLNamespaces object for the package.
    */
-  SBMLDocumentPlugin (const std::string &uri, const std::string &prefix,
+  SBMLDocumentPlugin (const std::string& uri, const std::string &prefix,
                       SBMLNamespaces *sbmlns);
 
 

diff --git a/src/sbml/extension/SBMLDocumentPluginNotRequired.cpp b/src/sbml/extension/SBMLDocumentPluginNotRequired.cpp
@@ -53,7 +53,7 @@ using namespace std;
 
 LIBSBML_CPP_NAMESPACE_BEGIN
 
-SBMLDocumentPluginNotRequired::SBMLDocumentPluginNotRequired (const std::string &uri,
+SBMLDocumentPluginNotRequired::SBMLDocumentPluginNotRequired (const std::string& uri,
                                                               const std::string &prefix,
                                                               SBMLNamespaces *sbmlns)
   : SBMLDocumentPlugin(uri,prefix,sbmlns)

diff --git a/src/sbml/extension/SBMLDocumentPluginNotRequired.h b/src/sbml/extension/SBMLDocumentPluginNotRequired.h
@@ -87,7 +87,7 @@ class LIBSBML_EXTERN SBMLDocumentPluginNotRequired : public SBMLDocumentPlugin
    *
    * @param sbmlns the SBMLNamespaces object for the package.
    */
-  SBMLDocumentPluginNotRequired (const std::string &uri, const std::string &prefix,
+  SBMLDocumentPluginNotRequired (const std::string& uri, const std::string &prefix,
                                  SBMLNamespaces *sbmlns);
 
 

diff --git a/src/sbml/extension/SBMLExtension.h b/src/sbml/extension/SBMLExtension.h
@@ -448,7 +448,7 @@ class LIBSBML_EXTERN SBMLExtension
    *
    * @copydetails doc_note_override_in_extensions
    */
-  virtual unsigned int getLevel(const std::string &uri) const = 0;
+  virtual unsigned int getLevel(const std::string& uri) const = 0;
 
 
   /**
@@ -460,7 +460,7 @@ class LIBSBML_EXTERN SBMLExtension
    *
    * @copydetails doc_note_override_in_extensions
    */
-  virtual unsigned int getVersion(const std::string &uri) const = 0;
+  virtual unsigned int getVersion(const std::string& uri) const = 0;
 
 
   /**
@@ -472,7 +472,7 @@ class LIBSBML_EXTERN SBMLExtension
    *
    * @copydetails doc_note_override_in_extensions
    */
-  virtual unsigned int getPackageVersion(const std::string &uri) const = 0;
+  virtual unsigned int getPackageVersion(const std::string& uri) const = 0;
 
 
   /**
@@ -518,7 +518,7 @@ SBMLExtensionNamespaces<LayoutExtension>
    *
    * @copydetails doc_note_override_in_extensions
    */
-  virtual SBMLNamespaces* getSBMLExtensionNamespaces(const std::string &uri) const = 0;
+  virtual SBMLNamespaces* getSBMLExtensionNamespaces(const std::string& uri) const = 0;
 
 
   /**

diff --git a/src/sbml/extension/SBMLExtensionRegistry.cpp b/src/sbml/extension/SBMLExtensionRegistry.cpp
@@ -311,7 +311,7 @@ SBMLExtensionRegistry::getSBasePluginCreators(const std::string& uri)
  * Get an SBasePluginCreator with the given extension point and URI pair
  */
 const SBasePluginCreatorBase* 
-SBMLExtensionRegistry::getSBasePluginCreator(const SBaseExtensionPoint& extPoint, const std::string &uri)
+SBMLExtensionRegistry::getSBasePluginCreator(const SBaseExtensionPoint& extPoint, const std::string& uri)
 {
   SBasePluginMapIter it = mSBasePluginMap.find(extPoint);
   if (it != mSBasePluginMap.end())

diff --git a/src/sbml/extension/SBasePlugin.cpp b/src/sbml/extension/SBasePlugin.cpp
@@ -61,7 +61,7 @@ LIBSBML_CPP_NAMESPACE_BEGIN
 /*
  * Constructor
  */
-SBasePlugin::SBasePlugin (const std::string &uri, const std::string &prefix, 
+SBasePlugin::SBasePlugin (const std::string& uri, const std::string &prefix, 
                           SBMLNamespaces *sbmlns)
  : mSBMLExt(SBMLExtensionRegistry::getInstance().getExtensionInternal(uri))
   ,mSBML(NULL)
@@ -243,7 +243,7 @@ SBasePlugin::connectToParent (SBase* sbase)
  *
  */
 int
-SBasePlugin::setElementNamespace(const std::string &uri)
+SBasePlugin::setElementNamespace(const std::string& uri)
 {
 //  cout << "[DEBUG] SBasePlugin::setElementNamespace() " << uri << endl;
   mURI = uri;

diff --git a/src/sbml/extension/SBasePlugin.h b/src/sbml/extension/SBasePlugin.h
@@ -497,7 +497,7 @@ class LIBSBML_EXTERN SBasePlugin
    *
    * @see getElementNamespace()
    */
-  int setElementNamespace(const std::string &uri);
+  int setElementNamespace(const std::string& uri);
 
 
   /**
@@ -861,7 +861,7 @@ class LIBSBML_EXTERN SBasePlugin
    *
    * @param sbmlns the namespaces object for the package.
    */
-  SBasePlugin (const std::string &uri, const std::string &prefix,
+  SBasePlugin (const std::string& uri, const std::string &prefix,
                SBMLNamespaces *sbmlns);
 
 

diff --git a/src/sbml/extension/test/TestPackage.cpp b/src/sbml/extension/test/TestPackage.cpp
@@ -144,7 +144,7 @@ const std::string&
 }
 
 unsigned int 
-	TestExtension::getLevel(const std::string &uri) const
+	TestExtension::getLevel(const std::string& uri) const
 {
 	if (uri == getXmlnsL3V1V1())
 	{
@@ -155,7 +155,7 @@ unsigned int
 }
 
 unsigned int 
-	TestExtension::getVersion(const std::string &uri) const
+	TestExtension::getVersion(const std::string& uri) const
 {
 	if (uri == getXmlnsL3V1V1())
 	{
@@ -166,7 +166,7 @@ unsigned int
 }
 
 unsigned int
-	TestExtension::getPackageVersion(const std::string &uri) const
+	TestExtension::getPackageVersion(const std::string& uri) const
 {
 	if (uri == getXmlnsL3V1V1())
 	{
@@ -177,7 +177,7 @@ unsigned int
 }
 
 SBMLNamespaces*
-	TestExtension::getSBMLExtensionNamespaces(const std::string &uri) const
+	TestExtension::getSBMLExtensionNamespaces(const std::string& uri) const
 {
 	TestPkgNamespaces* pkgns = NULL;
 	if ( uri == getXmlnsL3V1V1())
@@ -244,7 +244,7 @@ void
 }
 
 
-TestModelPlugin::TestModelPlugin (const std::string &uri, 
+TestModelPlugin::TestModelPlugin (const std::string& uri, 
 	const std::string &prefix,
 	TestPkgNamespaces *groupsns)
 	: SBasePlugin(uri,prefix, groupsns)
@@ -351,7 +351,7 @@ TestModelPlugin::accept (SBMLVisitor& v) const
 
 
 
-TestLOSPlugin::TestLOSPlugin(const std::string &uri,
+TestLOSPlugin::TestLOSPlugin(const std::string& uri,
   const std::string &prefix,
   TestPkgNamespaces *groupsns)
   : SBasePlugin(uri, prefix, groupsns)

diff --git a/src/sbml/extension/test/TestSBMLExtensionRegistry.cpp b/src/sbml/extension/test/TestSBMLExtensionRegistry.cpp
@@ -146,7 +146,7 @@ START_TEST (test_SBMLExtensionRegistry_getExtension)
 {
 
 	SBMLExtensionRegistry &instance = SBMLExtensionRegistry::getInstance();
-	const std::string &uri = TestExtension::getXmlnsL3V1V1();
+	const std::string& uri = TestExtension::getXmlnsL3V1V1();
 
 	SBMLExtension* result = NULL;
 	fail_unless(result == NULL);

diff --git a/src/sbml/math/ASTNode.cpp b/src/sbml/math/ASTNode.cpp
@@ -3181,7 +3181,7 @@ ASTNode::getASTPlugin(const SBMLNamespaces * sbmlns)
       int numxmlns = xmlns->getLength();
       for (int i = 0; i < numxmlns; i++)
       {
-        const std::string &uri = xmlns->getURI(i);
+        const std::string& uri = xmlns->getURI(i);
         const SBMLExtension* sbmlext = SBMLExtensionRegistry::getInstance().getExtensionInternal(uri);
 
         if (sbmlext && sbmlext->isEnabled())
@@ -3256,7 +3256,7 @@ ASTNode::getASTPlugin(const SBMLNamespaces * sbmlns) const
       int numxmlns = xmlns->getLength();
       for (int i = 0; i < numxmlns; i++)
       {
-        const std::string &uri = xmlns->getURI(i);
+        const std::string& uri = xmlns->getURI(i);
         const SBMLExtension* sbmlext = SBMLExtensionRegistry::getInstance().getExtensionInternal(uri);
 
         if (sbmlext && sbmlext->isEnabled())
@@ -3379,7 +3379,7 @@ ASTNode::loadASTPlugins(const SBMLNamespaces * sbmlns)
       int numxmlns = xmlns->getLength();
       for (int i = 0; i < numxmlns; i++)
       {
-        const std::string &uri = xmlns->getURI(i);
+        const std::string& uri = xmlns->getURI(i);
         const SBMLExtension* sbmlext = SBMLExtensionRegistry::getInstance().getExtensionInternal(uri);
 
         if (sbmlext && sbmlext->isEnabled())