Cosmetic modifs to be more Coding style compliant

[gdcm.git] / src / gdcmElementSet.cxx

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index a5017dd6194bb679a0f41ac30078762007daed3d..5d46a76f3a9cc806686067e80b2ba3cbfa2782f6 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/03 14:04:02 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2004/09/24 11:39:21 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,9 +28,11 @@
  * \ingroup gdcmElementSet
  * \brief   Constructor from a given gdcmElementSet
  */
+//BOZ depthLevel is not usefull anymore
 gdcmElementSet::gdcmElementSet(int depthLevel) 
-              : gdcmDocEntrySet(depthLevel)
+              : gdcmDocEntrySet()
 {
+  (void)depthLevel;
 }
 
 /**
@@ -62,22 +64,19 @@ gdcmElementSet::~gdcmElementSet()
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Print(std::ostream & os)
+void gdcmElementSet::Print(std::ostream& os)
 {
    for( TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
       gdcmDocEntry* entry = i->second;
       entry->Print(os);   
-      bool PrintEndLine = true;
       if ( gdcmSeqEntry* seqEntry = dynamic_cast<gdcmSeqEntry*>(entry) )
       {
-         (void)seqEntry;  //not used
-         PrintEndLine = false;
-      }
-      if( PrintEndLine )
-      {
-         os << std::endl;
+         (void)seqEntry;
+         // Avoid the newline for a sequence:
+         continue;
       }
+      os << std::endl;
    }
 }
 
@@ -86,7 +85,7 @@ void gdcmElementSet::Print(std::ostream & os)
   *          from the H Table
   * @return
   */ 
-void gdcmElementSet::Write(FILE *fp, FileType filetype)
+void gdcmElementSet::Write(FILE* fp, FileType filetype)
 {
    for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); ++i)
    {
@@ -105,7 +104,7 @@ void gdcmElementSet::Write(FILE *fp, FileType filetype)
  * \brief   add a new Dicom Element pointer to the H Table
  * @param   newEntry entry to add
  */
-bool gdcmElementSet::AddEntry( gdcmDocEntry *newEntry)
+bool gdcmElementSet::AddEntry( gdcmDocEntry* newEntry)
 {
    gdcmTagKey key = newEntry->GetKey();
 
@@ -126,7 +125,7 @@ bool gdcmElementSet::AddEntry( gdcmDocEntry *newEntry)
  * \brief   Clear the hash table from given entry BUT keep the entry.
  * @param   entryToRemove Entry to remove.
  */
-bool gdcmElementSet::RemoveEntryNoDestroy( gdcmDocEntry *entryToRemove)
+bool gdcmElementSet::RemoveEntryNoDestroy( gdcmDocEntry* entryToRemove)
 {
    gdcmTagKey key = entryToRemove->GetKey();
    if( TagHT.count(key) == 1 )
@@ -144,7 +143,7 @@ bool gdcmElementSet::RemoveEntryNoDestroy( gdcmDocEntry *entryToRemove)
  * \brief   Clear the hash table from given entry AND delete the entry.
  * @param   entryToRemove Entry to remove AND delete.
  */
-bool gdcmElementSet::RemoveEntry( gdcmDocEntry *entryToRemove)
+bool gdcmElementSet::RemoveEntry( gdcmDocEntry* entryToRemove)
 {
    gdcmTagKey key = entryToRemove->GetKey();
    if( TagHT.count(key) == 1 )