-typedef map<TagKey, gdcmDictEntry*> TagKeyHT;
-typedef map<TagName, gdcmDictEntry*> TagNameHT;
-
-/// Build a memory representation of a dicom dictionary by parsing
-/// an ascii file
-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;
+#include <iostream>
+#include <list>
+#include <map>
+
+namespace gdcm
+{
+
+//-----------------------------------------------------------------------------
+typedef std::string DictKey;
+typedef std::map<TagKey, DictEntry> TagKeyHT;
+//typedef std::list<std::string> EntryNamesList;
+//typedef std::map<std::string,
+// std::list<std::string> > EntryNamesByCatMap;
+//-----------------------------------------------------------------------------
+/**
+ * \brief Dict acts a memory representation of a dicom dictionary i.e.
+ * it is a container for a collection of dictionary entries.
+ * The dictionary is loaded from in an ascii file.
+ * There should be a single public dictionary (THE dictionary of
+ * the actual DICOM v3) but as many shadow dictionaries as imagers
+ * combined with all software versions...
+ * \see DictSet
+ */
+class GDCM_EXPORT Dict : public Base
+{