ENH: Some more const correctness...until I hit strtok

diff --git a/src/gdcmArgMgr.cxx b/src/gdcmArgMgr.cxx
index d54aae7c3e85f7f6b1f7edf43bb31804c07babdf..82cc2a0aa9667cce49c8cecd9d59792d4398fc37 100644 (file)
--- a/src/gdcmArgMgr.cxx
+++ b/src/gdcmArgMgr.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/26 15:52:56 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2006/01/26 16:01:04 $
+  Version:   $Revision: 1.18 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -162,7 +162,7 @@ char *ArgMgr::ArgMgrValue ( const char *param )
  * \brief  Search for the first not yet used label
  * @return Pointer to the char array holding the first non used label
  */
-char *ArgMgr::ArgMgrUnused ( )
+const char *ArgMgr::ArgMgrUnused ( )
 {
    int i ;
    for ( i=ArgCount-1; i>0; i-- )
@@ -182,7 +182,7 @@ char *ArgMgr::ArgMgrUnused ( )
  */
 int ArgMgr::ArgMgrPrintUnusedLabels ()
 {
-   char *label;
+   const char *label;
    int i=0;
    while ( (label=ArgMgrUnused())!=0 )
    {
@@ -217,7 +217,7 @@ int ArgMgr::ArgMgrUsage(const char **usage )
  * @param param  char. array that defines the parameter
  * @return   Entier correspondant au rang dans la liste de labels
  */
-int ArgMgr::ArgMgrSave ( char *param )
+int ArgMgr::ArgMgrSave ( const char *param )
 {
    static int   deja = 0;
    FILE         *fd;
@@ -295,7 +295,7 @@ const char *ArgMgr::ArgMgrGetString(const char *param, const char *defaultVal)
  * @param val  number of default value
  * @return   int : range of value amongst the values list
  */
-int ArgMgr::ArgMgrGetLabel (const char *param, char *liste, int val )
+int ArgMgr::ArgMgrGetLabel (const char *param, const char *liste, int val )
 {
   char *lab;
   const char *vallab;
@@ -327,6 +327,7 @@ int ArgMgr::ArgMgrGetLabel (const char *param, char *liste, int val )
  * @param liste  character Chain describing the various values.
  *               Labels are separated by  '\\'.
  *               No case sensitive.
+ *               WARNING this will be changed (not const)
  * @param usage Usage program (displayed if label not found)
  * @return   int : range of value amongst the values list
  */
@@ -762,7 +763,7 @@ char *ArgMgr::Majuscule (const char *chaine )
 * Valeur retournee . : false if OK.                                       *
 *                      true if KO.                                        *
 **************************************************************************/
-int ArgMgr::FiltreLong ( char *arg  )
+int ArgMgr::FiltreLong ( const char *arg  )
 {
   int  n = 0 ;
   while ( (n++<ARG_LONG_MAX) && (*(arg++) != '\0') ) ;
@@ -825,7 +826,7 @@ const char *ArgMgr::LoadedParam ( const char *param, FILE *fd )
  |              Role     : parameter File name
  |
  +------------------------------------------------------------------------*/
-int ArgMgr::ArgLoadFromFile ( char *filename )
+int ArgMgr::ArgLoadFromFile ( const char *filename )
 {
   int   nbl = 0;
   char  param[ARG_LONG_MAX+1];

diff --git a/src/gdcmArgMgr.h b/src/gdcmArgMgr.h
index 6f4ea8fdd581e0af76710b037551c24a20fd2904..1d48babe90b2a4293b05db1280e70c4aa709d0ca 100644 (file)
--- a/src/gdcmArgMgr.h
+++ b/src/gdcmArgMgr.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.h,v $
   Language:  C++
-  Date:      $Date: 2006/01/26 15:52:56 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2006/01/26 16:01:04 $
+  Version:   $Revision: 1.12 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -56,15 +56,15 @@ public:
 
    int    ArgMgrDefined           (const char *param);  // Checks if Param is defined
    char  *ArgMgrValue             (const char *param);  // Returns Param value 
-   char  *ArgMgrUnused            (void);               // Returns a never used arg.
-   int    ArgMgrSave              (char *);             // Save of parameters out
+   const char  *ArgMgrUnused      (void);               // Returns a never used arg.
+   int    ArgMgrSave              (const char *);       // Save of parameters out
    int    ArgMgrUsage             (const char **usage); // Display program usage 
    int    ArgMgrPrintUnusedLabels (void);               // Prints unused labels
 
    int    ArgMgrGetInt   (const char *param, int);  // Gets an int   (with default value)
    float  ArgMgrGetFloat (const char *param, float);// Gets a float  (with default value)
    const char  *ArgMgrGetString(const char *param, const char* ext = 0);// Gets a string (with default value)
-   int    ArgMgrGetLabel (const char *param, char *, int);
+   int    ArgMgrGetLabel (const char *param, const char *, int);
   
    int    ArgMgrWantInt   (const char *param, const char **usage);  // Demands an int 
    float  ArgMgrWantFloat (const char *param, const char **usage);  // Demands a float
@@ -81,9 +81,9 @@ public:
 
 private :
 
-   int    FiltreLong       (char *);
+   int    FiltreLong       (const char *);
    const char  *LoadedParam(const char *, FILE *);
-   int    ArgLoadFromFile  (char *);
+   int    ArgLoadFromFile  (const char *);
    void   ArgStdArgs       (void);
 
    // These ones are 'general purpose methods'

diff --git a/vtk/vtkgdcmSerieViewer.cxx b/vtk/vtkgdcmSerieViewer.cxx
index 5c0beb3c9e1b4af7081d2c107d47476618671fa3..0667025d1ed78a0b61fe7439671c48c50f1757ec 100644 (file)
--- a/vtk/vtkgdcmSerieViewer.cxx
+++ b/vtk/vtkgdcmSerieViewer.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmSerieViewer.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/14 17:40:48 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2006/01/26 16:01:06 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
    int check   = am->ArgMgrDefined("check");
   
    // This is so ugly, a cstring is NOT a char * (god damit!)
-   bool bname = ( strcmp(am->ArgMgrGetString("order", (char*)"not found"),"name")==0 );
+   bool bname = ( strcmp(am->ArgMgrGetString("order", "not found"),"name")==0 );
    if (bname)
       elemsToOrderOn = am->ArgMgrGetXInt16Enum("order", &orderNb);
 

diff --git a/vtk/vtkgdcmSerieViewer2.cxx b/vtk/vtkgdcmSerieViewer2.cxx
index 4fcc69c659a6c66da8c9b289aae121683a79dc93..9104d44d1f3d85982ff565b16a0b10252701aac6 100755 (executable)
--- a/vtk/vtkgdcmSerieViewer2.cxx
+++ b/vtk/vtkgdcmSerieViewer2.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkgdcmSerieViewer2.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/12/09 12:54:05 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2006/01/26 16:01:06 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
    int check   = am->ArgMgrDefined("check");
   
    // This is so ugly, a cstring is NOT a char * (god damit!)
-   bool bname = ( strcmp(am->ArgMgrGetString("order", (char*)"not found"),"name")==0 );
+   bool bname = ( strcmp(am->ArgMgrGetString("order", "not found"),"name")==0 );
    if (bname)
       elemsToOrderOn = am->ArgMgrGetXInt16Enum("order", &orderNb);