Fix mistypings

[gdcm.git] / src / gdcmDictSet.h

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index 9b5f3ab79c34cd7de55c186648b632394993d540..9e2e2d777580a759e99c168c6a4d5d67d0e32a82 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.h,v $
   Language:  C++
-  Date:      $Date: 2005/06/14 14:00:04 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.55 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,32 +16,36 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMDICTSET_H
-#define GDCMDICTSET_H
+#ifndef _GDCMDICTSET_H
+#define _GDCMDICTSET_H
 
-#include "gdcmBase.h"
+#include "gdcmRefCounter.h"
 #include "gdcmDict.h"
+#include "gdcmGlobal.h"
 
 #include <map>
 #include <list>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
+//-----------------------------------------------------------------------------
 typedef std::map<DictKey, Dict*> DictSetHT;
 
 //-----------------------------------------------------------------------------
 /**
  * \brief  Container for managing a set of loaded dictionaries (Dict).
  * \note   Hopefully, sharing dictionaries should avoid
- * \par    reloading an already loaded dictionary (saving time)
- * \par    having many in memory representations of the same dictionary
+ *         - reloading an already loaded dictionary (saving time)
+ *         - having many in memory representations of the same dictionary
  *        (saving memory).
  */
-class GDCM_EXPORT DictSet : public Base
+class GDCM_EXPORT DictSet : public RefCounter
 {
+   gdcmTypeMacro(DictSet);
+
 public:
-   DictSet();
-   ~DictSet();
+/// \brief Contructs a DictSet with a RefCounter
+   static DictSet *New() {return new DictSet();}
 
    void Print(std::ostream &os = std::cout, std::string const &indent = "" );
 
@@ -55,35 +59,30 @@ public:
    Dict *GetDict( DictKey const &DictName );
 
    /// \brief   Returns the default reference DICOM V3 public dictionary.
-   Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); };
-
+   //Dict* GetDefaultPubDict() { return GetDict(PUB_DICT_NAME); }
+   Dict* GetDefaultPubDict() { return Global::DefaultPubDict; } 
+   
    // \ brief   Returns the virtual references DICOM dictionary.
    // \ warning : not end user intended
-   // Dict *GetVirtualDict() { return &VirtualEntries; };
+   // Dict *GetVirtualDict() { return &VirtualEntries; }
 
-   DictEntry *NewVirtualDictEntry(uint16_t group, uint16_t elem,
-                                  TagName vr     = GDCM_UNKNOWN,
-                                  TagName vm     = GDCM_UNKNOWN,
-                                  TagName name   = GDCM_UNKNOWN);
-
-   Dict *GetFirstEntry();
-   Dict *GetNextEntry();
+   Dict *GetFirstDict();
+   Dict *GetNextDict();
 
    static std::string BuildDictPath();
 
 protected:
-   bool AppendDict(Dict *NewDict, DictKey const &name);
+   DictSet();
+   ~DictSet();
 
 private:
    /// Hash table of all dictionaries contained in this DictSet
    DictSetHT Dicts;
+   /// Iterator to visit the Dictionaries of a given DictSet
    DictSetHT::iterator ItDictHt;
 
    /// Directory path to dictionaries
    std::string DictPath;
-
-   /// H table for the on the fly created DictEntries  
-   TagKeyHT VirtualEntries; 
 };
 } // end namespace gdcm