ENH: First pass at removing name of function from hardcoded string from gdcmVerboseMa...

[gdcm.git] / src / gdcmSQItem.cxx

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 399c466f942ec3e43cde9b207791dec2d7ab2660..f64d2b141bb716bf93655cc6ec4f2392edaf7fd1 100644 (file)
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/12/16 13:46:37 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/01/07 22:03:30 $
+  Version:   $Revision: 1.48 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -60,7 +60,7 @@ SQItem::~SQItem()
 /*
  * \brief   canonical Printer
  */
-void SQItem::Print(std::ostream& os)
+void SQItem::Print(std::ostream &os)
 {
    std::ostringstream s;
 
@@ -76,13 +76,13 @@ void SQItem::Print(std::ostream& os)
                                i != DocEntries.end();
                              ++i)
    {
-      DocEntry* Entry = *i;
+      DocEntry *Entry = *i;
       bool PrintEndLine = true;
 
       os << s.str();
       Entry->SetPrintLevel(PrintLevel);
       Entry->Print(os); 
-      if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(Entry) )
+      if ( SeqEntry *seqEntry = dynamic_cast<SeqEntry*>(Entry) )
       {
          (void)seqEntry;  //not used
          PrintEndLine = false;
@@ -98,7 +98,7 @@ void SQItem::Print(std::ostream& os)
  * \ingroup SQItem
  * \brief   canonical Writer
  */
-void SQItem::WriteContent(std::ofstream* fp, FileType filetype)
+void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
 {
    int j;
    uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff };
@@ -147,7 +147,7 @@ void SQItem::WriteContent(std::ofstream* fp, FileType filetype)
 /**
  * \brief   adds any Entry (Dicom Element) to the Sequence Item
  */
-bool SQItem::AddEntry(DocEntry* entry)
+bool SQItem::AddEntry(DocEntry *entry)
 {
    DocEntries.push_back(entry);
    //TODO : check if it worked
@@ -167,7 +167,7 @@ bool SQItem::AddEntry(DocEntry* entry)
  * @return  true if element was found or created successfully
  */
 
-bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, 
+bool SQItem::SetEntryByNumber(std::string const &val, uint16_t group, 
                               uint16_t element)
 {
    for(ListDocEntry::iterator i = DocEntries.begin(); 
@@ -196,7 +196,7 @@ bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group,
          {
             dictEntry = 
                Global::GetDicts()->NewVirtualDictEntry(group, element,
-                                                       "UN", "??", "??");
+                                                       "UN", GDCM_UNKNOWN, GDCM_UNKNOWN);
          } 
          // we assume the constructor didn't fail
          entry = new ValEntry(dictEntry);
@@ -235,16 +235,15 @@ bool SQItem::RemoveEntry( DocEntry* entryToRemove)
       if( *it == entryToRemove)
       {
          DocEntries.erase(it);
-         dbg.Verbose(0, "SQItem::RemoveEntry: one element erased.");
+         gdcmVerboseMacro( "One element erased.");
          delete entryToRemove;
          return true;
       }
    }
-                                                                                
-   dbg.Verbose(0, "SQItem::RemoveEntry: value not present ");
+   gdcmVerboseMacro( "Value not present.");
    return false ;
 }
-                                                                                
+
 /**
  * \brief   Clear the hash table from given entry BUT keep the entry.
  * @param   entryToRemove Entry to remove.
@@ -258,12 +257,12 @@ bool SQItem::RemoveEntryNoDestroy(DocEntry* entryToRemove)
       if( *it == entryToRemove)
       {
          DocEntries.erase(it);
-         dbg.Verbose(0, "SQItem::RemoveEntry: one element erased.");
+         gdcmVerboseMacro( "One element erased.");
          return true;
       }
    }
                                                                                 
-   dbg.Verbose(0, "SQItem::RemoveEntry: value not present ");
+   gdcmVerboseMacro( "Value not present.");
    return false ;
 }