1 files changed, 7 insertions, 7 deletions

diff --git a/kivio/kiviopart/kiviosdk/kivio_shape_data.h b/kivio/kiviopart/kiviosdk/kivio_shape_data.h
index f97e5ec9..bd89dcc8 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 tqshape
+    TQString m_text;                                 // The text inside this shape
     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 tqalignment flags
+    int m_hTextAlign, m_vTextAlign;                 //Qt::Horizontal and vertical text alignment flags
 };
 
 /**
@@ -52,7 +52,7 @@ class KivioShapeData
 {
 public:
     /**
-     * The possible tqshape types.
+     * The possible shape types.
      */
     typedef enum {
         kstNone = 0,
@@ -75,7 +75,7 @@ protected:
 
     TQPtrList <KivioPoint> *m_pOriginalPointList;       // Original point list loaded from an SML file
 
-    KivioShapeType m_tqshapeType;                     // The tqshape type
+    KivioShapeType m_shapeType;                     // The shape 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 tqshape
+    TQString m_name;                                 // The name of this shape
 
     KivioTextStyle *m_pTextData;                    // A pointer to text data (if applicable, e.g. TextBox)
 
@@ -98,10 +98,10 @@ public:
     virtual TQDomElement saveXML( TQDomDocument & );
 
 
-    KivioShapeType tqshapeType() const { return m_tqshapeType; }
+    KivioShapeType shapeType() const { return m_shapeType; }
     void setShapeType( KivioShapeType st );
 
-    static KivioShapeType tqshapeTypeFromString( const TQString & );
+    static KivioShapeType shapeTypeFromString( const TQString & );
 
     TQPtrList<KivioPoint> *pointList() { return m_pOriginalPointList; }