From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- kivio/kiviopart/kiviosdk/kivio_shape_data.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kivio/kiviopart/kiviosdk/kivio_shape_data.h') diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.h b/kivio/kiviopart/kiviosdk/kivio_shape_data.h index bd89dcc8..f97e5ec9 100644 --- a/kivio/kiviopart/kiviosdk/kivio_shape_data.h +++ b/kivio/kiviopart/kiviosdk/kivio_shape_data.h @@ -36,11 +36,11 @@ class KivioTextShapeData public: KivioTextShapeData(); - TQString m_text; // The text inside this shape + TQString m_text; // The text inside this tqshape TQColor m_textColor; // The text color TQFont m_textFont; // The text font bool m_isHtml; // Is the text HTML formatted? - int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text alignment flags + int m_hTextAlign, m_vTextAlign; //Qt::Horizontal and vertical text tqalignment flags }; /** @@ -52,7 +52,7 @@ class KivioShapeData { public: /** - * The possible shape types. + * The possible tqshape types. */ typedef enum { kstNone = 0, @@ -75,7 +75,7 @@ protected: TQPtrList *m_pOriginalPointList; // Original point list loaded from an SML file - KivioShapeType m_shapeType; // The shape type + KivioShapeType m_tqshapeType; // The tqshape type KivioPoint m_position, m_dimensions; // The position and dimensions KivioFillStyle *m_pFillStyle; // The fill style @@ -83,7 +83,7 @@ protected: // float m_lineWidth; // The line width KivioLineStyle *m_pLineStyle; - TQString m_name; // The name of this shape + TQString m_name; // The name of this tqshape KivioTextStyle *m_pTextData; // A pointer to text data (if applicable, e.g. TextBox) @@ -98,10 +98,10 @@ public: virtual TQDomElement saveXML( TQDomDocument & ); - KivioShapeType shapeType() const { return m_shapeType; } + KivioShapeType tqshapeType() const { return m_tqshapeType; } void setShapeType( KivioShapeType st ); - static KivioShapeType shapeTypeFromString( const TQString & ); + static KivioShapeType tqshapeTypeFromString( const TQString & ); TQPtrList *pointList() { return m_pOriginalPointList; } -- cgit v1.2.1