瀏覽代碼

cmGrPlot.h/c: Removed superfluous use of const in function returning cmGrColor_t.

master
kevin 11 年之前
父節點
當前提交
894d39466b
共有 2 個文件被更改,包括 11 次插入11 次删除
  1. 6
    6
      cmGrPlot.c
  2. 5
    5
      cmGrPlot.h

+ 6
- 6
cmGrPlot.c 查看文件

278
 }
278
 }
279
 
279
 
280
 
280
 
281
-const cmGrColor_t _cmGrPlotColor( cmGrPlotObj_t* op, cmGrColor_t* array )
281
+cmGrColor_t _cmGrPlotColor( cmGrPlotObj_t* op, cmGrColor_t* array )
282
 {
282
 {
283
   if( _cmGrPlotObjIsFocused(op) )
283
   if( _cmGrPlotObjIsFocused(op) )
284
     return array[kFocusPlGrId];
284
     return array[kFocusPlGrId];
1017
   return op->labelAngle;
1017
   return op->labelAngle;
1018
 }
1018
 }
1019
 
1019
 
1020
-const cmGrColor_t cmGrPlotObjLabelColor(    cmGrPlObjH_t oh )
1020
+cmGrColor_t cmGrPlotObjLabelColor(    cmGrPlObjH_t oh )
1021
 {
1021
 {
1022
   cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
1022
   cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
1023
   return op->labelColor;
1023
   return op->labelColor;
1175
   op->drawColors[ id ] = c;
1175
   op->drawColors[ id ] = c;
1176
 }
1176
 }
1177
 
1177
 
1178
-const cmGrColor_t cmGrPlotObjLineColor(     cmGrPlObjH_t oh, cmGrPlStateId_t id )
1178
+cmGrColor_t cmGrPlotObjLineColor(     cmGrPlObjH_t oh, cmGrPlStateId_t id )
1179
 {
1179
 {
1180
   cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
1180
   cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
1181
   assert( id < kMaxPlGrId );
1181
   assert( id < kMaxPlGrId );
1182
   return op->drawColors[id];
1182
   return op->drawColors[id];
1183
 }
1183
 }
1184
 
1184
 
1185
-const cmGrColor_t cmGrPlotObjCurLineColor(  cmGrPlObjH_t h )
1185
+cmGrColor_t cmGrPlotObjCurLineColor(  cmGrPlObjH_t h )
1186
 {
1186
 {
1187
   cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(h);
1187
   cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(h);
1188
   return _cmGrPlotColor(op,op->drawColors);
1188
   return _cmGrPlotColor(op,op->drawColors);
1195
   op->fillColors[ id ] = c;
1195
   op->fillColors[ id ] = c;
1196
 }
1196
 }
1197
 
1197
 
1198
-const cmGrColor_t cmGrPlotObjFillColor(     cmGrPlObjH_t oh, cmGrPlStateId_t id )
1198
+cmGrColor_t cmGrPlotObjFillColor(     cmGrPlObjH_t oh, cmGrPlStateId_t id )
1199
 {
1199
 {
1200
   cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
1200
   cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
1201
   assert( id < kMaxPlGrId );
1201
   assert( id < kMaxPlGrId );
1202
   return op->fillColors[id];
1202
   return op->fillColors[id];
1203
 }
1203
 }
1204
 
1204
 
1205
-const cmGrColor_t cmGrPlotObjCurFillColor(  cmGrPlObjH_t h )
1205
+cmGrColor_t cmGrPlotObjCurFillColor(  cmGrPlObjH_t h )
1206
 {
1206
 {
1207
   cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(h);
1207
   cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(h);
1208
   return _cmGrPlotColor(op,op->fillColors);
1208
   return _cmGrPlotColor(op,op->fillColors);

+ 5
- 5
cmGrPlot.h 查看文件

160
   void              cmGrPlotObjSetLabelAttr(  cmGrPlObjH_t oh, unsigned flags, int angle, const cmGrColor_t color );
160
   void              cmGrPlotObjSetLabelAttr(  cmGrPlObjH_t oh, unsigned flags, int angle, const cmGrColor_t color );
161
   unsigned          cmGrPlotObjLabelFlags(    cmGrPlObjH_t oh );
161
   unsigned          cmGrPlotObjLabelFlags(    cmGrPlObjH_t oh );
162
   int               cmGrPlotObjLabelAngle(    cmGrPlObjH_t oh );
162
   int               cmGrPlotObjLabelAngle(    cmGrPlObjH_t oh );
163
-  const cmGrColor_t cmGrPlotObjLabelColor(  cmGrPlObjH_t oh );
163
+  cmGrColor_t       cmGrPlotObjLabelColor(  cmGrPlObjH_t oh );
164
   
164
   
165
 
165
 
166
   void              cmGrPlotObjSetStateFlags( cmGrPlObjH_t oh, unsigned flags );
166
   void              cmGrPlotObjSetStateFlags( cmGrPlObjH_t oh, unsigned flags );
185
   void              cmGrPlotObjSetFont(       cmGrPlObjH_t h, unsigned id, unsigned size, unsigned style );
185
   void              cmGrPlotObjSetFont(       cmGrPlObjH_t h, unsigned id, unsigned size, unsigned style );
186
 
186
 
187
   void              cmGrPlotObjSetLineColor(  cmGrPlObjH_t h, cmGrPlStateId_t id, const cmGrColor_t c );
187
   void              cmGrPlotObjSetLineColor(  cmGrPlObjH_t h, cmGrPlStateId_t id, const cmGrColor_t c );
188
-  const cmGrColor_t cmGrPlotObjLineColor(     cmGrPlObjH_t h, cmGrPlStateId_t id );
189
-  const cmGrColor_t cmGrPlotObjCurLineColor(  cmGrPlObjH_t h );
188
+  cmGrColor_t       cmGrPlotObjLineColor(     cmGrPlObjH_t h, cmGrPlStateId_t id );
189
+  cmGrColor_t       cmGrPlotObjCurLineColor(  cmGrPlObjH_t h );
190
 
190
 
191
   void              cmGrPlotObjSetFillColor(  cmGrPlObjH_t h, cmGrPlStateId_t id, const cmGrColor_t c );
191
   void              cmGrPlotObjSetFillColor(  cmGrPlObjH_t h, cmGrPlStateId_t id, const cmGrColor_t c );
192
-  const cmGrColor_t cmGrPlotObjFillColor(     cmGrPlObjH_t h, cmGrPlStateId_t id );
193
-  const cmGrColor_t cmGrPlotObjCurFillColor(  cmGrPlObjH_t h );
192
+  cmGrColor_t       cmGrPlotObjFillColor(     cmGrPlObjH_t h, cmGrPlStateId_t id );
193
+  cmGrColor_t       cmGrPlotObjCurFillColor(  cmGrPlObjH_t h );
194
 
194
 
195
   void              cmGrPlotObjSetCb(        cmGrPlObjH_t h, cmGrPlotCbFunc_t func, void* arg );
195
   void              cmGrPlotObjSetCb(        cmGrPlObjH_t h, cmGrPlotCbFunc_t func, void* arg );
196
   cmGrPlotCbFunc_t  cmGrPlotObjCbFunc(       cmGrPlObjH_t h );
196
   cmGrPlotCbFunc_t  cmGrPlotObjCbFunc(       cmGrPlObjH_t h );

Loading…
取消
儲存