* To remove warnings

[gdcm.git] / src / gdcmDict.h

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 77d837c9f0a3aa1cceb038b36f0fef1f8a251554..cf34024488841ec8ff7bdbebd896281bc2a3bb37 100644 (file)
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -1,15 +1,17 @@
 // gdcmDict.h
-
+//-----------------------------------------------------------------------------
 #ifndef GDCMDICT_H
 #define GDCMDICT_H
 
-#include <map>
 #include "gdcmCommon.h"
 #include "gdcmDictEntry.h"
+#include <map>
 
-typedef map<TagKey,  gdcmDictEntry*> TagKeyHT;
-typedef map<TagName, gdcmDictEntry*> TagNameHT;
+//-----------------------------------------------------------------------------
+typedef std::map<TagKey,  gdcmDictEntry*> TagKeyHT;
+typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
 
+//-----------------------------------------------------------------------------
 /*
  * \defgroup gdcmDict
  * \brief    gdcmDict acts a memory representation of a dicom dictionary i.e.
@@ -21,25 +23,40 @@ typedef map<TagName, gdcmDictEntry*> TagNameHT;
  * \see gdcmDictSet
  */
 class GDCM_EXPORT gdcmDict {
-       string name;
-       string filename;
-   /// Access through TagKey (see alternate access with NameHt)
-       TagKeyHT  KeyHt;
-   /// Access through TagName (see alternate access with KeyHt)
-       TagNameHT NameHt;
 public:
-       gdcmDict(string & FileName);
+   gdcmDict(std::string & FileName);
        ~gdcmDict();
-       int AddNewEntry (gdcmDictEntry* NewEntry);
-       int ReplaceEntry(gdcmDictEntry* NewEntry);
-       int RemoveEntry (TagKey key);
-       int RemoveEntry (guint16 group, guint16 element);
+
+       void Print(std::ostream&);
+       void PrintByKey(std::ostream&);
+       void PrintByName(std::ostream&);        
+
+   bool AddNewEntry (gdcmDictEntry* NewEntry);
+       bool ReplaceEntry(gdcmDictEntry* NewEntry);
+       bool RemoveEntry (TagKey key);
+       bool RemoveEntry (guint16 group, guint16 element);
+
        gdcmDictEntry * GetTagByNumber(guint16 group, guint16 element);
        gdcmDictEntry * GetTagByName(TagName name);
-       void Print(ostream&);
-       void PrintByKey(ostream&);
-       void PrintByName(ostream&);
-       TagKeyHT & GetEntries(void) { return KeyHt; }
+
+   /**
+    * \ingroup gdcmDict
+    * \brief   returns a ref to the Dicom Dictionary H table (map)
+    * return the Dicom Dictionary H table
+    */
+   inline TagKeyHT & gdcmDict::GetEntries(void)  {
+    return KeyHt; 
+   }
+ 
+private:
+   std::string name;
+   std::string filename;
+   /// Access through TagKey (see alternate access with NameHt)
+       TagKeyHT  KeyHt;
+   /// Access through TagName (see alternate access with KeyHt)
+       TagNameHT NameHt;
+
 };
 
+//-----------------------------------------------------------------------------
 #endif