* src/*.[h] all occurences of stl classes are now prefixed with

[gdcm.git] / src / gdcmDictEntry.h

diff --git a/src/gdcmDictEntry.h b/src/gdcmDictEntry.h
index 93cf8efc7c867cdab6ed138c8b8c02e5770b60dd..abb7aa0ebafe5e9e727a05dc575476d551bb7df6 100644 (file)
--- a/src/gdcmDictEntry.h
+++ b/src/gdcmDictEntry.h
@@ -7,16 +7,20 @@
 
 class GDCM_EXPORT gdcmDictEntry {
 private:
-       guint16 group;    // e.g. 0x0010  // FIXME : s'en sert-on qq part
-       guint16 element;  // e.g. 0x0103  // si ce n'est pour fabriquer la TagKey ?
-       string  vr;       // Value Representation i.e. some clue about the nature
-                         // of the data represented e.g. "FD" short for
-                         // "Floating Point Double"
+   // FIXME : were are the group and element used except from building up
+   //         a TagKey. If the answer is nowhere then there is no need
+   //         to store the group and element independently.
+       guint16 group;       // e.g. 0x0010
+       guint16 element;     // e.g. 0x0103
+   std::string  vr;     // Value Representation i.e. some clue about the nature
+                            // of the data represented e.g. "FD" short for
+                            // "Floating Point Double"
        // CLEANME: find the official dicom name for this field !
-       string  fourth;   // Fourth field containing some semantics. (Group Name abbr.)
-       string  name;     // e.g. "Patient_Name"
-       TagKey  key;      // Redundant with (group, element) but we add it
-                         // on efficiency purposes.
+   std::string  fourth; // Fourth field containing some semantics.
+                        //(Group Name abbr.)
+   std::string  name;   // e.g. "Patient_Name"
+       TagKey  key;         // Redundant with (group, element) but we add it
+                            // on efficiency purposes.
        // DCMTK has many fields for handling a DictEntry (see below). What are the
        // relevant ones for gdcmlib ?
        //      struct DBI_SimpleEntry {
@@ -33,22 +37,22 @@ private:
 public:
        gdcmDictEntry(guint16 group, 
                      guint16 element,
-                     string vr     = "Unknown",
-                     string fourth = "Unknown",
-                     string name   = "Unknown");
+                 std::string vr     = "Unknown",
+                 std::string fourth = "Unknown",
+                 std::string name   = "Unknown");
                         
        // fabrique une 'clé' par concaténation du numGroupe et du numElement
        static TagKey TranslateToKey(guint16 group, guint16 element);
        
-       guint16 GetGroup(void)  { return group; };
-       guint16 GetElement(void){return element;};
-       string  GetVR(void)     {return vr;     };
-       void    SetVR(string);
-       void    SetKey(string k){ key = k;     }
-       bool    IsVrUnknown(void);
-       string  GetFourth(void) {return fourth;};
-       string  GetName(void)   {return name;  };
-       string  GetKey(void)    {return key;   };
+       guint16      GetGroup(void)  { return group; };
+       guint16      GetElement(void){return element;};
+   std::string  GetVR(void)     {return vr;     };
+       void         SetVR(std::string);
+       void         SetKey(std::string k){ key = k; };
+       bool         IsVrUnknown(void);
+   std::string  GetFourth(void) {return fourth;};
+   std::string  GetName(void)   {return name;  };
+   std::string  GetKey(void)    {return key;   };
 };
 
 #endif