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

[gdcm.git] / src / gdcmArgMgr.h

diff --git a/src/gdcmArgMgr.h b/src/gdcmArgMgr.h
index 8b9c74c48362ea2a30ce25f19dd0a97a738e3ded..28304016b460e5e2fea7c27871c65c72b25ff6b5 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: 2005/06/06 12:37:58 $
-  Version:   $Revision: 1.1 $
+  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
@@ -19,6 +19,8 @@
 #ifndef  ___ARG_MGR__
 #define  ___ARG_MGR__
 
+#include "gdcmCommon.h"
+#include <stdio.h> // for FILE
 #include <stdlib.h> // For atof
 
 namespace gdcm
@@ -26,7 +28,7 @@ namespace gdcm
 
 #define ID_RFILE_TEXT   "rt"
 #define ARGMAXCOUNT 100   // Maximum number of arguments
-#define  ARG_LONG_MAX          1000
+#define ARG_LONG_MAX          1000
 
 // default file name
 #define ARG_DEFAULT_PARAMOUT    "fileout.par"
@@ -35,7 +37,7 @@ namespace gdcm
 #define  ARG_LABEL_LOGFILE       "LOG"
 #define  ARG_LABEL_PARAMOUT      "paramout"
 
-#define START_USAGE(usage)   static char * usage[] = {
+#define START_USAGE(usage)   const char *usage[] = {
 #define FINISH_USAGE         0};
 
 //-----------------------------------------------------------------------------
@@ -46,8 +48,7 @@ namespace gdcm
  *                              of 'command line program')        
  */
  
-//class GDCM_EXPORT ArgMgr {
-class ArgMgr
+class GDCM_EXPORT ArgMgr
 {
 public:
    ArgMgr(int argc, char **argv);
@@ -57,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)  */
@@ -65,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      */