X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictSet.cxx;h=5993675bced31b532f20c4d800dffc684d1335f6;hb=40b909789581894e57a0d8f22d6f1f91f55e7f84;hp=a18a25faff4cb6b2b0395d29c63fc08a34da83e6;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index a18a25fa..5993675b 100644
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:45 $
-  Version:   $Revision: 1.38 $
+  Date:      $Date: 2004/10/18 02:31:58 $
+  Version:   $Revision: 1.40 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,7 @@
 #include "gdcmDebug.h"
 #include <fstream>
 #include <stdlib.h>  // For getenv
+
 namespace gdcm 
 {
 
@@ -95,7 +96,7 @@ void DictSet::Print(std::ostream& os)
  * \sa DictSet::GetPubDictTagNamesByCategory
  * @return  A list of all entries of the public dicom dictionnary.
  */
-std::list<std::string> *DictSet::GetPubDictEntryNames() 
+EntryNamesList * DictSet::GetPubDictEntryNames() 
 {
    return GetDefaultPubDict()->GetDictEntryNames();
 }
@@ -126,8 +127,7 @@ std::list<std::string> *DictSet::GetPubDictEntryNames()
  *          corresponding values are lists of all the dictionnary entries
  *          among that group.
  */
-std::map<std::string, std::list<std::string> > *
-   DictSet::GetPubDictEntryNamesByCategory() 
+EntryNamesByCatMap * DictSet::GetPubDictEntryNamesByCategory() 
 {
    return GetDefaultPubDict()->GetDictEntryNamesByCategory();
 }
@@ -141,10 +141,10 @@ std::map<std::string, std::list<std::string> > *
  * @param   name Symbolic name that be used as identifier of the newly 
  *          created dictionary.
  */
-Dict *DictSet::LoadDictFromFile(std::string const & fileName, 
-                                        DictKey const & name) 
+Dict *DictSet::LoadDictFromFile(std::string const & filename, 
+                                DictKey const & name) 
 {
-   Dict *newDict = new Dict(fileName);
+   Dict *newDict = new Dict(filename);
    AppendDict(newDict, name);
 
    return newDict;
@@ -172,11 +172,11 @@ Dict *DictSet::GetDict(DictKey const & dictName)
  *          in no dictionnary
  * @return  virtual entry
  */
-DictEntry *DictSet::NewVirtualDictEntry(uint16_t group,
-                                                uint16_t element,
-                                                std::string vr,
-                                                std::string fourth,
-                                                std::string name)
+DictEntry *DictSet::NewVirtualDictEntry( uint16_t group,
+                                         uint16_t element,
+                                         TagName vr,
+                                         TagName fourth,
+                                         TagName name)
 {
    DictEntry* entry;
    const std::string tag = DictEntry::TranslateToKey(group,element)