to avoid compile time warning

[gdcm.git] / src / gdcmDict.h

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index cf34024488841ec8ff7bdbebd896281bc2a3bb37..66f0df52ed2207d1a0cefe565150beb13e813353 100644 (file)
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -5,6 +5,9 @@
 
 #include "gdcmCommon.h"
 #include "gdcmDictEntry.h"
+
+#include <iostream>
+#include <list>
 #include <map>
 
 //-----------------------------------------------------------------------------
@@ -27,35 +30,46 @@ public:
    gdcmDict(std::string & FileName);
        ~gdcmDict();
 
-       void Print(std::ostream&);
-       void PrintByKey(std::ostream&);
-       void PrintByName(std::ostream&);        
+// Print
+       void Print(std::ostream &os = std::cout);
+       void PrintByKey(std::ostream &os = std::cout);
+       void PrintByName(std::ostream &os = std::cout); 
 
-   bool AddNewEntry (gdcmDictEntry* NewEntry);
-       bool ReplaceEntry(gdcmDictEntry* NewEntry);
+// Entries
+   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);
+// Tag
+       gdcmDictEntry *GetDictEntryByName(TagName name);
+       gdcmDictEntry *GetDictEntryByNumber(guint16 group, guint16 element);
+
+   std::list<std::string> *GetDictEntryNames(void);
+   std::map<std::string, std::list<std::string> > *
+        GetDictEntryNamesByCategory(void);
 
    /**
     * \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; 
-   }
+   inline TagKeyHT & GetEntriesByKey(void)  { return KeyHt; }
+
+   /**
+    * \ingroup gdcmDict
+    * \brief   returns a ref to the Dicom Dictionary H table (map)
+    * return the Dicom Dictionary H table
+    */
+   inline TagNameHT & GetEntriesByName(void)  { return NameHt; }
  
 private:
-   std::string name;
+   /// ASCII file holding the Dictionnary
    std::string filename;
    /// Access through TagKey (see alternate access with NameHt)
        TagKeyHT  KeyHt;
    /// Access through TagName (see alternate access with KeyHt)
        TagNameHT NameHt;
-
 };
 
 //-----------------------------------------------------------------------------