From: jpr <jpr>
Date: Wed, 8 Jun 2005 09:24:17 +0000 (+0000)
Subject: to avoid warnings (conversion char ** <-> const char **)
X-Git-Tag: Version1.2.bp~572
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=dc9e22215d010c85822ee4cf6c89af586e1e5134;p=gdcm.git

to avoid warnings (conversion char ** <-> const char **)
---

diff --git a/src/gdcmArgMgr.cxx b/src/gdcmArgMgr.cxx
index 77536db0..17d774c5 100644
--- a/src/gdcmArgMgr.cxx
+++ b/src/gdcmArgMgr.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/08 08:58:22 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/06/08 09:24:17 $
+  Version:   $Revision: 1.5 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -201,7 +201,7 @@ int ArgMgr::ArgMgrPrintUnusedLabels ()
  * @param usage  array of pointers to the documentation lines of the program.
  * @return exception code
  */
-int ArgMgr::ArgMgrUsage(char **usage_text )
+int ArgMgr::ArgMgrUsage(const char **usage_text )
 {
    while ( *usage_text ) 
       std::cout << std::endl << *(usage_text++);
@@ -328,7 +328,7 @@ int ArgMgr::ArgMgrGetLabel (char *label, char *liste, int val )
  * @param usage Usage program (displayed if label not found)
  * @return   int : range of value amongst the values list
  */
-int ArgMgr::ArgMgrWantLabel (char *label, char *liste, char *usage[] )
+int ArgMgr::ArgMgrWantLabel (char *label, char *liste, const char *usage[] )
 {
    char *lab;
    char *vallab;
@@ -352,7 +352,7 @@ int ArgMgr::ArgMgrWantLabel (char *label, char *liste, char *usage[] )
  * @param usage Usage program (displayed if label not found)
  * @return parameter value
  */
-int ArgMgr::ArgMgrWantInt (char *label, char **usage)
+int ArgMgr::ArgMgrWantInt (char *label, const char **usage)
 {
    return        ( (ArgMgrDefined(label) ) 
                  ? (atoi(ArgMgrValue(label) ) ) 
@@ -367,7 +367,7 @@ int ArgMgr::ArgMgrWantInt (char *label, char **usage)
  * @param usage Usage program (displayed if label not found)
  * @return parameter value
  */
-float ArgMgr::ArgMgrWantFloat (char *label, char **usage)
+float ArgMgr::ArgMgrWantFloat (char *label, const char **usage)
 {
    return       ( (ArgMgrDefined(label) ) 
                 ? ((float)atof(ArgMgrValue(label) ) ) 
@@ -382,7 +382,7 @@ float ArgMgr::ArgMgrWantFloat (char *label, char **usage)
  * @param usage Usage program (displayed if label not found)
  * @return parameter value
  */
-char *ArgMgr::ArgMgrWantString(char *label, char **usage)
+char *ArgMgr::ArgMgrWantString(char *label, const char **usage)
 {
    return      ( (ArgMgrDefined(label) ) 
                ? (ArgMgrValue(label) ) 
diff --git a/src/gdcmArgMgr.h b/src/gdcmArgMgr.h
index 27c472bc..28304016 100644
--- a/src/gdcmArgMgr.h
+++ b/src/gdcmArgMgr.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.h,v $
   Language:  C++
-  Date:      $Date: 2005/06/07 14:58:54 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/06/08 09:24:17 $
+  Version:   $Revision: 1.4 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,7 +37,7 @@ namespace gdcm
 #define  ARG_LABEL_LOGFILE       "LOG"
 #define  ARG_LABEL_PARAMOUT      "paramout"
 
-#define START_USAGE(usage)   char *usage[] = {
+#define START_USAGE(usage)   const char *usage[] = {
 #define FINISH_USAGE         0};
 
 //-----------------------------------------------------------------------------
@@ -58,7 +58,7 @@ public:
    char  *ArgMgrValue             (char *);      /* Returns Param value       */
    char  *ArgMgrUnused            (void);        /* Returns a never used arg. */
    int    ArgMgrSave              (char *);      /* Save of parameters out    */
-   int    ArgMgrUsage             (char **);     /* Display program usage     */
+   int    ArgMgrUsage             (const char **);/* Display program usage     */
    int    ArgMgrPrintUnusedLabels (void);        /* Prints unused labels      */
 
    int    ArgMgrGetInt   (char*, int);  /* Gets an int   (with default value)  */
@@ -66,10 +66,10 @@ public:
    char  *ArgMgrGetString(char*, char*);/* Gets a string (with default value)  */
    int    ArgMgrGetLabel (char *, char *, int);
   
-   int   ArgMgrWantInt   (char*, char**);  /* Demands an int                   */
-   float ArgMgrWantFloat (char*, char**);  /* Demands a float                  */
-   char *ArgMgrWantString(char*, char**);  /* Demands a string                 */
-   int   ArgMgrWantLabel (char*, char *, char **);
+   int   ArgMgrWantInt   (char*, const char**);  /* Demands an int                   */
+   float ArgMgrWantFloat (char*, const char**);  /* Demands a float                  */
+   char *ArgMgrWantString(char*, const char**);  /* Demands a string                 */
+   int   ArgMgrWantLabel (char*, char *, const char **);
 
    int   *ArgMgrGetListOfInt   (char *, int *);   /* Gets a list of int        */
    float *ArgMgrGetListOfFloat (char *, int *);   /* Gets a list of float      */