summaryrefslogtreecommitdiffstats
path: root/libkdchart
diff options
context:
space:
mode:
Diffstat (limited to 'libkdchart')
-rw-r--r--libkdchart/KDChartAxesPainter.cpp12
-rw-r--r--libkdchart/KDChartAxisParams.cpp16
-rw-r--r--libkdchart/KDChartAxisParams.h12
-rw-r--r--libkdchart/KDChartLinesPainter.cpp2
-rw-r--r--libkdchart/KDChartObjectFactory.cpp4
-rw-r--r--libkdchart/KDChartPainter.cpp4
-rw-r--r--libkdchart/KDChartParams.cpp38
-rw-r--r--libkdchart/KDChartParams.h28
-rw-r--r--libkdchart/KDChartParams_io.cpp10
-rw-r--r--libkdchart/KDChartPropertySet.cpp4
-rw-r--r--libkdchart/KDChartPropertySet.h12
-rw-r--r--libkdchart/KDChartWidget.cpp8
-rw-r--r--libkdchart/KDXMLTools.cpp98
-rw-r--r--libkdchart/KDXMLTools.h12
14 files changed, 130 insertions, 130 deletions
diff --git a/libkdchart/KDChartAxesPainter.cpp b/libkdchart/KDChartAxesPainter.cpp
index 094cfd6..5a169f0 100644
--- a/libkdchart/KDChartAxesPainter.cpp
+++ b/libkdchart/KDChartAxesPainter.cpp
@@ -649,7 +649,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
TQString text;
if( cv.isDateTime ){
TQDateTime dt( TQDateTime::fromString( *it,
- Qt::ISODate ) );
+ TQt::ISODate ) );
text = dt.toString( formatDT );
}else{
text = *it;
@@ -1086,7 +1086,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
if( nLeaveOut ) {
leaveOutGridPen = gridPen;
leaveOutGridPen.setWidth( gridLineWidth / 2 );
- leaveOutGridPen.setStyle( Qt::DotLine );
+ leaveOutGridPen.setStyle( TQt::DotLine );
}
// =========================================================
// || The labels and delimiters and grid printing loops ||
@@ -1645,7 +1645,7 @@ void KDChartAxesPainter::paintAxes( TQPainter* painter,
TQDateTime dt;
if( cv.isDateTime ){
dt = TQDateTime::fromString( *labelIter,
- Qt::ISODate );
+ TQt::ISODate );
label = dt.toString( formatDT );
}else{
label = *labelIter;
@@ -3198,9 +3198,9 @@ void KDChartAxesPainter::calculateLabelTexts(
nLabels = 0;
/*
tqDebug("dtLow: ");
- tqDebug(dtLow.toString( Qt::ISODate ));
+ tqDebug(dtLow.toString( TQt::ISODate ));
tqDebug("dtHigh: ");
- tqDebug(dtHigh.toString( Qt::ISODate ));
+ tqDebug(dtHigh.toString( TQt::ISODate ));
*/
bool bDone=false;
while( !bDone ) {
@@ -3231,7 +3231,7 @@ void KDChartAxesPainter::calculateLabelTexts(
if( autoDtLabels )
labelTexts.append( "x" );
else
- labelTexts.append( dt.toString( Qt::ISODate ) );
+ labelTexts.append( dt.toString( TQt::ISODate ) );
bDone = (goDown ? (dt < dtLow ) : (dt > dtHigh));
/*if( bDone ){
dtHigh = dt;
diff --git a/libkdchart/KDChartAxisParams.cpp b/libkdchart/KDChartAxisParams.cpp
index a278307..5a7d205 100644
--- a/libkdchart/KDChartAxisParams.cpp
+++ b/libkdchart/KDChartAxisParams.cpp
@@ -163,12 +163,12 @@ KDChartAxisParams::KDChartAxisParams()
_axisShowGrid = false;
_axisGridColor = KDCHART_DEFAULT_AXIS_GRID_COLOR;
_axisGridLineWidth = KDCHART_AXIS_GRID_AUTO_LINEWIDTH;
- _axisGridStyle = Qt::SolidLine;
+ _axisGridStyle = TQt::SolidLine;
_axisShowSubDelimiters = true;
_axisGridSubColor = KDCHART_DEFAULT_AXIS_GRID_COLOR;
_axisGridSubLineWidth = KDCHART_AXIS_GRID_AUTO_LINEWIDTH;
- _axisGridSubStyle = Qt::DotLine;
+ _axisGridSubStyle = TQt::DotLine;
_axisZeroLineColor = TQColor( 0x00, 0x00, 0x80 );
@@ -1156,14 +1156,14 @@ void KDChartAxisParams::setAxisGridSubLineWidth( int axisGridSubLineWidth )
\param axisGridStyle the axis grid line pattern.
\sa axisGridStyle, setAxisShowGrid
*/
-void KDChartAxisParams::setAxisGridStyle( Qt::PenStyle axisGridStyle )
+void KDChartAxisParams::setAxisGridStyle( TQt::PenStyle axisGridStyle )
{
_axisGridStyle = axisGridStyle;
emit changed();
}
/**
- \fn Qt::PenStyle KDChartAxisParams::axisGridStyle() const
+ \fn TQt::PenStyle KDChartAxisParams::axisGridStyle() const
Returns the axis grid line pattern.
\return the axis grid line pattern.
@@ -1180,14 +1180,14 @@ void KDChartAxisParams::setAxisGridStyle( Qt::PenStyle axisGridStyle )
\sa axisGridSubStyle, setAxisGridStyle, axisGridStyle
\sa setAxisShowGrid
*/
-void KDChartAxisParams::setAxisGridSubStyle( Qt::PenStyle axisGridSubStyle )
+void KDChartAxisParams::setAxisGridSubStyle( TQt::PenStyle axisGridSubStyle )
{
_axisGridSubStyle = axisGridSubStyle;
emit changed();
}
/**
- \fn Qt::PenStyle KDChartAxisParams::axisGridSubStyle() const
+ \fn TQt::PenStyle KDChartAxisParams::axisGridSubStyle() const
Returns the axis grid line pattern for the thin lines
showing the sub-delimiter values.
@@ -3092,14 +3092,14 @@ KDChartAxisParams::AxisType KDChartAxisParams::stringToAxisType( const TQString&
*/
/**
- \var Qt::PenStyle _axisGridStyle
+ \var TQt::PenStyle _axisGridStyle
Specifies the axis grid line pattern for main grid lines.
\sa setAxisGridStyle, setAxisShowGrid
*/
/**
- \var Qt::PenStyle _axisGridSubStyle
+ \var TQt::PenStyle _axisGridSubStyle
Specifies the axis grid line pattern for sub-delimiter grid lines.
\sa setAxisGridSubStyle, setAxisGridStyle, setAxisShowGrid
diff --git a/libkdchart/KDChartAxisParams.h b/libkdchart/KDChartAxisParams.h
index 2ccd8ea..2e5e4ba 100644
--- a/libkdchart/KDChartAxisParams.h
+++ b/libkdchart/KDChartAxisParams.h
@@ -246,8 +246,8 @@ public slots:
bool axisShowFractionalValuesDelimiters() const { return _axisShowFractionalValuesDelimiters; }
void setAxisShowGrid( bool axisShowGrid );
bool axisShowGrid() const { return _axisShowGrid; }
- void setAxisGridStyle( Qt::PenStyle axisGridStyle );
- Qt::PenStyle axisGridStyle() const { return _axisGridStyle; }
+ void setAxisGridStyle( TQt::PenStyle axisGridStyle );
+ TQt::PenStyle axisGridStyle() const { return _axisGridStyle; }
void setAxisGridColor( TQColor axisGridColor );
TQColor axisGridColor() const { return _axisGridColor; }
void setAxisGridLineWidth( int axisGridLineWidth );
@@ -255,8 +255,8 @@ public slots:
// sub grid:
void setAxisShowSubDelimiters( bool axisShowSubDelimiters );
bool axisShowSubDelimiters() const { return _axisShowSubDelimiters; }
- void setAxisGridSubStyle( Qt::PenStyle axisGridSubStyle );
- Qt::PenStyle axisGridSubStyle() const { return _axisGridSubStyle; }
+ void setAxisGridSubStyle( TQt::PenStyle axisGridSubStyle );
+ TQt::PenStyle axisGridSubStyle() const { return _axisGridSubStyle; }
void setAxisGridSubColor( TQColor axisGridSubColor );
TQColor axisGridSubColor() const { return _axisGridSubColor; }
void setAxisGridSubLineWidth( int axisGridSubLineWidth );
@@ -451,12 +451,12 @@ private:
bool _axisShowGrid;
TQColor _axisGridColor;
int _axisGridLineWidth;
- Qt::PenStyle _axisGridStyle;
+ TQt::PenStyle _axisGridStyle;
bool _axisShowSubDelimiters;
TQColor _axisGridSubColor;
int _axisGridSubLineWidth;
- Qt::PenStyle _axisGridSubStyle;
+ TQt::PenStyle _axisGridSubStyle;
TQColor _axisZeroLineColor;
bool _axisLabelsVisible;
diff --git a/libkdchart/KDChartLinesPainter.cpp b/libkdchart/KDChartLinesPainter.cpp
index fbf5f0f..7ec51bb 100644
--- a/libkdchart/KDChartLinesPainter.cpp
+++ b/libkdchart/KDChartLinesPainter.cpp
@@ -800,7 +800,7 @@ void KDChartLinesPainter::specificPaintData( TQPainter* painter,
// preset with default values
int theLineWidth = default2DPen.width();
TQColor theLineColor = default2DPen.color();
- Qt::PenStyle theLineStyle = default2DPen.style();
+ TQt::PenStyle theLineStyle = default2DPen.style();
if( curPropSetId != KDChartPropertySet::UndefinedID ){
// we can safely call the following functions and ignore their
// return values since they will touch the parameters' values
diff --git a/libkdchart/KDChartObjectFactory.cpp b/libkdchart/KDChartObjectFactory.cpp
index 4ed2172..590e379 100644
--- a/libkdchart/KDChartObjectFactory.cpp
+++ b/libkdchart/KDChartObjectFactory.cpp
@@ -331,7 +331,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
if ( !getNumber( args, 7,&i, "KDChartPropertySet" ) ) return 0;
- Qt::PenStyle lineStyle = (Qt::PenStyle) i;
+ TQt::PenStyle lineStyle = (TQt::PenStyle) i;
int idShowMarker;
if ( !getNumber( args, 8,&idShowMarker, "KDChartPropertySet" ) ) return 0;
@@ -373,7 +373,7 @@ TQObject* KDChartObjectFactory::createKDChartPropertySet(const TQSArgumentList&
if ( !getNumber( args, 20,&idExtraLinesStyle, "KDChartPropertySet" ) ) return 0;
if ( !getNumber( args, 21,&i, "KDChartPropertySet" ) ) return 0;
- Qt::PenStyle extraLinesStyle = (Qt::PenStyle) i;
+ TQt::PenStyle extraLinesStyle = (TQt::PenStyle) i;
int idExtraMarkersAlign;
if ( !getNumber( args, 22,&idExtraMarkersAlign, "KDChartPropertySet" ) ) return 0;
diff --git a/libkdchart/KDChartPainter.cpp b/libkdchart/KDChartPainter.cpp
index a4465ff..38e6ca4 100644
--- a/libkdchart/KDChartPainter.cpp
+++ b/libkdchart/KDChartPainter.cpp
@@ -1341,7 +1341,7 @@ void KDChartPainter::calculateHorizontalLegendSize( TQPainter* painter,
bool KDChartPainter::mustDrawVerticalLegend() const
{
return
- params()->legendOrientation() == Qt::Vertical ||
+ params()->legendOrientation() == TQt::Vertical ||
params()->legendPosition() == KDChartParams::LegendLeft ||
params()->legendPosition() == KDChartParams::LegendRight ||
params()->legendPosition() == KDChartParams::LegendTopLeft ||
@@ -2870,7 +2870,7 @@ void KDChartPainter::drawExtraLinesAndMarkers(
int extraLinesLength = -20;
int extraLinesWidth = defaultPen.width();
TQColor extraLinesColor = defaultPen.color();
- Qt::PenStyle extraLinesStyle = defaultPen.style();
+ TQt::PenStyle extraLinesStyle = defaultPen.style();
uint extraMarkersAlign = 0;
propSet.hasOwnExtraLinesLength( iDummy, extraLinesLength );
propSet.hasOwnExtraLinesWidth( iDummy, extraLinesWidth );
diff --git a/libkdchart/KDChartParams.cpp b/libkdchart/KDChartParams.cpp
index 2d0851f..53ee927 100644
--- a/libkdchart/KDChartParams.cpp
+++ b/libkdchart/KDChartParams.cpp
@@ -144,7 +144,7 @@ KDChartParams::KDChartParams()
setShadowBrightnessFactor( 1.0 );
// The default shadow fill style.
- setShadowPattern( Qt::SolidPattern );
+ setShadowPattern( TQt::SolidPattern );
// Some default colors for the data.
setDataDefaultColors();
@@ -156,7 +156,7 @@ KDChartParams::KDChartParams()
setOutlineDataLineWidth( 1 );
// Default line style for data display outlines.
- setOutlineDataLineStyle( Qt::SolidLine );
+ setOutlineDataLineStyle( TQt::SolidLine );
// END GENERAL
@@ -215,7 +215,7 @@ KDChartParams::KDChartParams()
setLineWidth( 1 );
// Lines are solid by default
- setLineStyle( Qt::SolidLine );
+ setLineStyle( TQt::SolidLine );
// Lines have the same color as their
// respective data points by default
@@ -338,8 +338,8 @@ KDChartParams::KDChartParams()
setLegendSpacing( 20 );
// Position of the legend
setLegendPosition( LegendRight );
- // Qt::Orientation of the legend
- setLegendOrientation( Qt::Vertical );
+ // Orientation of the legend
+ setLegendOrientation( TQt::Vertical );
// Whether the legend shall show lines or just
// show the markers (or squares, resp.)
setLegendShowLines( false );
@@ -432,7 +432,7 @@ KDChartParams::KDChartParams()
setProperties(KDCHART_PROPSET_NORMAL_DATA, *tempPropSetA);
// don't show the line, don't show the marker
tempPropSetA->setName("transparent data");
- tempPropSetA->setLineStyle( KDChartPropertySet::OwnID, Qt::NoPen );
+ tempPropSetA->setLineStyle( KDChartPropertySet::OwnID, TQt::NoPen );
tempPropSetA->setShowMarker( KDChartPropertySet::OwnID, false );
setProperties(KDCHART_PROPSET_TRANSPARENT_DATA, *tempPropSetA);
// don't show line nor marker, but do show the horizontal line
@@ -635,7 +635,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
if( bOk ){
int lineWidth;
TQColor lineColor;
- Qt::PenStyle lineStyle;
+ TQt::PenStyle lineStyle;
bool showMarker;
uint markerAlign;
TQSize markerSize;
@@ -646,7 +646,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
int extraLinesLength;
int extraLinesWidth;
TQColor extraLinesColor;
- Qt::PenStyle extraLinesStyle;
+ TQt::PenStyle extraLinesStyle;
uint extraMarkersAlign;
TQSize extraMarkersSize;
TQColor extraMarkersColor;
@@ -1301,7 +1301,7 @@ void KDChartParams::setPrintDataValues( bool active,
else
settings->_dataValuesColor = *color;
}
- settings->_dataValuesBrush = TQBrush(Qt::NoBrush);
+ settings->_dataValuesBrush = TQBrush(TQt::NoBrush);
// for values below zero:
settings->_dataValuesAnchorNegativePosition = negativePosition;
settings->_dataValuesAnchorNegativeAlign = negativeAlign;
@@ -3092,7 +3092,7 @@ void KDChartParams::setAdditionalChartType( ChartType chartType )
/**
- \fn void KDChartParams::setShadowPattern( Qt::BrushStyle style )
+ \fn void KDChartParams::setShadowPattern( TQt::BrushStyle style )
Specifies a filling style for filling the shadow areas in
3-dimensional drawings like 3D bar charts. The default is to
@@ -3106,7 +3106,7 @@ void KDChartParams::setAdditionalChartType( ChartType chartType )
/**
- \fn Qt::BrushStyle KDChartParams::shadowPattern() const
+ \fn TQt::BrushStyle KDChartParams::shadowPattern() const
Returns the filling style used for filling the shadow areas in
3-dimensional drawings like 3D bar charts. The default is to
@@ -4862,7 +4862,7 @@ void KDChartParams::setLineMarkerStyles( LineMarkerStyleMap map ) {
\sa lineStyle, setLineWidth, setLineColor
\sa setLineMarker, setLineMarkerSize, setLineMarkerStyle
*/
-void KDChartParams::setLineStyle( Qt::PenStyle style, uint dataset )
+void KDChartParams::setLineStyle( TQt::PenStyle style, uint dataset )
{
if( KDCHART_GLOBAL_LINE_STYLE == dataset )
_lineStyle = style;
@@ -4885,7 +4885,7 @@ void KDChartParams::setLineStyle( Qt::PenStyle style, uint dataset )
\return the line style for the specified data set
\sa setLineStyle, setLineMarkerStyle
*/
-Qt::PenStyle KDChartParams::lineStyle( uint dataset ) const
+TQt::PenStyle KDChartParams::lineStyle( uint dataset ) const
{
if( KDCHART_GLOBAL_LINE_STYLE == dataset )
// global line style
@@ -6668,10 +6668,10 @@ void KDChartParams::setBWChartPrintStatistics( BWStatVal statValue,
/**
- \fn void KDChartParams::setLegendOrientation( Qt::Orientation orientation )
+ \fn void KDChartParams::setLegendOrientation( TQt::Orientation orientation )
- Specifies how the legend should be printed. Qt::Vertical (the default)
- prints the legend entries below each other, Qt::Horizontal prints them
+ Specifies how the legend should be printed. TQt::Vertical (the default)
+ prints the legend entries below each other, TQt::Horizontal prints them
aside each other.
\note Horizontal orientation is only possible if the chart is NOT making
@@ -6686,7 +6686,7 @@ void KDChartParams::setBWChartPrintStatistics( BWStatVal statValue,
/**
- \fn Qt::Orientation KDChartParams::legendOrientation() const
+ \fn TQt::Orientation KDChartParams::legendOrientation() const
Returns how the legend will be printed.
@@ -8428,7 +8428,7 @@ int KDChartParams::headerFooterFontRelSize( uint pos ) const
/**
- \var Qt::BrushStyle KDChartParams::_shadowPattern;
+ \var TQt::BrushStyle KDChartParams::_shadowPattern;
Stores a fill style to be used for filling shadow area in
3-dimensional drawings like e.g. 3D bar charts.
@@ -9238,7 +9238,7 @@ void KDChartParams::insertDefaultAxisTitleBox( uint n,
0, 0,
0, 0,
setColor ? axisTitleColor : TQt::darkBlue,
- Qt::NoBrush,
+ TQt::NoBrush,
KDChartEnums::AreaAxisBASE + n,
bVert ? KDChartEnums::PosCenterLeft : KDChartEnums::PosBottomCenter, bVert ? (TQt::AlignTop + TQt::AlignHCenter) : (TQt::AlignBottom + TQt::AlignHCenter),
0,0,0,
diff --git a/libkdchart/KDChartParams.h b/libkdchart/KDChartParams.h
index c5a3ebe..0994e19 100644
--- a/libkdchart/KDChartParams.h
+++ b/libkdchart/KDChartParams.h
@@ -633,12 +633,12 @@ public slots:
}
- void setShadowPattern( Qt::BrushStyle style ) {
+ void setShadowPattern( TQt::BrushStyle style ) {
_shadowPattern = style;
emit changed();
}
- Qt::BrushStyle shadowPattern() const {
+ TQt::BrushStyle shadowPattern() const {
return _shadowPattern;
}
@@ -668,13 +668,13 @@ public slots:
}
- void setOutlineDataLineStyle( Qt::PenStyle style )
+ void setOutlineDataLineStyle( TQt::PenStyle style )
{
_outlineDataLineStyle = style;
emit changed();
}
- Qt::PenStyle outlineDataLineStyle() const
+ TQt::PenStyle outlineDataLineStyle() const
{
return _outlineDataLineStyle;
}
@@ -749,7 +749,7 @@ public slots:
uint chart = KDCHART_ALL_CHARTS );
void setDataValuesColors( const TQColor* color = KDCHART_DATA_VALUE_AUTO_COLOR,
- const TQBrush& background = TQBrush(Qt::NoBrush),
+ const TQBrush& background = TQBrush(TQt::NoBrush),
uint chart = KDCHART_ALL_CHARTS );
// Note if you change the parameters here, then you must also change them in wrappers/KDChartParametersWrapper.h
@@ -1150,9 +1150,9 @@ public slots:
return _lineColor;
}
- void setLineStyle( Qt::PenStyle style, uint dataset=KDCHART_GLOBAL_LINE_STYLE );
+ void setLineStyle( TQt::PenStyle style, uint dataset=KDCHART_GLOBAL_LINE_STYLE );
- Qt::PenStyle lineStyle( uint dataset=KDCHART_GLOBAL_LINE_STYLE ) const;
+ TQt::PenStyle lineStyle( uint dataset=KDCHART_GLOBAL_LINE_STYLE ) const;
void setThreeDLines( bool threeD ) {
@@ -1866,13 +1866,13 @@ public slots:
return _legendPosition;
}
- void setLegendOrientation( Qt::Orientation orientation )
+ void setLegendOrientation( TQt::Orientation orientation )
{
_legendOrientation = orientation;
emit changed();
}
- Qt::Orientation legendOrientation() const
+ TQt::Orientation legendOrientation() const
{
return _legendOrientation;
}
@@ -2543,14 +2543,14 @@ private:
uint _maxDatasetSourceMode;
KDChartPropertySetList _propertySetList;
double _shadowBrightnessFactor;
- Qt::BrushStyle _shadowPattern;
+ TQt::BrushStyle _shadowPattern;
bool _threeDShadowColors;
uint _maxDatasetColor;
TQMap < uint, TQColor > _dataColorsShadow1;
TQMap < uint, TQColor > _dataColorsShadow2;
TQColor _outlineDataColor;
uint _outlineDataLineWidth;
- Qt::PenStyle _outlineDataLineStyle;
+ TQt::PenStyle _outlineDataLineStyle;
struct PrintDataValuesSettings {
@@ -2612,8 +2612,8 @@ private:
TQSize _lineMarkerSize;
TQColor _lineColor;
int _lineWidth;
- Qt::PenStyle _lineStyle;
- typedef TQMap<uint, Qt::PenStyle> LineStyleMap;
+ TQt::PenStyle _lineStyle;
+ typedef TQMap<uint, TQt::PenStyle> LineStyleMap;
LineStyleMap _datasetLineStyles;
AreaChartSubType _areaChartSubType;
AreaLocation _areaLocation;
@@ -2700,7 +2700,7 @@ private:
// LEGENDS
LegendPosition _legendPosition;
- Qt::Orientation _legendOrientation;
+ TQt::Orientation _legendOrientation;
bool _legendShowLines;
LegendSource _legendSource;
TQMap < int, TQString > _legendText;
diff --git a/libkdchart/KDChartParams_io.cpp b/libkdchart/KDChartParams_io.cpp
index 7bc365f..3b2ff57 100644
--- a/libkdchart/KDChartParams_io.cpp
+++ b/libkdchart/KDChartParams_io.cpp
@@ -545,7 +545,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const
KDXML::penStyleToString( _lineStyle ) );
// the DatasetLineStyles elements
- {for( TQMap<uint, Qt::PenStyle>::ConstIterator it = _datasetLineStyles.begin();
+ {for( TQMap<uint, TQt::PenStyle>::ConstIterator it = _datasetLineStyles.begin();
it != _datasetLineStyles.end(); ++it ) {
TQDomElement lineStyleElement = doc.createElement( "DatasetLineStyle" );
lineSettingsElement.appendChild( lineStyleElement );
@@ -789,7 +789,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const
KDXML::createStringNode( doc, legendSettingsElement, "Position",
KDChartParams::legendPositionToString( _legendPosition ) );
- // the Qt::Orientation element
+ // the Orientation element
KDXML::createOrientationNode( doc, legendSettingsElement,
"Orientation", _legendOrientation );
@@ -1577,7 +1577,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
} else if( tagName == "DatasetLineStyle" ) {
bool ok = true;
uint dataset;
- Qt::PenStyle style = Qt::SolidLine;
+ TQt::PenStyle style = TQt::SolidLine;
if( element.hasAttribute( "Dataset" ) &&
element.hasAttribute( "Style" ) ) {
dataset = element.attribute( "Dataset" ).toUInt( &ok );
@@ -1885,7 +1885,7 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
if( KDXML::readStringNode( element, string ) )
_legendPosition = KDChartParams::stringToLegendPosition( string );
} else if( tagName == "Orientation" ) {
- Qt::Orientation value=Qt::Vertical;
+ TQt::Orientation value=TQt::Vertical;
if( KDXML::readOrientationNode( element, value ) )
_legendOrientation = value;
} else if( tagName == "ShowLines" ) {
@@ -2316,7 +2316,7 @@ void dataCoordToElementAttr(const TQVariant& val, TQDomElement& element, const T
element.setAttribute( "StringValue"+postfix, val.toString() );
else if( TQVariant::DateTime == val.type() )
element.setAttribute( "DateTimeValue"+postfix,
- val.toDateTime().toString( Qt::ISODate ) );
+ val.toDateTime().toString( TQt::ISODate ) );
else
element.setAttribute( "NoValue"+postfix, "true" );
}
diff --git a/libkdchart/KDChartPropertySet.cpp b/libkdchart/KDChartPropertySet.cpp
index 7b699c2..e0ae762 100644
--- a/libkdchart/KDChartPropertySet.cpp
+++ b/libkdchart/KDChartPropertySet.cpp
@@ -122,7 +122,7 @@ void KDChartPropertySet::fillValueMembersWithDummyValues()
// fill with dummy values to avoid problems when saving us into a stream
mLineWidth = 1;
mLineColor = TQt::black;
- mLineStyle = Qt::SolidLine;
+ mLineStyle = TQt::SolidLine;
mShowMarker = true;
mMarkerAlign = TQt::AlignCenter;
mMarkerSize = TQSize(6,6);
@@ -133,7 +133,7 @@ void KDChartPropertySet::fillValueMembersWithDummyValues()
mExtraLinesLength = -20;
mExtraLinesWidth = 1;
mExtraLinesColor = TQt::black;
- mExtraLinesStyle = Qt::SolidLine;
+ mExtraLinesStyle = TQt::SolidLine;
mExtraMarkersAlign = TQt::AlignLeft|TQt::AlignTop;
mExtraMarkersSize = TQSize(6,6);
mExtraMarkersColor = TQt::black;
diff --git a/libkdchart/KDChartPropertySet.h b/libkdchart/KDChartPropertySet.h
index 28a21c2..63c9d7f 100644
--- a/libkdchart/KDChartPropertySet.h
+++ b/libkdchart/KDChartPropertySet.h
@@ -521,7 +521,7 @@ public slots:
\sa setLineWidth, setLineColor, setShowMarker
\sa hasOwnLineWidth, hasOwnLineColor, hasOwnLineStyle, hasOwnShowMarker
*/
- void setLineStyle( int idLineStyle, const Qt::PenStyle& lineStyle )
+ void setLineStyle( int idLineStyle, const TQt::PenStyle& lineStyle )
{
mIdLineStyle = idLineStyle;
mLineStyle = lineStyle;
@@ -559,7 +559,7 @@ public slots:
\sa setLineWidth, setLineColor, setLineStyle, setShowMarker
\sa hasOwnLineWidth, hasOwnLineColor, hasOwnShowMarker
*/
- bool hasOwnLineStyle( int& idLineStyle, Qt::PenStyle& lineStyle )
+ bool hasOwnLineStyle( int& idLineStyle, TQt::PenStyle& lineStyle )
{
idLineStyle = mIdLineStyle;
if( OwnID == mIdLineStyle ){
@@ -877,12 +877,12 @@ public slots:
}
return false;
}
- void setExtraLinesStyle( int idExtraLinesStyle, const Qt::PenStyle extraLinesStyle )
+ void setExtraLinesStyle( int idExtraLinesStyle, const TQt::PenStyle extraLinesStyle )
{
mIdExtraLinesStyle = idExtraLinesStyle;
mExtraLinesStyle = extraLinesStyle;
}
- bool hasOwnExtraLinesStyle( int& idExtraLinesStyle, Qt::PenStyle& extraLinesStyle )
+ bool hasOwnExtraLinesStyle( int& idExtraLinesStyle, TQt::PenStyle& extraLinesStyle )
{
idExtraLinesStyle = mIdExtraLinesStyle;
if( OwnID == idExtraLinesStyle ){
@@ -961,7 +961,7 @@ private:
// IDs: values used if ID == OwnID:
int mIdLineWidth; int mLineWidth;
int mIdLineColor; TQColor mLineColor;
- int mIdLineStyle; Qt::PenStyle mLineStyle;
+ int mIdLineStyle; TQt::PenStyle mLineStyle;
int mIdShowMarker; bool mShowMarker;
int mIdMarkerSize; TQSize mMarkerSize;
int mIdMarkerColor; TQColor mMarkerColor;
@@ -972,7 +972,7 @@ private:
int mIdExtraLinesLength; int mExtraLinesLength;
int mIdExtraLinesWidth; int mExtraLinesWidth;
int mIdExtraLinesColor; TQColor mExtraLinesColor;
- int mIdExtraLinesStyle; Qt::PenStyle mExtraLinesStyle;
+ int mIdExtraLinesStyle; TQt::PenStyle mExtraLinesStyle;
int mIdExtraMarkersAlign; uint mExtraMarkersAlign;
int mIdExtraMarkersSize; TQSize mExtraMarkersSize;
int mIdExtraMarkersColor; TQColor mExtraMarkersColor;
diff --git a/libkdchart/KDChartWidget.cpp b/libkdchart/KDChartWidget.cpp
index 0424e7e..96f1c6e 100644
--- a/libkdchart/KDChartWidget.cpp
+++ b/libkdchart/KDChartWidget.cpp
@@ -175,10 +175,10 @@ void KDChartWidget::mousePressEvent( TQMouseEvent* event )
//while ( ( current = it.current() ) ) {
if ( current->contains( event->pos() ) ) {
_mousePressedOnRegion = current;
- if ( event->button() == Qt::LeftButton ){
+ if ( event->button() == TQt::LeftButton ){
emit dataLeftPressed( current->row, current->col );
emit dataLeftPressed( event->pos() );
- }else if ( event->button() == Qt::MidButton ){
+ }else if ( event->button() == TQt::MidButton ){
emit dataMiddlePressed( current->row, current->col );
emit dataMiddlePressed( event->pos() );
}else{
@@ -204,14 +204,14 @@ void KDChartWidget::mouseReleaseEvent( TQMouseEvent* event )
while ( ( current = it.current() ) ) {
++it;
if ( current->contains( event->pos() ) ) {
- if ( event->button() == Qt::LeftButton ) {
+ if ( event->button() == TQt::LeftButton ) {
emit dataLeftReleased( current->row, current->col );
emit dataLeftReleased( event->pos() );
if ( _mousePressedOnRegion == current ){
emit dataLeftClicked( current->row, current->col );
emit dataLeftClicked( event->pos() );
}
- } else if ( event->button() == Qt::MidButton ) {
+ } else if ( event->button() == TQt::MidButton ) {
emit dataMiddleReleased( current->row, current->col );
emit dataMiddleReleased( event->pos() );
if ( _mousePressedOnRegion == current ){
diff --git a/libkdchart/KDXMLTools.cpp b/libkdchart/KDXMLTools.cpp
index 7ccecb2..e76d9f2 100644
--- a/libkdchart/KDXMLTools.cpp
+++ b/libkdchart/KDXMLTools.cpp
@@ -51,13 +51,13 @@ namespace KDXML {
void createOrientationNode( TQDomDocument& doc, TQDomNode& parent,
- const TQString& elementName, Qt::Orientation value )
+ const TQString& elementName, TQt::Orientation value )
{
TQDomElement newElement =
doc.createElement( elementName );
parent.appendChild( newElement );
TQDomText elementContent =
- doc.createTextNode( (Qt::Vertical == value) ? "vertical" : "horizontal" );
+ doc.createTextNode( (TQt::Vertical == value) ? "vertical" : "horizontal" );
newElement.appendChild( elementContent );
}
@@ -279,7 +279,7 @@ namespace KDXML {
}
- TQString penStyleToString( Qt::PenStyle style )
+ TQString penStyleToString( TQt::PenStyle style )
{
switch( style ) {
case TQt::NoPen:
@@ -301,39 +301,39 @@ namespace KDXML {
- TQString brushStyleToString( Qt::BrushStyle style )
+ TQString brushStyleToString( TQt::BrushStyle style )
{
// PENDING(kalle) Support custom patterns
switch( style ) {
- case Qt::NoBrush:
+ case TQt::NoBrush:
return "NoBrush";
- case Qt::SolidPattern:
+ case TQt::SolidPattern:
return "SolidPattern";
- case Qt::Dense1Pattern:
+ case TQt::Dense1Pattern:
return "Dense1Pattern";
- case Qt::Dense2Pattern:
+ case TQt::Dense2Pattern:
return "Dense2Pattern";
- case Qt::Dense3Pattern:
+ case TQt::Dense3Pattern:
return "Dense3Pattern";
- case Qt::Dense4Pattern:
+ case TQt::Dense4Pattern:
return "Dense4Pattern";
- case Qt::Dense5Pattern:
+ case TQt::Dense5Pattern:
return "Dense5Pattern";
- case Qt::Dense6Pattern:
+ case TQt::Dense6Pattern:
return "Dense6Pattern";
- case Qt::Dense7Pattern:
+ case TQt::Dense7Pattern:
return "Dense7Pattern";
- case Qt::HorPattern:
+ case TQt::HorPattern:
return "HorPattern";
- case Qt::VerPattern:
+ case TQt::VerPattern:
return "VerPattern";
- case Qt::CrossPattern:
+ case TQt::CrossPattern:
return "CrossPattern";
- case Qt::BDiagPattern:
+ case TQt::BDiagPattern:
return "BDiagPattern";
- case Qt::FDiagPattern:
+ case TQt::FDiagPattern:
return "FDiagPattern";
- case Qt::DiagCrossPattern:
+ case TQt::DiagCrossPattern:
return "DiagCrossPattern";
default: // should not happen (but can for a custom pattern)
return "SolidPattern";
@@ -381,13 +381,13 @@ namespace KDXML {
}
- bool readOrientationNode( const TQDomElement& element, Qt::Orientation& value )
+ bool readOrientationNode( const TQDomElement& element, TQt::Orientation& value )
{
if( element.text() == "vertical" ) {
- value = Qt::Vertical;
+ value = TQt::Vertical;
return true;
} else if( element.text() == "horizontal" ) {
- value = Qt::Horizontal;
+ value = TQt::Horizontal;
return true;
} else
return false;
@@ -443,7 +443,7 @@ namespace KDXML {
{
bool ok = true;
TQColor tempColor;
- Qt::BrushStyle tempStyle=Qt::SolidPattern;
+ TQt::BrushStyle tempStyle=TQt::SolidPattern;
TQPixmap tempPixmap;
TQDomNode node = element.firstChild();
while( !node.isNull() ) {
@@ -551,7 +551,7 @@ namespace KDXML {
bool ok = true;
int tempWidth;
TQColor tempColor;
- Qt::PenStyle tempStyle=Qt::SolidLine;
+ TQt::PenStyle tempStyle=TQt::SolidLine;
TQDomNode node = element.firstChild();
while( !node.isNull() ) {
TQDomElement element = node.toElement();
@@ -747,60 +747,60 @@ namespace KDXML {
- Qt::PenStyle stringToPenStyle( const TQString& style )
+ TQt::PenStyle stringToPenStyle( const TQString& style )
{
if( style == "NoPen" )
- return Qt::NoPen;
+ return TQt::NoPen;
else if( style == "SolidLine" )
- return Qt::SolidLine;
+ return TQt::SolidLine;
else if( style == "DashLine" )
- return Qt::DashLine;
+ return TQt::DashLine;
else if( style == "DotLine" )
- return Qt::DotLine;
+ return TQt::DotLine;
else if( style == "DashDotLine" )
- return Qt::DashDotLine;
+ return TQt::DashDotLine;
else if( style == "DashDotDotLine" )
- return Qt::DashDotDotLine;
+ return TQt::DashDotDotLine;
else // should not happen
- return Qt::SolidLine;
+ return TQt::SolidLine;
}
- Qt::BrushStyle stringToBrushStyle( const TQString& style )
+ TQt::BrushStyle stringToBrushStyle( const TQString& style )
{
// PENDING(kalle) Support custom patterns
if( style == "NoBrush" )
- return Qt::NoBrush;
+ return TQt::NoBrush;
else if( style == "SolidPattern" )
- return Qt::SolidPattern;
+ return TQt::SolidPattern;
else if( style == "Dense1Pattern" )
- return Qt::Dense1Pattern;
+ return TQt::Dense1Pattern;
else if( style == "Dense2Pattern" )
- return Qt::Dense2Pattern;
+ return TQt::Dense2Pattern;
else if( style == "Dense3Pattern" )
- return Qt::Dense3Pattern;
+ return TQt::Dense3Pattern;
else if( style == "Dense4Pattern" )
- return Qt::Dense4Pattern;
+ return TQt::Dense4Pattern;
else if( style == "Dense5Pattern" )
- return Qt::Dense5Pattern;
+ return TQt::Dense5Pattern;
else if( style == "Dense6Pattern" )
- return Qt::Dense6Pattern;
+ return TQt::Dense6Pattern;
else if( style == "Dense7Pattern" )
- return Qt::Dense7Pattern;
+ return TQt::Dense7Pattern;
else if( style == "HorPattern" )
- return Qt::HorPattern;
+ return TQt::HorPattern;
else if( style == "VerPattern" )
- return Qt::VerPattern;
+ return TQt::VerPattern;
else if( style == "CrossPattern" )
- return Qt::CrossPattern;
+ return TQt::CrossPattern;
else if( style == "BDiagPattern" )
- return Qt::BDiagPattern;
+ return TQt::BDiagPattern;
else if( style == "FDiagPattern" )
- return Qt::FDiagPattern;
+ return TQt::FDiagPattern;
else if( style == "DiagCrossPattern" )
- return Qt::DiagCrossPattern;
+ return TQt::DiagCrossPattern;
else // should not happen (but can with custom patterns)
- return Qt::SolidPattern;
+ return TQt::SolidPattern;
}
}
diff --git a/libkdchart/KDXMLTools.h b/libkdchart/KDXMLTools.h
index 022005b..098e938 100644
--- a/libkdchart/KDXMLTools.h
+++ b/libkdchart/KDXMLTools.h
@@ -44,15 +44,15 @@
#include <tqdatetime.h>
namespace KDXML {
- TQString penStyleToString( Qt::PenStyle style );
- Qt::PenStyle stringToPenStyle( const TQString& style );
- TQString brushStyleToString( Qt::BrushStyle style );
- Qt::BrushStyle stringToBrushStyle( const TQString& style );
+ TQString penStyleToString( TQt::PenStyle style );
+ TQt::PenStyle stringToPenStyle( const TQString& style );
+ TQString brushStyleToString( TQt::BrushStyle style );
+ TQt::BrushStyle stringToBrushStyle( const TQString& style );
void createBoolNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, bool value );
void createOrientationNode( TQDomDocument& doc, TQDomNode& parent,
- const TQString& elementName, Qt::Orientation value );
+ const TQString& elementName, TQt::Orientation value );
void createSizeNode( TQDomDocument& doc, TQDomNode& parent,
const TQString& elementName, const TQSize& value );
void createIntNode( TQDomDocument& doc, TQDomNode& parent,
@@ -89,7 +89,7 @@ namespace KDXML {
bool readStringNode( const TQDomElement& element, TQString& value );
bool readDoubleNode( const TQDomElement& element, double& value );
bool readBoolNode( const TQDomElement& element, bool& value );
- bool readOrientationNode( const TQDomElement& element, Qt::Orientation& value );
+ bool readOrientationNode( const TQDomElement& element, TQt::Orientation& value );
bool readSizeNode( const TQDomElement& element, TQSize& value );
bool readColorNode( const TQDomElement& element, TQColor& value );
bool readBrushNode( const TQDomElement& element, TQBrush& brush );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 17:19:07 +0000