Changeset 11200


Ignore:
Timestamp:
01/25/12 10:29:50 (13 years ago)
Author:
Mathieu Morlighem
Message:

Fixed some g++ warnings: deprecated conversion from string constant to ‘char*’

Location:
issm/trunk-jpl/src/c/objects/KML
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/objects/KML/KML_Attribute.cpp

    r9761 r11200  
    5353}
    5454/*}}}*/
    55 
    5655/*FUNCTION KML_Attribute::DeepEcho {{{1*/
    5756void  KML_Attribute::DeepEcho(){
    … …  
    6463}
    6564/*}}}*/
    66 
    6765/*FUNCTION KML_Attribute::DeepEcho {{{1*/
    68 void  KML_Attribute::DeepEcho(char* indent){
     66void  KML_Attribute::DeepEcho(const char* indent){
    6967
    7068        int   i;
    … …  
    7977}
    8078/*}}}*/
    81 
    8279/*FUNCTION KML_Attribute::Write {{{1*/
    8380void  KML_Attribute::Write(FILE* filout,char* indent){
    … …  
    9087}
    9188/*}}}*/
    92 
    9389/*FUNCTION KML_Attribute::Read {{{1*/
    9490void  KML_Attribute::Read(FILE* fid,char* kstr){
    … …  
    10197}
    10298/*}}}*/
    103 
    10499/*FUNCTION KML_Attribute::Alloc {{{1*/
    105100void  KML_Attribute::Alloc(char* namei,char* valuei){
    … …  
    114109}
    115110/*}}}*/
    116 
    117111/*FUNCTION KML_Attribute::Add {{{1*/
    118112void  KML_Attribute::Add(DataSet* attrib){
    … …  
    123117}
    124118/*}}}*/
    125 
    126119/*FUNCTION KML_Attribute::Get {{{1*/
    127120void  KML_Attribute::Get(char** pvalueo,char* deflt){
    … …  
    139132}
    140133/*}}}*/
    141 

  • issm/trunk-jpl/src/c/objects/KML/KML_Attribute.h

    r9883 r11200  
    2929                virtual void  Echo();
    3030                virtual void  DeepEcho();
    31                 virtual void  DeepEcho(char* indent);
     31                virtual void  DeepEcho(const char* indent);
    3232                int   Id(){_error_("Not implemented yet.");};
    3333                int   MyRank(){_error_("Not implemented yet.");};

  • issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp

    r9761 r11200  
    5151}
    5252/*}}}*/
    53 
    5453/*FUNCTION KML_ColorStyle::DeepEcho {{{1*/
    5554void  KML_ColorStyle::DeepEcho(){
    … …  
    6261}
    6362/*}}}*/
    64 
    6563/*FUNCTION KML_ColorStyle::DeepEcho {{{1*/
    66 void  KML_ColorStyle::DeepEcho(char* indent){
     64void  KML_ColorStyle::DeepEcho(const char* indent){
    6765
    6866        bool  flag=true;
    … …  
    7674}
    7775/*}}}*/
    78 
    7976/*FUNCTION KML_ColorStyle::Write {{{1*/
    8077void  KML_ColorStyle::Write(FILE* filout,char* indent){
    … …  
    9087}
    9188/*}}}*/
    92 
    9389/*FUNCTION KML_ColorStyle::Read {{{1*/
    9490void  KML_ColorStyle::Read(FILE* fid,char* kstr){
    … …  
    118114}
    119115/*}}}*/
    120 

  • issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.h

    r9883 r11200  
    3232                void  Echo();
    3333                void  DeepEcho();
    34                 void  DeepEcho(char* indent);
     34                void  DeepEcho(const char* indent);
    3535                void  Write(FILE* fid,char* indent);
    3636                void  Read(FILE* fid,char* kstr);

  • issm/trunk-jpl/src/c/objects/KML/KML_Comment.cpp

    r10840 r11200  
    4848}
    4949/*}}}*/
    50 
    5150/*FUNCTION KML_Comment::DeepEcho {{{1*/
    5251void  KML_Comment::DeepEcho(){
    … …  
    5958}
    6059/*}}}*/
    61 
    6260/*FUNCTION KML_Comment::DeepEcho {{{1*/
    6361void  KML_Comment::DeepEcho(char* indent){
    … …  
    7169}
    7270/*}}}*/
    73 
    7471/*FUNCTION KML_Comment::Write {{{1*/
    7572void  KML_Comment::Write(FILE* filout,char* indent){
    … …  
    8481}
    8582/*}}}*/
    86 
    8783/*FUNCTION KML_Comment::Read {{{1*/
    8884void  KML_Comment::Read(FILE* fid,char* kstr){
    … …  
    9591}
    9692/*}}}*/
    97 
    9893/*FUNCTION KML_Comment::Alloc {{{1*/
    9994void  KML_Comment::Alloc(char* valuei){
    … …  
    105100}
    106101/*}}}*/
    107 
    108102/*FUNCTION KML_Comment::Add {{{1*/
    109103void  KML_Comment::Add(DataSet* commnt){
    … …  
    114108}
    115109/*}}}*/
    116 
    117110/*FUNCTION KML_Comment::Get {{{1*/
    118111void  KML_Comment::Get(char** pvalueo){
    … …  
    124117}
    125118/*}}}*/
    126 

  • issm/trunk-jpl/src/c/objects/KML/KML_Container.cpp

    r9761 r11200  
    5252}
    5353/*}}}*/
    54 
    5554/*FUNCTION KML_Container::DeepEcho {{{1*/
    5655void  KML_Container::DeepEcho(){
    … …  
    6362}
    6463/*}}}*/
    65 
    6664/*FUNCTION KML_Container::DeepEcho {{{1*/
    6765void  KML_Container::DeepEcho(char* indent){
    … …  
    9189}
    9290/*}}}*/
    93 
    9491/*FUNCTION KML_Container::Write {{{1*/
    9592void  KML_Container::Write(FILE* filout,char* indent){
    … …  
    112109}
    113110/*}}}*/
    114 
    115111/*FUNCTION KML_Container::Read {{{1*/
    116112void  KML_Container::Read(FILE* fid,char* kstr){
    … …  
    159155}
    160156/*}}}*/
    161 
    162157/*FUNCTION KML_Container::WriteExp {{{1*/
    163 void  KML_Container::WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp){
     158void  KML_Container::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    164159
    165160        int   i;
    … …  
    173168}
    174169/*}}}*/
    175 

  • issm/trunk-jpl/src/c/objects/KML/KML_Container.h

    r9883 r11200  
    3232                void  Write(FILE* fid,char* indent);
    3333                void  Read(FILE* fid,char* kstr);
    34                 void  WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp);
     34                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    3535                int   Id(){_error_("Not implemented yet.");};
    3636                int   MyRank(){_error_("Not implemented yet.");};

  • issm/trunk-jpl/src/c/objects/KML/KML_File.cpp

    r10840 r11200  
    5353}
    5454/*}}}*/
    55 
    5655/*FUNCTION KML_File::DeepEcho {{{1*/
    5756void  KML_File::DeepEcho(){
    … …  
    6463}
    6564/*}}}*/
    66 
    6765/*FUNCTION KML_File::DeepEcho {{{1*/
    6866void  KML_File::DeepEcho(char* indent){
    … …  
    9391}
    9492/*}}}*/
    95 
    9693/*FUNCTION KML_File::Write {{{1*/
    9794void  KML_File::Write(FILE* filout,char* indent){
    … …  
    121118}
    122119/*}}}*/
    123 
    124120/*FUNCTION KML_File::Read {{{1*/
    125121void  KML_File::Read(FILE* fid,char* kstr){
    … …  
    266262}
    267263/*}}}*/
    268 
    269264/*FUNCTION KML_File::WriteExp {{{1*/
    270 void  KML_File::WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp){
     265void  KML_File::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    271266
    272267        int   i;
    … …  
    280275}
    281276/*}}}*/
    282 

  • issm/trunk-jpl/src/c/objects/KML/KML_File.h

    r9883 r11200  
    3232                void  Write(FILE* fid,char* indent);
    3333                void  Read(FILE* fid,char* kstr);
    34                 void  WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp);
     34                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    3535                int   Id(){_error_("Not implemented yet.");};
    3636                int   MyRank(){_error_("Not implemented yet.");};

  • issm/trunk-jpl/src/c/objects/KML/KML_LineString.cpp

    r10840 r11200  
    6262}
    6363/*}}}*/
    64 
    6564/*FUNCTION KML_LineString::DeepEcho {{{1*/
    6665void  KML_LineString::DeepEcho(){
    … …  
    7372}
    7473/*}}}*/
    75 
    7674/*FUNCTION KML_LineString::DeepEcho {{{1*/
    7775void  KML_LineString::DeepEcho(char* indent){
    … …  
    9492}
    9593/*}}}*/
    96 
    9794/*FUNCTION KML_LineString::Write {{{1*/
    9895void  KML_LineString::Write(FILE* filout,char* indent){
    … …  
    124121}
    125122/*}}}*/
    126 
    127123/*FUNCTION KML_LineString::Read {{{1*/
    128124void  KML_LineString::Read(FILE* fid,char* kstr){
    … …  
    183179}
    184180/*}}}*/
    185 
    186181/*FUNCTION KML_LineString::WriteExp {{{1*/
    187 void  KML_LineString::WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp){
     182void  KML_LineString::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    188183
    189184        int     i;
    … …  
    236231}
    237232/*}}}*/
    238 

  • issm/trunk-jpl/src/c/objects/KML/KML_LineString.h

    r9883 r11200  
    3737                void  Write(FILE* fid,char* indent);
    3838                void  Read(FILE* fid,char* kstr);
    39                 void  WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp);
     39                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    4040                int   Id(){_error_("Not implemented yet.");};
    4141                int   MyRank(){_error_("Not implemented yet.");};

  • issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.cpp

    r10840 r11200  
    185185
    186186/*FUNCTION KML_LinearRing::WriteExp {{{1*/
    187 void  KML_LinearRing::WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp){
     187void  KML_LinearRing::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    188188
    189189        int     i;

  • issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.h

    r9883 r11200  
    3737                void  Write(FILE* fid,char* indent);
    3838                void  Read(FILE* fid,char* kstr);
    39                 void  WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp);
     39                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    4040                int   Id(){_error_("Not implemented yet.");};
    4141                int   MyRank(){_error_("Not implemented yet.");};

  • issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.cpp

    r10840 r11200  
    196196
    197197/*FUNCTION KML_MultiGeometry::WriteExp {{{1*/
    198 void  KML_MultiGeometry::WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp){
     198void  KML_MultiGeometry::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    199199
    200200        int   i;

  • issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.h

    r9883 r11200  
    3333                void  Write(FILE* fid,char* indent);
    3434                void  Read(FILE* fid,char* kstr);
    35                 void  WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp);
     35                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    3636                int   Id(){_error_("Not implemented yet.");};
    3737                int   MyRank(){_error_("Not implemented yet.");};

  • issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp

    r10840 r11200  
    5656}
    5757/*}}}*/
    58 
    5958/*FUNCTION KML_Object::DeepEcho {{{1*/
    6059void  KML_Object::DeepEcho(){
    … …  
    6766}
    6867/*}}}*/
    69 
    7068/*FUNCTION KML_Object::DeepEcho {{{1*/
    7169void  KML_Object::DeepEcho(char* indent){
    … …  
    9593}
    9694/*}}}*/
    97 
    9895/*FUNCTION KML_Object::Write {{{1*/
    9996void  KML_Object::Write(FILE* filout,char* indent){
    … …  
    107104}
    108105/*}}}*/
    109 
    110106/*FUNCTION KML_Object::Read {{{1*/
    111107void  KML_Object::Read(FILE* fid,char* kstr){
    … …  
    129125}
    130126/*}}}*/
    131 
    132127/*FUNCTION KML_Object::WriteExp {{{1*/
    133 void  KML_Object::WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp){
     128void  KML_Object::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    134129
    135130        ;
    … …  
    138133}
    139134/*}}}*/
    140 
    141135/*FUNCTION KML_Object::AddAttrib {{{1*/
    142 void  KML_Object::AddAttrib(char* name,char* value){
     136void  KML_Object::AddAttrib(const char* name,const char* value){
    143137
    144138        KML_Attribute* katt=NULL;
    … …  
    151145}
    152146/*}}}*/
    153 
    154147/*FUNCTION KML_Object::FindAttrib {{{1*/
    155148void  KML_Object::FindAttrib(char** pvalue,char* name,char* deflt){
    … …  
    179172}
    180173/*}}}*/
    181 
    182174/*FUNCTION KML_Object::WriteAttrib {{{1*/
    183175void  KML_Object::WriteAttrib(FILE* filout,char* indent){
    … …  
    196188}
    197189/*}}}*/
    198 
    199190/*FUNCTION KML_Object::AddCommnt {{{1*/
    200191void  KML_Object::AddCommnt(int ncom,char** pcom){
    … …  
    212203}
    213204/*}}}*/
    214 
    215205/*FUNCTION KML_Object::AddCommnt {{{1*/
    216206void  KML_Object::AddCommnt(char* value){
    … …  
    225215}
    226216/*}}}*/
    227 
    228217/*FUNCTION KML_Object::FindCommnt {{{1*/
    229218void  KML_Object::FindCommnt(char** pvalue,int inum){
    … …  
    244233}
    245234/*}}}*/
    246 
    247235/*FUNCTION KML_Object::WriteCommnt {{{1*/
    248236void  KML_Object::WriteCommnt(FILE* filout,char* indent){
    … …  
    261249}
    262250/*}}}*/
    263 

  • issm/trunk-jpl/src/c/objects/KML/KML_Object.h

    r10840 r11200  
    4242                virtual void  Write(FILE* fid,char* indent)=0;
    4343                virtual void  Read(FILE* fid,char* kstr)=0;
    44                 virtual void  WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp);
    45                 virtual void  AddAttrib(char* name,char* value);
     44                virtual void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
     45                virtual void  AddAttrib(const char* name,const char* value);
    4646                virtual void  FindAttrib(char** pvalue,char* name,char* deflt);
    4747                virtual void  WriteAttrib(FILE* fid,char* indent);

  • issm/trunk-jpl/src/c/objects/KML/KML_Placemark.cpp

    r10840 r11200  
    5353}
    5454/*}}}*/
    55 
    5655/*FUNCTION KML_Placemark::DeepEcho {{{1*/
    5756void  KML_Placemark::DeepEcho(){
    … …  
    6463}
    6564/*}}}*/
    66 
    6765/*FUNCTION KML_Placemark::DeepEcho {{{1*/
    6866void  KML_Placemark::DeepEcho(char* indent){
    … …  
    9391}
    9492/*}}}*/
    95 
    9693/*FUNCTION KML_Placemark::Write {{{1*/
    9794void  KML_Placemark::Write(FILE* filout,char* indent){
    … …  
    121118}
    122119/*}}}*/
    123 
    124120/*FUNCTION KML_Placemark::Read {{{1*/
    125121void  KML_Placemark::Read(FILE* fid,char* kstr){
    … …  
    194190}
    195191/*}}}*/
    196 
    197192/*FUNCTION KML_Placemark::WriteExp {{{1*/
    198 void  KML_Placemark::WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp){
     193void  KML_Placemark::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    199194
    200195        int   i;
    … …  
    215210}
    216211/*}}}*/
    217 

  • issm/trunk-jpl/src/c/objects/KML/KML_Placemark.h

    r9883 r11200  
    3333                void  Write(FILE* fid,char* indent);
    3434                void  Read(FILE* fid,char* kstr);
    35                 void  WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp);
     35                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    3636                int   Id(){_error_("Not implemented yet.");};
    3737                int   MyRank(){_error_("Not implemented yet.");};

  • issm/trunk-jpl/src/c/objects/KML/KML_Point.cpp

    r10840 r11200  
    5858}
    5959/*}}}*/
    60 
    6160/*FUNCTION KML_Point::DeepEcho {{{1*/
    6261void  KML_Point::DeepEcho(){
    … …  
    6968}
    7069/*}}}*/
    71 
    7270/*FUNCTION KML_Point::DeepEcho {{{1*/
    7371void  KML_Point::DeepEcho(char* indent){
    … …  
    8583}
    8684/*}}}*/
    87 
    8885/*FUNCTION KML_Point::Write {{{1*/
    8986void  KML_Point::Write(FILE* filout,char* indent){
    … …  
    106103}
    107104/*}}}*/
    108 
    109105/*FUNCTION KML_Point::Read {{{1*/
    110106void  KML_Point::Read(FILE* fid,char* kstr){
    … …  
    162158}
    163159/*}}}*/
    164 
    165160/*FUNCTION KML_Point::WriteExp {{{1*/
    166 void  KML_Point::WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp){
     161void  KML_Point::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    167162
    168163        int     i;
    … …  
    203198}
    204199/*}}}*/
    205 

  • issm/trunk-jpl/src/c/objects/KML/KML_Point.h

    r10256 r11200  
    3535                void  Write(FILE* fid,char* indent);
    3636                void  Read(FILE* fid,char* kstr);
    37                 void  WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp);
     37                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    3838                int   Id(){_error_("Not implemented yet.");};
    3939                int   MyRank(){_error_("Not implemented yet.");};

  • issm/trunk-jpl/src/c/objects/KML/KML_Polygon.cpp

    r10840 r11200  
    6767}
    6868/*}}}*/
    69 
    7069/*FUNCTION KML_Polygon::DeepEcho {{{1*/
    7170void  KML_Polygon::DeepEcho(){
    … …  
    7877}
    7978/*}}}*/
    80 
    8179/*FUNCTION KML_Polygon::DeepEcho {{{1*/
    8280void  KML_Polygon::DeepEcho(char* indent){
    … …  
    118116}
    119117/*}}}*/
    120 
    121118/*FUNCTION KML_Polygon::Write {{{1*/
    122119void  KML_Polygon::Write(FILE* filout,char* indent){
    … …  
    160157}
    161158/*}}}*/
    162 
    163159/*FUNCTION KML_Polygon::Read {{{1*/
    164160void  KML_Polygon::Read(FILE* fid,char* kstr){
    … …  
    272268}
    273269/*}}}*/
    274 
    275270/*FUNCTION KML_Polygon::WriteExp {{{1*/
    276 void  KML_Polygon::WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp){
     271void  KML_Polygon::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
    277272
    278273        int   i;
    … …  
    304299}
    305300/*}}}*/
    306 

  • issm/trunk-jpl/src/c/objects/KML/KML_Polygon.h

    r9883 r11200  
    3939                void  Write(FILE* fid,char* indent);
    4040                void  Read(FILE* fid,char* kstr);
    41                 void  WriteExp(FILE* fid,char* nstr,int sgn,double cm,double sp);
     41                void  WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp);
    4242                int   Id(){_error_("Not implemented yet.");};
    4343                int   MyRank(){_error_("Not implemented yet.");};
Note: See TracChangeset for help on using the changeset viewer.