Sub-minor std-related fixes... Jpr+Frog

[gdcm.git] / src / gdcmDict.cxx

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index e15c5ded5402c9fd9b3a8e0054f91f29f888ac68..7d9585cdc1ff65d78682e514fc8b91a5c5077eac 100644 (file)
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -2,22 +2,15 @@
 //-----------------------------------------------------------------------------
 #include "gdcmDict.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
 
 #include <fstream>
 #include <iostream>
 #include <iomanip>
 
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmDict
  * \brief   Construtor
  * @param   FileName from which to build the dictionary.
  */
@@ -44,7 +37,7 @@ gdcmDict::gdcmDict(std::string & FileName) {
       name = buff;
 
       gdcmDictEntry * newEntry = new gdcmDictEntry(group, element,
-                                                  vr, fourth, name);
+                                                   vr, fourth, name);
       AddNewEntry(newEntry);
    }
    from.close();
@@ -53,7 +46,6 @@ gdcmDict::gdcmDict(std::string & FileName) {
 }
 
 /**
- * \ingroup gdcmDict
  * \brief  Destructor 
  */
 gdcmDict::~gdcmDict() {
@@ -62,7 +54,6 @@ gdcmDict::~gdcmDict() {
       if ( EntryToDelete )
          delete EntryToDelete;
    }
-
    // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
    // assume all the pointed gdcmDictEntries are already cleaned-up when
    // we cleaned KeyHt.
@@ -83,7 +74,6 @@ void gdcmDict::Print(std::ostream &os) {
 }
 
 /**
- * \ingroup gdcmDict
  * \brief   Print all the dictionary entries contained in this dictionary.
  *          Entries will be sorted by tag i.e. the couple (group, element).
  * @param   os The output stream to be written to.
@@ -103,10 +93,9 @@ void gdcmDict::PrintByKey(std::ostream &os) {
 }
 
 /**
- * \ingroup gdcmDict
  * \brief   Print all the dictionary entries contained in this dictionary.
  *          Entries will be sorted by the name of the dictionary entries.
- * \warning AVOID USING IT : the name IS NOT an identifier
+ * \warning AVOID USING IT : the name IS NOT an identifier; 
  *                           unpredictable result
  * @param   os The output stream to be written to.
  */
@@ -130,14 +119,14 @@ void gdcmDict::PrintByName(std::ostream& os) {
 /**
  * \ingroup gdcmDict
  * \brief  adds a new Dicom Dictionary Entry 
- * @param   NewEntry 
- * @return  false if Dicom Element already existed
+ * @param   NewEntry entry to add 
+ * @return  false if Dicom Element already exists
  */
 bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry) 
 {
    TagKey key;
    key = NewEntry->GetKey();
-       
+
    if(KeyHt.count(key) == 1)
    {
       dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str());
@@ -154,7 +143,7 @@ bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry)
 /**
  * \ingroup gdcmDict
  * \brief  replaces an already existing Dicom Element by a new one
- * @param   NewEntry
+ * @param   NewEntry new entry (overwrites any previous one with same tag)
  * @return  false if Dicom Element doesn't exist
  */
 bool gdcmDict::ReplaceEntry(gdcmDictEntry *NewEntry) {
@@ -198,8 +187,7 @@ bool gdcmDict::RemoveEntry(TagKey key)
 /**
  * \ingroup gdcmDict
  * \brief  removes an already existing Dicom Dictionary Entry, 
- *          identified by its group,element
- number
+ *          identified by its group,element number
  * @param   group   Dicom group number of the Dicom Element
  * @param   element Dicom element number of the Dicom Element
  * @return  false if Dicom Dictionary Entry doesn't exist
@@ -273,7 +261,7 @@ std::list<std::string> *gdcmDict::GetDictEntryNames(void)
  *           than asking us to perform a line by line check of the dictionnary
  *           at the beginning of each year to -try to- guess the changes)
  *           Therefore : please NEVER use that fourth field :-(
- * *
+ *
  * @return  An hashtable: whose keys are the names of the groups and whose
  *          corresponding values are lists of all the dictionnary entries
  *          among that group.