From fecb0e67b23e8b83ba7fc881bb57bc48c0852d62 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 5 Jul 2011 06:00:29 +0000 Subject: TQt4 port kmymoney This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1239855 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkdchart/KDChartPropertySet.h | 97 +++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 48 deletions(-) (limited to 'libkdchart/KDChartPropertySet.h') diff --git a/libkdchart/KDChartPropertySet.h b/libkdchart/KDChartPropertySet.h index 306109c..a3e9495 100644 --- a/libkdchart/KDChartPropertySet.h +++ b/libkdchart/KDChartPropertySet.h @@ -32,9 +32,9 @@ #include #include -#include -#include -#include +#include +#include +#include /** \file KDChartPropertySet.h @@ -63,12 +63,13 @@ instead of the value that is stored locally. \sa KDCHART_PROPSET_NORMAL_DATA, KDCHART_PROPSET_TRANSPARENT_DATA \sa KDChartParams::registerProperties */ -class KDCHART_EXPORT KDChartPropertySet :public QObject +class KDCHART_EXPORT KDChartPropertySet :public TQObject { Q_OBJECT + TQ_OBJECT Q_ENUMS( SpecialDataPropertyID ) - // Required by QSA + // Required by TQSA Q_ENUMS( PenStyle ) friend class KDChartParams; @@ -106,14 +107,14 @@ class KDCHART_EXPORT KDChartPropertySet :public QObject This constructor may be used to initialize a property set and let it have all property IDs set to a specific value, e.g. you might pass KDCHART_PROPSET_NORMAL_DATA - as ID to make the default property set the parent of all + as ID to make the default property set the tqparent of all values. \param name (may be empty) a name describing this property set. - \param idParent the ID of the parent property set. Skip this paramter - to define a property set without specifying a parent. + \param idParent the ID of the tqparent property set. Skip this paramter + to define a property set without specifying a tqparent. */ - KDChartPropertySet( const QString& name, int idParent=KDChartPropertySet::UndefinedID ) : + KDChartPropertySet( const TQString& name, int idParent=KDChartPropertySet::UndefinedID ) : mOwnID( UndefinedID ) { fullReset( name, idParent ); } @@ -151,7 +152,7 @@ class KDCHART_EXPORT KDChartPropertySet :public QObject \sa clone, fullReset */ - void quickReset( const QString& name, int idParent=KDChartPropertySet::UndefinedID ); + void quickReset( const TQString& name, int idParent=KDChartPropertySet::UndefinedID ); /** @@ -166,7 +167,7 @@ class KDCHART_EXPORT KDChartPropertySet :public QObject \sa clone, quickReset */ - void fullReset( const QString& name, int idParent=KDChartPropertySet::UndefinedID ); + void fullReset( const TQString& name, int idParent=KDChartPropertySet::UndefinedID ); /** @@ -175,7 +176,7 @@ class KDCHART_EXPORT KDChartPropertySet :public QObject \sa loadXML */ - QDomElement saveXML(QDomDocument& doc) const; + TQDomElement saveXML(TQDomDocument& doc) const; /** @@ -190,7 +191,7 @@ class KDCHART_EXPORT KDChartPropertySet :public QObject \sa id, saveXLM */ - static bool loadXML( const QDomElement& element, KDChartPropertySet& set ); + static bool loadXML( const TQDomElement& element, KDChartPropertySet& set ); public slots: /** @@ -201,7 +202,7 @@ public slots: /** Change the descriptive name of this property set. */ - void setName( const QString& name ) + void setName( const TQString& name ) { mName = name; } @@ -209,7 +210,7 @@ public slots: /** Returns the name of this property set. */ - QString name() const { return mName; } + TQString name() const { return mName; } @@ -311,7 +312,7 @@ public slots: \sa hasOwnBarColor */ - void setBarColor( int idBarColor, const QColor& barColor ) + void setBarColor( int idBarColor, const TQColor& barColor ) { mIdBarColor = idBarColor; mBarColor = barColor; @@ -348,7 +349,7 @@ public slots: \sa setBarColor */ - bool hasOwnBarColor( int& idBarColor, QColor& barColor ) + bool hasOwnBarColor( int& idBarColor, TQColor& barColor ) { idBarColor = mIdBarColor; if( OwnID == mIdBarColor ){ @@ -449,7 +450,7 @@ public slots: \sa setLineWidth, setLineStyle, setShowMarker \sa hasOwnLineWidth, hasOwnLineColor, hasOwnLineStyle, hasOwnShowMarker */ - void setLineColor( int idLineColor, const QColor& lineColor ) + void setLineColor( int idLineColor, const TQColor& lineColor ) { mIdLineColor = idLineColor; mLineColor = lineColor; @@ -487,7 +488,7 @@ public slots: \sa setLineWidth, setLineColor, setLineStyle, setShowMarker \sa hasOwnLineWidth, hasOwnLineStyle, hasOwnShowMarker */ - bool hasOwnLineColor( int& idLineColor, QColor& lineColor ) + bool hasOwnLineColor( int& idLineColor, TQColor& lineColor ) { idLineColor = mIdLineColor; if( OwnID == mIdLineColor ){ @@ -520,7 +521,7 @@ public slots: \sa setLineWidth, setLineColor, setShowMarker \sa hasOwnLineWidth, hasOwnLineColor, hasOwnLineStyle, hasOwnShowMarker */ - void setLineStyle( int idLineStyle, const PenStyle& lineStyle ) + void setLineStyle( int idLineStyle, const Qt::PenStyle& lineStyle ) { mIdLineStyle = idLineStyle; mLineStyle = lineStyle; @@ -558,7 +559,7 @@ public slots: \sa setLineWidth, setLineColor, setLineStyle, setShowMarker \sa hasOwnLineWidth, hasOwnLineColor, hasOwnShowMarker */ - bool hasOwnLineStyle( int& idLineStyle, PenStyle& lineStyle ) + bool hasOwnLineStyle( int& idLineStyle, Qt::PenStyle& lineStyle ) { idLineStyle = mIdLineStyle; if( OwnID == mIdLineStyle ){ @@ -592,7 +593,7 @@ public slots: \sa hasOwnAreaBrush */ - void setAreaBrush( int idAreaBrush, const QBrush& areaBrush ) + void setAreaBrush( int idAreaBrush, const TQBrush& areaBrush ) { mIdAreaBrush = idAreaBrush; mAreaBrush = areaBrush; @@ -629,7 +630,7 @@ public slots: \sa setAreaBrush */ - bool hasOwnAreaBrush( int& idAreaBrush, QBrush& areaBrush ) + bool hasOwnAreaBrush( int& idAreaBrush, TQBrush& areaBrush ) { idAreaBrush = mIdAreaBrush; if( OwnID == mIdAreaBrush ){ @@ -720,14 +721,14 @@ public slots: } /** - Specify the ID of the property set specifying the alignment of the + Specify the ID of the property set specifying the tqalignment of the Marker to be displayed for this data value or specifying this flag directly. \note This function should be used for Line Charts only, otherwise the settings specified here will be ignored. - \param idMarkerAlign ID of the property set specifying the alignment + \param idMarkerAlign ID of the property set specifying the tqalignment of the Marker to be shown. Use special value KDChartPropertySet::UndefinedID to specify neither another property set's ID @@ -736,7 +737,7 @@ public slots: if you do NOT want to inherit another property set's settings but want to specify the flag by using the following parameter. - \param markerAlign The alignment of the marker to be shown. + \param markerAlign The tqalignment of the marker to be shown. This parameter is stored but ignored if the previous parameter is not set to KDChartPropertySet::OwnID. @@ -758,12 +759,12 @@ public slots: } return false; } - void setMarkerSize( int idMarkerSize, const QSize& markerSize ) + void setMarkerSize( int idMarkerSize, const TQSize& markerSize ) { mIdMarkerSize = idMarkerSize; mMarkerSize = markerSize; } - bool hasOwnMarkerSize( int& idMarkerSize, QSize& markerSize ) + bool hasOwnMarkerSize( int& idMarkerSize, TQSize& markerSize ) { idMarkerSize = mIdMarkerSize; if( OwnID == idMarkerSize ){ @@ -772,12 +773,12 @@ public slots: } return false; } - void setMarkerColor( int idMarkerColor, const QColor& markerColor ) + void setMarkerColor( int idMarkerColor, const TQColor& markerColor ) { mIdMarkerColor = idMarkerColor; mMarkerColor = markerColor; } - bool hasOwnMarkerColor( int& idMarkerColor, QColor& markerColor ) + bool hasOwnMarkerColor( int& idMarkerColor, TQColor& markerColor ) { idMarkerColor = mIdMarkerColor; if( OwnID == idMarkerColor ){ @@ -862,12 +863,12 @@ public slots: } return false; } - void setExtraLinesColor( int idExtraLinesColor, const QColor& extraLinesColor ) + void setExtraLinesColor( int idExtraLinesColor, const TQColor& extraLinesColor ) { mIdExtraLinesColor = idExtraLinesColor; mExtraLinesColor = extraLinesColor; } - bool hasOwnExtraLinesColor( int& idExtraLinesColor, QColor& extraLinesColor ) + bool hasOwnExtraLinesColor( int& idExtraLinesColor, TQColor& extraLinesColor ) { idExtraLinesColor = mIdExtraLinesColor; if( OwnID == idExtraLinesColor ){ @@ -876,12 +877,12 @@ public slots: } return false; } - void setExtraLinesStyle( int idExtraLinesStyle, const PenStyle extraLinesStyle ) + void setExtraLinesStyle( int idExtraLinesStyle, const Qt::PenStyle extraLinesStyle ) { mIdExtraLinesStyle = idExtraLinesStyle; mExtraLinesStyle = extraLinesStyle; } - bool hasOwnExtraLinesStyle( int& idExtraLinesStyle, PenStyle& extraLinesStyle ) + bool hasOwnExtraLinesStyle( int& idExtraLinesStyle, Qt::PenStyle& extraLinesStyle ) { idExtraLinesStyle = mIdExtraLinesStyle; if( OwnID == idExtraLinesStyle ){ @@ -905,12 +906,12 @@ public slots: } return false; } - void setExtraMarkersSize( int idExtraMarkersSize, const QSize& extraMarkersSize ) + void setExtraMarkersSize( int idExtraMarkersSize, const TQSize& extraMarkersSize ) { mIdExtraMarkersSize = idExtraMarkersSize; mExtraMarkersSize = extraMarkersSize; } - bool hasOwnExtraMarkersSize( int& idExtraMarkersSize, QSize& extraMarkersSize ) + bool hasOwnExtraMarkersSize( int& idExtraMarkersSize, TQSize& extraMarkersSize ) { idExtraMarkersSize = mIdExtraMarkersSize; if( OwnID == idExtraMarkersSize ){ @@ -919,12 +920,12 @@ public slots: } return false; } - void setExtraMarkersColor( int idExtraMarkersColor, const QColor& extraMarkersColor ) + void setExtraMarkersColor( int idExtraMarkersColor, const TQColor& extraMarkersColor ) { mIdExtraMarkersColor = idExtraMarkersColor; mExtraMarkersColor = extraMarkersColor; } - bool hasOwnExtraMarkersColor( int& idExtraMarkersColor, QColor& extraMarkersColor ) + bool hasOwnExtraMarkersColor( int& idExtraMarkersColor, TQColor& extraMarkersColor ) { idExtraMarkersColor = mIdExtraMarkersColor; if( OwnID == idExtraMarkersColor ){ @@ -954,31 +955,31 @@ protected: int mOwnID; private: - KDChartPropertySet( const KDChartPropertySet& ) : QObject(0) {} + KDChartPropertySet( const KDChartPropertySet& ) : TQObject(0) {} - QString mName; + TQString mName; // IDs: values used if ID == OwnID: int mIdLineWidth; int mLineWidth; - int mIdLineColor; QColor mLineColor; + int mIdLineColor; TQColor mLineColor; int mIdLineStyle; Qt::PenStyle mLineStyle; int mIdShowMarker; bool mShowMarker; - int mIdMarkerSize; QSize mMarkerSize; - int mIdMarkerColor; QColor mMarkerColor; + int mIdMarkerSize; TQSize mMarkerSize; + int mIdMarkerColor; TQColor mMarkerColor; int mIdMarkerStyle; int mMarkerStyle; int mIdMarkerAlign; uint mMarkerAlign; int mIdExtraLinesAlign; uint mExtraLinesAlign; int mIdExtraLinesInFront; bool mExtraLinesInFront; int mIdExtraLinesLength; int mExtraLinesLength; int mIdExtraLinesWidth; int mExtraLinesWidth; - int mIdExtraLinesColor; QColor mExtraLinesColor; + int mIdExtraLinesColor; TQColor mExtraLinesColor; int mIdExtraLinesStyle; Qt::PenStyle mExtraLinesStyle; int mIdExtraMarkersAlign; uint mExtraMarkersAlign; - int mIdExtraMarkersSize; QSize mExtraMarkersSize; - int mIdExtraMarkersColor; QColor mExtraMarkersColor; + int mIdExtraMarkersSize; TQSize mExtraMarkersSize; + int mIdExtraMarkersColor; TQColor mExtraMarkersColor; int mIdExtraMarkersStyle; int mExtraMarkersStyle; int mIdShowBar; bool mShowBar; - int mIdBarColor; QColor mBarColor; - int mIdAreaBrush; QBrush mAreaBrush; + int mIdBarColor; TQColor mBarColor; + int mIdAreaBrush; TQBrush mAreaBrush; void fillValueMembersWithDummyValues(); }; -- cgit v1.2.1