cmGrPlot.h/c: Removed superfluous use of const in function returning cmGrColor_t.
This commit is contained in:
parent
2f42661b40
commit
894d39466b
12
cmGrPlot.c
12
cmGrPlot.c
@ -278,7 +278,7 @@ void _cmGrPlotObjSetSelect( cmGrPlotObj_t* op, bool clearFl )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const cmGrColor_t _cmGrPlotColor( cmGrPlotObj_t* op, cmGrColor_t* array )
|
cmGrColor_t _cmGrPlotColor( cmGrPlotObj_t* op, cmGrColor_t* array )
|
||||||
{
|
{
|
||||||
if( _cmGrPlotObjIsFocused(op) )
|
if( _cmGrPlotObjIsFocused(op) )
|
||||||
return array[kFocusPlGrId];
|
return array[kFocusPlGrId];
|
||||||
@ -1017,7 +1017,7 @@ int cmGrPlotObjLabelAngle( cmGrPlObjH_t oh )
|
|||||||
return op->labelAngle;
|
return op->labelAngle;
|
||||||
}
|
}
|
||||||
|
|
||||||
const cmGrColor_t cmGrPlotObjLabelColor( cmGrPlObjH_t oh )
|
cmGrColor_t cmGrPlotObjLabelColor( cmGrPlObjH_t oh )
|
||||||
{
|
{
|
||||||
cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
|
cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
|
||||||
return op->labelColor;
|
return op->labelColor;
|
||||||
@ -1175,14 +1175,14 @@ void cmGrPlotObjSetLineColor( cmGrPlObjH_t oh, cmGrPlStateId_t id, c
|
|||||||
op->drawColors[ id ] = c;
|
op->drawColors[ id ] = c;
|
||||||
}
|
}
|
||||||
|
|
||||||
const cmGrColor_t cmGrPlotObjLineColor( cmGrPlObjH_t oh, cmGrPlStateId_t id )
|
cmGrColor_t cmGrPlotObjLineColor( cmGrPlObjH_t oh, cmGrPlStateId_t id )
|
||||||
{
|
{
|
||||||
cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
|
cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
|
||||||
assert( id < kMaxPlGrId );
|
assert( id < kMaxPlGrId );
|
||||||
return op->drawColors[id];
|
return op->drawColors[id];
|
||||||
}
|
}
|
||||||
|
|
||||||
const cmGrColor_t cmGrPlotObjCurLineColor( cmGrPlObjH_t h )
|
cmGrColor_t cmGrPlotObjCurLineColor( cmGrPlObjH_t h )
|
||||||
{
|
{
|
||||||
cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(h);
|
cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(h);
|
||||||
return _cmGrPlotColor(op,op->drawColors);
|
return _cmGrPlotColor(op,op->drawColors);
|
||||||
@ -1195,14 +1195,14 @@ void cmGrPlotObjSetFillColor( cmGrPlObjH_t oh, cmGrPlStateId_t id, c
|
|||||||
op->fillColors[ id ] = c;
|
op->fillColors[ id ] = c;
|
||||||
}
|
}
|
||||||
|
|
||||||
const cmGrColor_t cmGrPlotObjFillColor( cmGrPlObjH_t oh, cmGrPlStateId_t id )
|
cmGrColor_t cmGrPlotObjFillColor( cmGrPlObjH_t oh, cmGrPlStateId_t id )
|
||||||
{
|
{
|
||||||
cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
|
cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(oh);
|
||||||
assert( id < kMaxPlGrId );
|
assert( id < kMaxPlGrId );
|
||||||
return op->fillColors[id];
|
return op->fillColors[id];
|
||||||
}
|
}
|
||||||
|
|
||||||
const cmGrColor_t cmGrPlotObjCurFillColor( cmGrPlObjH_t h )
|
cmGrColor_t cmGrPlotObjCurFillColor( cmGrPlObjH_t h )
|
||||||
{
|
{
|
||||||
cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(h);
|
cmGrPlotObj_t* op = _cmGrPlObjHandleToPtr(h);
|
||||||
return _cmGrPlotColor(op,op->fillColors);
|
return _cmGrPlotColor(op,op->fillColors);
|
||||||
|
10
cmGrPlot.h
10
cmGrPlot.h
@ -160,7 +160,7 @@ extern "C" {
|
|||||||
void cmGrPlotObjSetLabelAttr( cmGrPlObjH_t oh, unsigned flags, int angle, const cmGrColor_t color );
|
void cmGrPlotObjSetLabelAttr( cmGrPlObjH_t oh, unsigned flags, int angle, const cmGrColor_t color );
|
||||||
unsigned cmGrPlotObjLabelFlags( cmGrPlObjH_t oh );
|
unsigned cmGrPlotObjLabelFlags( cmGrPlObjH_t oh );
|
||||||
int cmGrPlotObjLabelAngle( cmGrPlObjH_t oh );
|
int cmGrPlotObjLabelAngle( cmGrPlObjH_t oh );
|
||||||
const cmGrColor_t cmGrPlotObjLabelColor( cmGrPlObjH_t oh );
|
cmGrColor_t cmGrPlotObjLabelColor( cmGrPlObjH_t oh );
|
||||||
|
|
||||||
|
|
||||||
void cmGrPlotObjSetStateFlags( cmGrPlObjH_t oh, unsigned flags );
|
void cmGrPlotObjSetStateFlags( cmGrPlObjH_t oh, unsigned flags );
|
||||||
@ -185,12 +185,12 @@ extern "C" {
|
|||||||
void cmGrPlotObjSetFont( cmGrPlObjH_t h, unsigned id, unsigned size, unsigned style );
|
void cmGrPlotObjSetFont( cmGrPlObjH_t h, unsigned id, unsigned size, unsigned style );
|
||||||
|
|
||||||
void cmGrPlotObjSetLineColor( cmGrPlObjH_t h, cmGrPlStateId_t id, const cmGrColor_t c );
|
void cmGrPlotObjSetLineColor( cmGrPlObjH_t h, cmGrPlStateId_t id, const cmGrColor_t c );
|
||||||
const cmGrColor_t cmGrPlotObjLineColor( cmGrPlObjH_t h, cmGrPlStateId_t id );
|
cmGrColor_t cmGrPlotObjLineColor( cmGrPlObjH_t h, cmGrPlStateId_t id );
|
||||||
const cmGrColor_t cmGrPlotObjCurLineColor( cmGrPlObjH_t h );
|
cmGrColor_t cmGrPlotObjCurLineColor( cmGrPlObjH_t h );
|
||||||
|
|
||||||
void cmGrPlotObjSetFillColor( cmGrPlObjH_t h, cmGrPlStateId_t id, const cmGrColor_t c );
|
void cmGrPlotObjSetFillColor( cmGrPlObjH_t h, cmGrPlStateId_t id, const cmGrColor_t c );
|
||||||
const cmGrColor_t cmGrPlotObjFillColor( cmGrPlObjH_t h, cmGrPlStateId_t id );
|
cmGrColor_t cmGrPlotObjFillColor( cmGrPlObjH_t h, cmGrPlStateId_t id );
|
||||||
const cmGrColor_t cmGrPlotObjCurFillColor( cmGrPlObjH_t h );
|
cmGrColor_t cmGrPlotObjCurFillColor( cmGrPlObjH_t h );
|
||||||
|
|
||||||
void cmGrPlotObjSetCb( cmGrPlObjH_t h, cmGrPlotCbFunc_t func, void* arg );
|
void cmGrPlotObjSetCb( cmGrPlObjH_t h, cmGrPlotCbFunc_t func, void* arg );
|
||||||
cmGrPlotCbFunc_t cmGrPlotObjCbFunc( cmGrPlObjH_t h );
|
cmGrPlotCbFunc_t cmGrPlotObjCbFunc( cmGrPlObjH_t h );
|
||||||
|
Loading…
Reference in New Issue
Block a user