diff options
Diffstat (limited to 'libkdchart')
| -rw-r--r-- | libkdchart/KDChartCustomBox.h | 14 | ||||
| -rw-r--r-- | libkdchart/KDChartEnums.h | 2 | ||||
| -rw-r--r-- | libkdchart/KDChartPainter.cpp | 18 | ||||
| -rw-r--r-- | libkdchart/KDChartParams.cpp | 2 | ||||
| -rw-r--r-- | libkdchart/KDChartParams_io.cpp | 4 |
5 files changed, 20 insertions, 20 deletions
diff --git a/libkdchart/KDChartCustomBox.h b/libkdchart/KDChartCustomBox.h index e57110a..17b4782 100644 --- a/libkdchart/KDChartCustomBox.h +++ b/libkdchart/KDChartCustomBox.h @@ -216,7 +216,7 @@ public: uint data3rd = 0, uint deltaAlign = KDCHART_AlignAuto, bool deltaScaleGlobal = true, - int tqparentAxis = -1 ) + int parentAxis = -1 ) : _rotation( 0 ), _fontSize( fontSize ), _fontScaleGlobal( fontScaleGlobal ), @@ -235,7 +235,7 @@ public: _deltaAlign( deltaAlign ), _deltaScaleGlobal( deltaScaleGlobal ), _anchorBeingCalculated( false ), - _parentAxisArea( tqparentAxis ) + _parentAxisArea( parentAxis ) { _content.deepCopy( &content ); } @@ -338,7 +338,7 @@ public: uint data3rd = 0, uint deltaAlign = KDCHART_AlignAuto, bool deltaScaleGlobal = true, - int tqparentAxis = -1 ) + int parentAxis = -1 ) : _rotation( rotation ), _fontSize( fontSize ), _fontScaleGlobal( fontScaleGlobal ), @@ -357,7 +357,7 @@ public: _deltaAlign( deltaAlign ), _deltaScaleGlobal( deltaScaleGlobal ), _anchorBeingCalculated( false ), - _parentAxisArea( tqparentAxis ) + _parentAxisArea( parentAxis ) { _content.deepCopy( &content ); } @@ -974,13 +974,13 @@ protected: return _anchorBeingCalculated; } - void setParentAxisArea( int tqparentAxis ) const + void setParentAxisArea( int parentAxis ) const { KDChartCustomBox* that = const_cast<KDChartCustomBox*>(this); - that->_parentAxisArea = tqparentAxis; + that->_parentAxisArea = parentAxis; } - int tqparentAxisArea() const + int parentAxisArea() const { return _parentAxisArea; } diff --git a/libkdchart/KDChartEnums.h b/libkdchart/KDChartEnums.h index c506b39..82956e8 100644 --- a/libkdchart/KDChartEnums.h +++ b/libkdchart/KDChartEnums.h @@ -77,7 +77,7 @@ public: \param type the text tqlayout policy to convert \return the string representation of the text tqlayout policy enum */ - static TQString tqlayoutPolicyToString( TextLayoutPolicy type ) { + static TQString layoutPolicyToString( TextLayoutPolicy type ) { switch( type ) { case LayoutJustOverwrite: return "JustOverwrite"; diff --git a/libkdchart/KDChartPainter.cpp b/libkdchart/KDChartPainter.cpp index f68b8ff..987857a 100644 --- a/libkdchart/KDChartPainter.cpp +++ b/libkdchart/KDChartPainter.cpp @@ -1140,13 +1140,13 @@ TQRect KDChartPainter::calculateAreaRect( bool & allCustomBoxes, break; default: { - uint tqmaskBASE = KDChartEnums::AreaBASEMask & area; - pos = area - tqmaskBASE; - if ( KDChartEnums::AreaAxisBASE == tqmaskBASE ) { + uint maskBASE = KDChartEnums::AreaBASEMask & area; + pos = area - maskBASE; + if ( KDChartEnums::AreaAxisBASE == maskBASE ) { rect = params()->axisParams( pos ).axisTrueAreaRect(); - } else if ( KDChartEnums::AreaHdFtBASE == tqmaskBASE ) { + } else if ( KDChartEnums::AreaHdFtBASE == maskBASE ) { rect = params()->headerFooterRect( pos ); - } else if ( KDChartEnums::AreaCustomBoxesBASE == tqmaskBASE ) { + } else if ( KDChartEnums::AreaCustomBoxesBASE == maskBASE ) { const KDChartCustomBox * box = params()->customBox( pos ); if( box ) { rect = box->trueRect( calculateAnchor( *box, regions ), @@ -2011,10 +2011,10 @@ void KDChartPainter::calculateAllAxesRects( for( idx = 0; idx <= params()->maxCustomBoxIdx(); ++idx ) { const KDChartCustomBox * box = params()->customBox( idx ); if ( box ) - if ( box->tqparentAxisArea() == KDChartAxisParams::AxisPosBottom - || box->tqparentAxisArea() == KDChartAxisParams::AxisPosLeft - || box->tqparentAxisArea() == KDChartAxisParams::AxisPosTop - || box->tqparentAxisArea() == KDChartAxisParams::AxisPosRight ) + if ( box->parentAxisArea() == KDChartAxisParams::AxisPosBottom + || box->parentAxisArea() == KDChartAxisParams::AxisPosLeft + || box->parentAxisArea() == KDChartAxisParams::AxisPosTop + || box->parentAxisArea() == KDChartAxisParams::AxisPosRight ) boxSize = box->trueRect(TQPoint( 0,0 ), _areaWidthP1000, _areaHeightP1000 ).height(); } diff --git a/libkdchart/KDChartParams.cpp b/libkdchart/KDChartParams.cpp index 4c7bd87..7306cfe 100644 --- a/libkdchart/KDChartParams.cpp +++ b/libkdchart/KDChartParams.cpp @@ -1041,7 +1041,7 @@ calculation of appropriate rotation for each data value. Rotation will be performed around the internal <b>tqalignment point</b> of the text -- specified by \c negativeAlign (or \c positiveAlign, resp.). -\param tqlayoutPolicy The way to handle too narrow space conflicts: +\param layoutPolicy The way to handle too narrow space conflicts: what to do if a data text covers a neighboring data text (or a neighboring data area, resp.). diff --git a/libkdchart/KDChartParams_io.cpp b/libkdchart/KDChartParams_io.cpp index 0006451..3a3d637 100644 --- a/libkdchart/KDChartParams_io.cpp +++ b/libkdchart/KDChartParams_io.cpp @@ -923,7 +923,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const KDXML::createStringNode( doc, dataValuesSettings1Element, "LayoutPolicy", - KDChartEnums::tqlayoutPolicyToString( _printDataValuesSettings._dataValuesLayoutPolicy ) ); + KDChartEnums::layoutPolicyToString( _printDataValuesSettings._dataValuesLayoutPolicy ) ); KDXML::createBoolNode( doc, dataValuesSettings1Element, "ShowInfinite", _printDataValuesSettings._dataValuesShowInfinite ); @@ -983,7 +983,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const KDXML::createStringNode( doc, dataValuesSettings2Element, "LayoutPolicy", - KDChartEnums::tqlayoutPolicyToString( _printDataValuesSettings2._dataValuesLayoutPolicy ) ); + KDChartEnums::layoutPolicyToString( _printDataValuesSettings2._dataValuesLayoutPolicy ) ); KDXML::createBoolNode( doc, dataValuesSettings2Element, "ShowInfinite", _printDataValuesSettings2._dataValuesShowInfinite ); |