Browse Source

ENH: Use const to pass and retrieve parameters

Xavi Planes 14 years ago
parent
commit
63965bbb46

+ 2 - 11
Libs/ModuleDescription/ctkModuleDescriptionReader.cpp

@@ -31,23 +31,14 @@ ctkModuleDescriptionReader::~ctkModuleDescriptionReader()
 
 }
 
-QString ctkModuleDescriptionReader::xmlContent() const
-{
-  return this->XmlContent;
-}
-
-void ctkModuleDescriptionReader::setXml( QString val )
+void ctkModuleDescriptionReader::setXmlContent( const QString &val )
 {
   this->XmlContent = val;
 }
 
-ctkModuleDescription ctkModuleDescriptionReader::moduleDescription() const
+const ctkModuleDescription &ctkModuleDescriptionReader::moduleDescription() const
 {
   return this->Description;
 }
 
-void ctkModuleDescriptionReader::setDescription( ctkModuleDescription val )
-{
-  this->Description = val;
-}
 

+ 2 - 4
Libs/ModuleDescription/ctkModuleDescriptionReader.h

@@ -40,12 +40,10 @@ public:
   ~ctkModuleDescriptionReader();
 
   //! xml is the content of the XML file
-  QString xmlContent() const;
-  void setXml(QString val);
+  void setXmlContent(const QString &val);
 
   //!
-  ctkModuleDescription moduleDescription() const;
-  void setDescription(ctkModuleDescription val);
+  const ctkModuleDescription &moduleDescription() const;
 
 protected:
   ///

+ 2 - 2
Libs/ModuleDescription/ctkModuleDescriptionReaderInterface.h

@@ -37,10 +37,10 @@ public:
   ~ctkModuleDescriptionReaderInterface(){};
 
   //! xml is the content of the XML file
-  virtual void setXml(QString val) = 0;
+  virtual void setXmlContent(const QString &val) = 0;
 
   //!
-  virtual ctkModuleDescription moduleDescription() const = 0;
+  virtual const ctkModuleDescription &moduleDescription() const = 0;
 
   //!
   virtual void Update( ) = 0;

+ 1 - 1
Plugins/org.commontk.slicermodule/Testing/Cpp/ctkSlicerModuleTest.cpp

@@ -93,7 +93,7 @@ int ctkSlicerModuleTest(int argc, char * argv [] )
     QTextStream stream( &file );
 
     // Parse XML file
-    reader->setXml( stream.readAll() );
+    reader->setXmlContent( stream.readAll() );
     reader->Update();
 
     // Print module description

+ 1 - 1
Plugins/org.commontk.slicermodule/ctkSlicerModuleReader.cxx

@@ -22,7 +22,7 @@ void ctkSlicerModuleReader::Update()
   int errorLine;
   int errorColumn;
 
-  if (!domDocument.setContent(xmlContent(), &errorStr, &errorLine,
+  if (!domDocument.setContent(XmlContent, &errorStr, &errorLine,
     &errorColumn)) {
       throw std::runtime_error( 
         tr("Parse error at line %1, column %2:\n%3")