From b120d9dfb3bb3ebfb6bb3d95d916648da55be36b Mon Sep 17 00:00:00 2001 From: frohlich Date: Tue, 3 Mar 2009 07:58:20 +0000 Subject: [PATCH] =?UTF-8?q?Casaba=20Hal=C3=A1sz:=20Fix=20some=20const=20wa?= =?UTF-8?q?rnings.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modified Files: src/FDM/YASim/Rotor.cpp src/FDM/YASim/Rotor.hpp src/GUI/fonts.cxx --- src/FDM/YASim/Rotor.cpp | 2 +- src/FDM/YASim/Rotor.hpp | 2 +- src/GUI/fonts.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FDM/YASim/Rotor.cpp b/src/FDM/YASim/Rotor.cpp index 96be4cfff..5eb2c33fc 100644 --- a/src/FDM/YASim/Rotor.cpp +++ b/src/FDM/YASim/Rotor.cpp @@ -699,7 +699,7 @@ void Rotor::setGlobalGround(double *global_ground, float* global_vel) for(i=0; i<4; i++) _global_ground[i] = global_ground[i]; } -void Rotor::setParameter(char *parametername, float value) +void Rotor::setParameter(const char *parametername, float value) { #define p(a,b) if (strcmp(parametername,#a)==0) _##a = (value * (b)); else p(translift_ve,1) diff --git a/src/FDM/YASim/Rotor.hpp b/src/FDM/YASim/Rotor.hpp index fcf354391..43ea60e04 100644 --- a/src/FDM/YASim/Rotor.hpp +++ b/src/FDM/YASim/Rotor.hpp @@ -97,7 +97,7 @@ public: void setAlphaoutput(int i, const char *text); void setCcw(int ccw); int getCcw() {return _ccw;}; - void setParameter(char *parametername, float value); + void setParameter(const char *parametername, float value); void setGlobalGround(double* global_ground, float* global_vel); float getTorqueOfInertia(); int getValueforFGSet(int j,char *b,float *f); diff --git a/src/GUI/fonts.cxx b/src/GUI/fonts.cxx index 8d1f3bcbd..2d67907b7 100644 --- a/src/GUI/fonts.cxx +++ b/src/GUI/fonts.cxx @@ -12,7 +12,7 @@ struct SFG_Font { - char* Name; /* The source font name */ + const char* Name; /* The source font name */ int Quantity; /* Number of chars in font */ int Height; /* Height of the characters */ const GLubyte** Characters; /* The characters mapping */