ENH: Fix a shadow variable

[gdcm.git] / src / gdcmDict.h

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 9931f7bcab26a123c54d07c08c1f7bd776cf3178..d5f9aea1493ff1c8283d0d1136be01cb1f95cb13 100644 (file)
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDict.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:47 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2004/07/28 21:23:20 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,7 +27,7 @@
 #include <map>
 
 //-----------------------------------------------------------------------------
-typedef std::map<TagKey,  gdcmDictEntry*> TagKeyHT;
+typedef std::map<gdcmTagKey, gdcmDictEntry*> TagKeyHT;
 typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
 
 //-----------------------------------------------------------------------------
@@ -41,9 +41,10 @@ typedef std::map<TagName, gdcmDictEntry*> TagNameHT;
  *           combined with all software versions...
  * \see gdcmDictSet
  */
-class GDCM_EXPORT gdcmDict {
+class GDCM_EXPORT gdcmDict
+{
 public:
-   gdcmDict(std::string & FileName);
+   gdcmDict(std::string const & FileName);
    ~gdcmDict();
 
 // Print
@@ -54,35 +55,29 @@ public:
 // Entries
    bool AddNewEntry (gdcmDictEntry *NewEntry);
    bool ReplaceEntry(gdcmDictEntry *NewEntry);
-   bool RemoveEntry (TagKey key);
-   bool RemoveEntry (guint16 group, guint16 element);
+   bool RemoveEntry (gdcmTagKey key);
+   bool RemoveEntry (uint16_t group, uint16_t element);
    
 // Tag
    gdcmDictEntry *GetDictEntryByName(TagName name);
-   gdcmDictEntry *GetDictEntryByNumber(guint16 group, guint16 element);
+   gdcmDictEntry *GetDictEntryByNumber(uint16_t group, uint16_t element);
 
-   std::list<std::string> *GetDictEntryNames(void);
+   std::list<std::string> *GetDictEntryNames();
    std::map<std::string, std::list<std::string> > *
-        GetDictEntryNamesByCategory(void);
+        GetDictEntryNamesByCategory();
 
-   /**
-    * \ingroup gdcmDict
-    * \brief   returns a ref to the Dicom Dictionary H table (map)
-    * return the Dicom Dictionary H table
-    */
-   inline TagKeyHT & GetEntriesByKey(void)  { return KeyHt; }
+   /// \brief  Returns a ref to the Dicom Dictionary H table (map)
+   /// @return the Dicom Dictionary H table
+   TagKeyHT & GetEntriesByKey()  { 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; }
+   /// \brief  Returns a ref to the Dicom Dictionary H table (map)
+   /// @return the Dicom Dictionary H table
+   TagNameHT & GetEntriesByName()  { return NameHt; }
  
 private:
    /// ASCII file holding the Dictionnary
-   std::string filename;
-   /// Access through TagKey (see alternate access with NameHt)
+   std::string Filename;
+   /// Access through gdcmTagKey (see alternate access with NameHt)
    TagKeyHT  KeyHt;
    /// Access through TagName (see alternate access with KeyHt)
    TagNameHT NameHt;