Remove additional unneeded tq method conversions

11 files changed, 221 insertions, 221 deletions

diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index 09f0b852..fb9eda89 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -108,7 +108,7 @@ void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e )
         _activeButton = onButton( e->pos() );
         mouseOffset = s->pick(e->pos());
         if ( _activeButton != 0)
-            tqrepaint();
+            repaint();
         updateCursor( e->pos() );
     }
 }
@@ -165,7 +165,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
             s->moveSplitter( pos, id() );
         }
     }
-    tqrepaint();
+    repaint();
 }
 
 int KDGanttSplitterHandle::onButton( const TQPoint& p )
@@ -319,7 +319,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
   such a license) and are (C) Trolltech AS.
 
   A splitter lets the user control the size of child widgets by
-  dragging the boundary between the tqchildren. Any number of widgets
+  dragging the boundary between the children. Any number of widgets
   may be controlled.
 
   To show a TQListBox, a TQListView and a TQTextEdit side by side:
@@ -332,14 +332,14 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
   \endcode
 
   In KDGanttMinimizeSplitter, the boundary can be either horizontal or
-  vertical.  The default is horizontal (the tqchildren are side by side)
+  vertical.  The default is horizontal (the children are side by side)
   but you can use setOrientation( TQSplitter::Vertical ) to set it to
   vertical.
 
   Use setResizeMode() to specify
   that a widget should keep its size when the splitter is resized.
 
-  Although KDGanttMinimizeSplitter normally resizes the tqchildren only
+  Although KDGanttMinimizeSplitter normally resizes the children only
   at the end of a resize operation, if you call setOpaqueResize( TRUE
   ) the widgets are resized as often as possible.
 
@@ -349,7 +349,7 @@ void kdganttGeomCalc( TQMemArray<TQLayoutStruct> &chain, int start, int count, i
   sizes set by the user.
 
   If you hide() a child, its space will be distributed among the other
-  tqchildren. It will be reinstated when you show() it again. It is also
+  children. It will be reinstated when you show() it again. It is also
   possible to reorder the widgets within the splitter using
   moveToFirst() and moveToLast().
 */
@@ -400,7 +400,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *p
 }
 
 /*!
-  Destroys the splitter and any tqchildren.
+  Destroys the splitter and any children.
 */
 KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
 {
@@ -705,7 +705,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
     } else {
 	int dd, newLeft, nextPos;
 	if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) {
-	    dd = w->tqgeometry().right() - pos;
+	    dd = w->geometry().right() - pos;
 	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize())));
 	    newLeft = pos+1;
 	    nextPos = newLeft + dd;
@@ -764,7 +764,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
 	    newLeft = pos-dd+1;
 	    nextPos = newLeft - 1;
 	} else {
-	    right = pick( w->tqgeometry().bottomRight() );
+	    right = pick( w->geometry().bottomRight() );
 	    dd = right - pos + 1;
 	    dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize())));
 	    /*newRight = pos+dd-1;*/
@@ -966,7 +966,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
             // nested splitters; be nice
             maxl = maxt = 0;
         } else {
-            // KDGanttMinimizeSplitter with no tqchildren yet
+            // KDGanttMinimizeSplitter with no children yet
             maxl = TQWIDGETSIZE_MAX;
         }
     } else {
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index c7bfa010..9598f867 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -532,7 +532,7 @@ void KDGanttView::slotMouseButtonPressed ( int button, TQListViewItem * item,
                  the fastest mode.
               If Medium, there is extra repainting after releasing the
                  scrollbar. This provides fast scrolling with updated content
-                 after scrolling. Recommended, when tqrepaint problems occur.
+                 after scrolling. Recommended, when repaint problems occur.
                  This is the default value after startup.
               If Always, there is an extra update after every move of the
                  scrollbar. This entails slow scrolling with updated
@@ -615,7 +615,7 @@ void KDGanttView::slotHeaderSizeChanged()
     // legend is cleared - reinit legend with list
     legendItem* li;
     for ( li = myLegendItems->first(); li; li = myLegendItems->next() ) {
-      myLegend->addLegendItem(li->tqshape, li->color, li->text );
+      myLegend->addLegendItem(li->shape, li->color, li->text );
     }
   }
 }
@@ -766,25 +766,25 @@ bool KDGanttView::editable() const
 
 
 /*!
-  Saves the state of the Gantt view in an IO tqdevice in XML format. The saved
+  Saves the state of the Gantt view in an IO device in XML format. The saved
   data can be reloaded with \a loadProject().
 
-  \param tqdevice a pointer to the IO tqdevice in which to store the Gantt
+  \param device a pointer to the IO device in which to store the Gantt
   view state.
   \return true if the data could be written, false if an error
   occurred
   \sa loadProject()
 */
 
-bool KDGanttView::saveProject( TQIODevice* tqdevice )
+bool KDGanttView::saveProject( TQIODevice* device )
 {
-    Q_ASSERT( tqdevice );
+    Q_ASSERT( device );
 
     TQDomDocument doc = saveXML();
-    if( tqdevice->isOpen() )
-        tqdevice->close();
-    if( tqdevice->open( IO_WriteOnly ) ) {
-        TQTextStream ts( tqdevice );
+    if( device->isOpen() )
+        device->close();
+    if( device->open( IO_WriteOnly ) ) {
+        TQTextStream ts( device );
         ts << doc.toString();
         return true;
     } else
@@ -796,30 +796,30 @@ bool KDGanttView::saveProject( TQIODevice* tqdevice )
   Loads a previously saved state of the Gantt view. All current
   settings and items are discarded before loading the data.
 
-  \param tqdevice a pointer to the IO tqdevice from which to load the
+  \param device a pointer to the IO device from which to load the
   Gantt view state.
   \return true if the file could be read, false if an error
   occurred
   \sa saveProject()
 */
 
-bool KDGanttView::loadProject( TQIODevice* tqdevice )
+bool KDGanttView::loadProject( TQIODevice* device )
 {
-    Q_ASSERT( tqdevice );
+    Q_ASSERT( device );
 
-    if( tqdevice->isOpen() )
-        tqdevice->close();
-    if( tqdevice->open( IO_ReadOnly ) ) {
+    if( device->isOpen() )
+        device->close();
+    if( device->open( IO_ReadOnly ) ) {
         TQDomDocument doc( "GanttView" );
         TQString err;
         int errline, errcol;
-        if ( !doc.setContent( tqdevice, &err, &errline, &errcol ) ) {
+        if ( !doc.setContent( device, &err, &errline, &errcol ) ) {
           qDebug("KDGantt::Error parsing XML data at line %d. Message is:", errline );
           qDebug("%s ", err.latin1());
-          tqdevice->close();
+          device->close();
           return false;
         }
-        tqdevice->close();
+        device->close();
         return loadXML( doc );
     } else
         return false;
@@ -1209,7 +1209,7 @@ bool KDGanttView::showTaskLinks() const
 void KDGanttView::setFont(const TQFont& font)
 {
     myListView->setFont(font);
-    myListView->tqrepaint();
+    myListView->repaint();
     myTimeHeader->setFont(font);
     myLegend->setFont( font );
     TQWidget::setFont( font );
@@ -1299,21 +1299,21 @@ bool KDGanttView::showTimeTablePopupMenu() const
 
 
 /*!
-  Sets the tqshapes for a certain type of Gantt item. Not all items use
-  all three tqshapes (e.g., only summary items use the middle tqshape).
+  Sets the shapes for a certain type of Gantt item. Not all items use
+  all three shapes (e.g., only summary items use the middle shape).
 
-  This setting overrides any tqshape settings made on individual items.
+  This setting overrides any shape settings made on individual items.
   These settings will be taken as initial values of any newly created
   item of this certain type.
   See also the documentation of the KDGanttViewItem class.
 
-  \param type the type of Gantt items for which to set the tqshapes
-  \param start the tqshape to use for the beginning of the item
-  \param middle the tqshape to use for the middle of the item
-  \param end the tqshape to use for the end of the item
-  \param overwriteExisting if true, overwrites existing tqshape settings
+  \param type the type of Gantt items for which to set the shapes
+  \param start the shape to use for the beginning of the item
+  \param middle the shape to use for the middle of the item
+  \param end the shape to use for the end of the item
+  \param overwriteExisting if true, overwrites existing shape settings
   in the individual items
-  \sa tqshapes()
+  \sa shapes()
 */
 void KDGanttView::setShapes( KDGanttViewItem::Type type,
                              KDGanttViewItem::Shape start,
@@ -1337,18 +1337,18 @@ void KDGanttView::setShapes( KDGanttViewItem::Type type,
 
 
 /*!
-  Queries the tqshapes for a particular type of Gantt item.
+  Queries the shapes for a particular type of Gantt item.
 
-  \param type the type of Gantt items for which to query the tqshapes
-  \param start the start tqshape is returned in this parameter
-  \param middle the middle tqshape is returned in this parameter
-  \param end the end tqshape is returned in this parameter
-  \return true if there was a general tqshape set for the specified
-  type. If the return value is false, the values of the three tqshape
+  \param type the type of Gantt items for which to query the shapes
+  \param start the start shape is returned in this parameter
+  \param middle the middle shape is returned in this parameter
+  \param end the end shape is returned in this parameter
+  \return true if there was a general shape set for the specified
+  type. If the return value is false, the values of the three shape
   parameters are undefined.
   \sa setShapes()
 */
-bool KDGanttView::tqshapes( KDGanttViewItem::Type type,
+bool KDGanttView::shapes( KDGanttViewItem::Type type,
                           KDGanttViewItem::Shape& start,
                           KDGanttViewItem::Shape& middle,
                           KDGanttViewItem::Shape& end ) const
@@ -1562,19 +1562,19 @@ void KDGanttView::clearLegend( )
 /*!
   Adds an item to the legend.
 
-  \param tqshape the tqshape to display
-  \param tqshapeColor the color in which to display the tqshape
+  \param shape the shape to display
+  \param shapeColor the color in which to display the shape
   \param text the text to display
   \sa clearLegend()
 */
-void KDGanttView::addLegendItem( KDGanttViewItem::Shape tqshape,
-                                 const TQColor& tqshapeColor,
+void KDGanttView::addLegendItem( KDGanttViewItem::Shape shape,
+                                 const TQColor& shapeColor,
                                  const TQString& text )
 {
-    myLegend->addLegendItem( tqshape,tqshapeColor,text );
+    myLegend->addLegendItem( shape,shapeColor,text );
     legendItem* item = new legendItem;
-    item->tqshape = tqshape;
-    item->color = tqshapeColor;
+    item->shape = shape;
+    item->color = shapeColor;
     item->text = text;
     myLegendItems->append( item );
 }
@@ -3415,58 +3415,58 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
                            showTimeTablePopupMenu() );
 
     // the Shapes element
-    TQDomElement tqshapesElement = doc.createElement( "Shapes" );
-    docRoot.appendChild( tqshapesElement );
-    TQDomElement tqshapesEventElement = doc.createElement( "Event" );
-    tqshapesElement.appendChild( tqshapesEventElement );
+    TQDomElement shapesElement = doc.createElement( "Shapes" );
+    docRoot.appendChild( shapesElement );
+    TQDomElement shapesEventElement = doc.createElement( "Event" );
+    shapesElement.appendChild( shapesEventElement );
     KDGanttViewItem::Shape start, middle, end;
-    if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start",
-                                 KDGanttViewItem::tqshapeToString( start ) );
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle",
-                                 KDGanttViewItem::tqshapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "End",
-                                 KDGanttViewItem::tqshapeToString( end ) );
+    if( shapes( KDGanttViewItem::Event, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, shapesEventElement, "Start",
+                                 KDGanttViewItem::shapeToString( start ) );
+        KDGanttXML::createStringNode( doc, shapesEventElement, "Middle",
+                                 KDGanttViewItem::shapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, shapesEventElement, "End",
+                                 KDGanttViewItem::shapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Start",
+        KDGanttXML::createStringNode( doc, shapesEventElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "Middle",
+        KDGanttXML::createStringNode( doc, shapesEventElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesEventElement, "End",
+        KDGanttXML::createStringNode( doc, shapesEventElement, "End",
                                  "Undefined" );
     }
-    TQDomElement tqshapesTaskElement = doc.createElement( "Task" );
-    tqshapesElement.appendChild( tqshapesTaskElement );
-    if( tqshapes( KDGanttViewItem::Task, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start",
-                                 KDGanttViewItem::tqshapeToString( start ) );
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle",
-                                 KDGanttViewItem::tqshapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End",
-                                 KDGanttViewItem::tqshapeToString( end ) );
+    TQDomElement shapesTaskElement = doc.createElement( "Task" );
+    shapesElement.appendChild( shapesTaskElement );
+    if( shapes( KDGanttViewItem::Task, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "Start",
+                                 KDGanttViewItem::shapeToString( start ) );
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle",
+                                 KDGanttViewItem::shapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "End",
+                                 KDGanttViewItem::shapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Start",
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "Middle",
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesTaskElement, "End",
+        KDGanttXML::createStringNode( doc, shapesTaskElement, "End",
                                  "Undefined" );
     }
-    TQDomElement tqshapesSummaryElement = doc.createElement( "Summary" );
-    tqshapesElement.appendChild( tqshapesSummaryElement );
-    if( tqshapes( KDGanttViewItem::Event, start, middle, end ) ) {
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start",
-                                 KDGanttViewItem::tqshapeToString( start ) );
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle",
-                                 KDGanttViewItem::tqshapeToString( middle ) );
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End",
-                                 KDGanttViewItem::tqshapeToString( end ) );
+    TQDomElement shapesSummaryElement = doc.createElement( "Summary" );
+    shapesElement.appendChild( shapesSummaryElement );
+    if( shapes( KDGanttViewItem::Event, start, middle, end ) ) {
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start",
+                                 KDGanttViewItem::shapeToString( start ) );
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle",
+                                 KDGanttViewItem::shapeToString( middle ) );
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "End",
+                                 KDGanttViewItem::shapeToString( end ) );
     } else {
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Start",
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Start",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "Middle",
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "Middle",
                                  "Undefined" );
-        KDGanttXML::createStringNode( doc, tqshapesSummaryElement, "End",
+        KDGanttXML::createStringNode( doc, shapesSummaryElement, "End",
                                  "Undefined" );
     }
 
@@ -3604,7 +3604,7 @@ TQDomDocument KDGanttView::saveXML( bool withPI ) const
         TQDomElement legendItemElement = doc.createElement( "LegendItem" );
         legendItemsElement.appendChild( legendItemElement );
         KDGanttXML::createStringNode( doc, legendItemElement, "Shape",
-                                 KDGanttViewItem::tqshapeToString( current->tqshape ) );
+                                 KDGanttViewItem::shapeToString( current->shape ) );
         KDGanttXML::createColorNode( doc, legendItemElement, "Color",
                                 current->color );
         KDGanttXML::createStringNode( doc, legendItemElement, "Text",
@@ -3757,17 +3757,17 @@ void KDGanttView::editItem( KDGanttViewItem*  item)
 
 
 /*!
-  This method returns the pixmap used for a certain tqshape, in the
+  This method returns the pixmap used for a certain shape, in the
   selected color and size.
 
-  \param tqshape the tqshape to generate
-  \param tqshapeColor the foreground color of the tqshape
-  \param backgroundColor the background color of the tqshape
-  \param itemSize the size of the tqshape
-  \return the generated tqshape pixmap
+  \param shape the shape to generate
+  \param shapeColor the foreground color of the shape
+  \param backgroundColor the background color of the shape
+  \param itemSize the size of the shape
+  \return the generated shape pixmap
 */
-TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape,
-                                const TQColor& tqshapeColor,
+TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape shape,
+                                const TQColor& shapeColor,
                                 const TQColor& backgroundColor, int itemSize)
 {
   // 10 is a good value as size
@@ -3777,11 +3777,11 @@ TQPixmap KDGanttView::getPixmap( KDGanttViewItem::Shape tqshape,
   p.fill( backgroundColor );
   TQPainter paint (&p);
   TQBrush b = TQBrush ( TQt::SolidPattern );
-  b.setColor( tqshapeColor );
+  b.setColor( shapeColor );
   paint.setBrush( b );
   TQPen pen( TQt::black, 1 ) ;
   paint.setPen( pen );
-  switch (tqshape) {
+  switch (shape) {
   case KDGanttViewItem::TriangleDown:{
     TQPointArray arr = TQPointArray(3);
     arr.setPoint(0,-size/2,-hei);
@@ -3864,8 +3864,8 @@ void KDGanttView::initDefaults()
     myDefaultColor [ getIndex( KDGanttViewItem::Summary ) ] =  TQt::cyan;//summary
     myDefaultColorHL [ getIndex( KDGanttViewItem::Summary ) ] =  TQt::red;
 
-    // setting the default tqshape types
-    // currently, we take for each item for all three tqshapes (start, middle, end) the same default tqshape
+    // setting the default shape types
+    // currently, we take for each item for all three shapes (start, middle, end) the same default shape
     for (i = 0;i<3;++i) {
       myDefaultShape [3*getIndex( KDGanttViewItem::Event )+ i] =  KDGanttViewItem::Diamond; //event
       myDefaultShape [3*getIndex( KDGanttViewItem::Task ) +i] =  KDGanttViewItem::Square; //task
diff --git a/kdgantt/KDGanttView.h b/kdgantt/KDGanttView.h
index 7f4bf57a..b0acc96b 100644
--- a/kdgantt/KDGanttView.h
+++ b/kdgantt/KDGanttView.h
@@ -193,7 +193,7 @@ public:
                     KDGanttViewItem::Shape middle,
                     KDGanttViewItem::Shape end,
 		    bool overwriteExisting = true  );
-    bool tqshapes( KDGanttViewItem::Type type,
+    bool shapes( KDGanttViewItem::Type type,
                  KDGanttViewItem::Shape& start,
                  KDGanttViewItem::Shape& middle,
                  KDGanttViewItem::Shape& end ) const;
@@ -228,7 +228,7 @@ public:
     TQPtrList<KDGanttViewTaskLinkGroup> taskLinkGroups() const;
 
     // Legend-related stuff
-    void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
+    void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text );
     void clearLegend();
     // Header-related stuff
     void setHorizonStart( const TQDateTime& start );
@@ -298,7 +298,7 @@ public:
     void setWeekendDays( int start, int end );
     void weekendDays( int& start, int& end ) const;
 
-    static TQPixmap getPixmap( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor,const TQColor& backgroundColor, int itemSize);
+    static TQPixmap getPixmap( KDGanttViewItem::Shape shape, const TQColor& shapeColor,const TQColor& backgroundColor, int itemSize);
 
     void setHeaderVisible( bool );
     bool headerVisible() const;
@@ -422,7 +422,7 @@ private slots:
     void slot_lvDropped(TQDropEvent* e, KDGanttViewItem* droppedItem, KDGanttViewItem* itemBelowMouse );
 private:
     struct legendItem {
-      KDGanttViewItem::Shape tqshape;
+      KDGanttViewItem::Shape shape;
       TQColor color;
       TQString text;
     };
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index de80477a..0bfc7279 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -52,20 +52,20 @@
   directly. Instead, you should create items of one of the
   subclasses. This class provides methods common to all Gantt items.
 
-  The initialization of the tqshapes/colors of the item works as follows:
+  The initialization of the shapes/colors of the item works as follows:
 
   Shapes:
-  When a new item is created, the tqshapes are set to the default values
+  When a new item is created, the shapes are set to the default values
   for items of the type of this item, defined in the KDGanttView class with
   void setShapes( KDGanttViewItem::Type type,
   KDGanttViewItem::Shape start,
   KDGanttViewItem::Shape middle,
   KDGanttViewItem::Shape end );
   If there is no default value defined for this type,
-  the tqshapes are set as follows:
-  For TaskViewItems all three tqshapes are set to Square.
-  For SummaryViewItems all three tqshapes are set to TriangleDown.
-  For EventViewItems all three tqshapes are set to Diamond.
+  the shapes are set as follows:
+  For TaskViewItems all three shapes are set to Square.
+  For SummaryViewItems all three shapes are set to TriangleDown.
+  For EventViewItems all three shapes are set to Diamond.
 
   Colors:
   When a new item is created, the colors are set to the default values
@@ -75,7 +75,7 @@
   const TQColor& middle,
   const TQColor& end );
   If there is no default value defined for this type,
-  the colors of the tqshapes are set to the default color for items of this type,
+  the colors of the shapes are set to the default color for items of this type,
   defined in the KDGanttView class with:
   void setDefaultColor( KDGanttViewItem::Type type, const TQColor& );
   The initial default color in the KDGanttView class is set to
@@ -92,7 +92,7 @@
   const TQColor& middle,
   const TQColor& end );
   If there is no default value defined for this type,
-  the highlight colors of the tqshapes are set to the default color for
+  the highlight colors of the shapes are set to the default color for
   items of this type, defined in the KDGanttView class with:
   void setDefaultHighlightColor( KDGanttViewItem::Type type, const TQColor& );
   The initial default highlight color in the KDGanttView class is set to red
@@ -122,15 +122,15 @@
   shown or not.
   In the other mode (set with setDisplaySubitemsAsGroup( true ); ),
   called "calendar mode", the item is displayed as follows:
-  If the item has no tqchildren, it is displayed as usual.
-  If the item is opened (i.e., its tqchildren are displayed), the
+  If the item has no children, it is displayed as usual.
+  If the item is opened (i.e., its children are displayed), the
   start/end time of this item is computed automatically according to
-  the earliest start time/latest end time of its tqchildren. The item
-  and its tqchildren are displayed as usual.
-  If the item is closed (i.e., its tqchildren are hidden in the left
-  list view), the item itself is hidden, and its tqchildren are displayed
+  the earliest start time/latest end time of its children. The item
+  and its children are displayed as usual.
+  If the item is closed (i.e., its children are hidden in the left
+  list view), the item itself is hidden, and its children are displayed
   on the timeline of this item instead. To control the painting of
-  overlapping tqchildren, call \a setPriority() for the childs.
+  overlapping children, call \a setPriority() for the childs.
 
   Blocking of user interaction to open item:
   If you want to block users to open items used as parents of calendar items,
@@ -138,7 +138,7 @@
 
   Example 1, Color:
   If you create an instance of a KDGanttView class and add a SummaryViewItem
-  without setting any color/tqshape values, you get an item with three tqshapes
+  without setting any color/shape values, you get an item with three shapes
   of the form TriangleDown in the color magenta. If the item is highlighted,
   the color will change to the highlight color red.
 
@@ -147,12 +147,12 @@
   \a KDGanttView::setCalendarMode( true );
   \a KDGanttView::setDisplaySubitemsAsGroup( true );
   Insert root items in the Gantt view.
-  Insert items as tqchildren of these root item in the Gantt view.
+  Insert items as children of these root item in the Gantt view.
   You may use any item type as parent and child; there are no limitations.
   It is, however, recommended to use KDGanttViewTaskItems
-  Actually, you may add child items to the tqchildren themselves.
+  Actually, you may add child items to the children themselves.
   Such a child behaves then like a parent.
-  Now set the start/end time of the tqchildren to specify a time
+  Now set the start/end time of the children to specify a time
   interval for these items.
 */
 
@@ -451,7 +451,7 @@ bool KDGanttViewItem::editable() const
   Useful to get a so called "calendar view" with many items in one row.
   When \a displaySubitemsAsGroup() is set to true, this item has a normal view,
   when it is expanded. If it is not expanded (and has at least one child),
-  the item itself is hidden, and all tqchildren are displayed instead.
+  the item itself is hidden, and all children are displayed instead.
   To manage the painting priority of the childs (if overlapping),
   you may set \a priority() of these items.
 
@@ -735,7 +735,7 @@ TQString KDGanttViewItem::whatsThisText() const
 /*!
   Specifies whether this item should be shown highlighted. The user
   can also highlight items with the mouse.
-  If the item displays its subitems (tqchildren) as a group
+  If the item displays its subitems (children) as a group
   (displaySubitemsAsGroup() == true),
   all changes apply to all subitems as well.
 
@@ -773,16 +773,16 @@ bool KDGanttViewItem::highlight() const
 
 
 /*!
-  Specifies the tqshapes to be used for this item.
+  Specifies the shapes to be used for this item.
 
-  It is advisable not to use this method, but rather set the tqshapes
+  It is advisable not to use this method, but rather set the shapes
   for all items of a type with KDGanttView::setShapes() in order to
   get a uniform Gantt view.
 
-  \param start the start tqshape
-  \param middle the middle tqshape
-  \param end the end tqshape
-  \sa tqshapes(), setColors(), colors()
+  \param start the start shape
+  \param middle the middle shape
+  \param end the end shape
+  \sa shapes(), setColors(), colors()
 */
 void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end )
 {
@@ -799,20 +799,20 @@ void KDGanttViewItem::setShapes( Shape start, Shape middle, Shape end )
 
 
 /*!
-  Creates tqshapes of the specified type \a tqshape.
-  The background tqshape color is set to black and the background tqshape
-  is slightly bit bigger than the foreground tqshape to have a black border
-  around the foreground tqshape.
+  Creates shapes of the specified type \a shape.
+  The background shape color is set to black and the background shape
+  is slightly bit bigger than the foreground shape to have a black border
+  around the foreground shape.
 
-  \param itemShape the foreground tqshape
-  \param middle itemShapeBack  the background tqshape
-  \param tqshape the type of the tqshape
+  \param itemShape the foreground shape
+  \param middle itemShapeBack  the background shape
+  \param shape the type of the shape
    (may be TriangleDown, TriangleUp, Diamond, Square, Circle)
-  \sa tqshapes(), setColors(), colors()
+  \sa shapes(), setColors(), colors()
 */
 void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
                                    KDCanvasPolygonItem* &itemShapeBack,
-                                   Shape tqshape )
+                                   Shape shape )
 {
   if ( itemShape && type() ==  Task )
     return;
@@ -823,7 +823,7 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
     TQCanvasPolygonalItem * itemBack;
     int size = myItemSize+2;
     int hei = (myItemSize/3)/2;
-    switch (tqshape) {
+    switch (shape) {
     case TriangleDown:
         {
             item = new KDCanvasPolygon(myGanttView->myTimeTable, this,Type_is_KDGanttViewItem);
@@ -912,8 +912,8 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
             break;
         }
     default:
-        // Uninitialized tqshape, can e.g. be the case with free-busy
-        // items which don't have any tqshapes
+        // Uninitialized shape, can e.g. be the case with free-busy
+        // items which don't have any shapes
         return;
     }
     item->setBrush(Qt::SolidPattern);
@@ -927,14 +927,14 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape,
 
 
 /*!
-  Returns the tqshapes used for this item
+  Returns the shapes used for this item
 
-  \param start returns the start tqshape
-  \param middle returns the middle tqshape
-  \param end returns the end tqshape
+  \param start returns the start shape
+  \param middle returns the middle shape
+  \param end returns the end shape
   \sa setShapes(), setColors(), colors()
 */
-void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const
+void KDGanttViewItem::shapes( Shape& start, Shape& middle, Shape& end ) const
 {
     start = myStartShape;
     middle = myMiddleShape;
@@ -943,16 +943,16 @@ void KDGanttViewItem::tqshapes( Shape& start, Shape& middle, Shape& end ) const
 
 
 /*!
-  Specifies the colors in which to draw the tqshapes of this item.
+  Specifies the colors in which to draw the shapes of this item.
 
   It is advisable not to use this method, but rather set the colors
   for all items of a type with KDGanttView::setColors() in order to
   get a uniform Gantt view.
 
-  \param start the color for the start tqshape
-  \param middle the color for the middle tqshape
-  \param end the color for the end tqshape
-  \sa colors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor()
+  \param start the color for the start shape
+  \param middle the color for the middle shape
+  \param end the color for the end shape
+  \sa colors(), setShapes(), shapes(), setDefaultColor(), defaultColor()
 */
 void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle,
                                  const TQColor& end )
@@ -980,7 +980,7 @@ void KDGanttViewItem::setColors( const TQColor& start, const TQColor& middle,
   \param start returns the start color
   \param middle returns the middle color
   \param end returns the end color
-  \sa setColors(), setShapes(), tqshapes(), setDefaultColor(), defaultColor()
+  \sa setColors(), setShapes(), shapes(), setDefaultColor(), defaultColor()
 */
 void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) const
 {
@@ -992,21 +992,21 @@ void KDGanttViewItem::colors( TQColor& start, TQColor& middle, TQColor& end ) co
 
 
 /*!
-  Specifies the highlight colors in which to draw the tqshapes of this item.
+  Specifies the highlight colors in which to draw the shapes of this item.
 
   It is advisable not to use this method, but rather set the highlight
   colors for all items of a type with
   KDGanttView::setHighlightColors() in order to get a uniform Gantt
   view.
 
-  If the item displays its subitems (tqchildren) as a group,
+  If the item displays its subitems (children) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
-  \param start the highlight color for the start tqshape
-  \param middle the highlight color for the middle tqshape
-  \param end the highlight color for the end tqshape
-  \sa highlightColors(), setShapes(), tqshapes()
+  \param start the highlight color for the start shape
+  \param middle the highlight color for the middle shape
+  \param end the highlight color for the end shape
+  \sa highlightColors(), setShapes(), shapes()
 */
 void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& middle, const TQColor& end )
 {
@@ -1032,7 +1032,7 @@ void KDGanttViewItem::setHighlightColors( const TQColor& start, const TQColor& m
   \param start returns the start highlight color
   \param middle returns the middle highlight color
   \param end returns the end highlight color
-  \sa setHighlightColors(), setShapes(), tqshapes()
+  \sa setHighlightColors(), setShapes(), shapes()
 */
 void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor& end ) const
 {
@@ -1048,7 +1048,7 @@ void KDGanttViewItem::highlightColors( TQColor& start, TQColor& middle, TQColor&
   It is advisable not to use this method, but rather set the text color
   for all items with KDGanttView::setTextColor() in order to get a
   uniform Gantt view.
-  If the item displays its subitems (tqchildren) as a group,
+  If the item displays its subitems (children) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
   \param color the text color
@@ -1086,7 +1086,7 @@ TQColor KDGanttViewItem::textColor() const
 /*!
   \enum KDGanttViewItem::Shape
 
-  This enum is used in order to specify the tqshapes of a Gantt chart
+  This enum is used in order to specify the shapes of a Gantt chart
   item.
 */
 
@@ -1140,7 +1140,7 @@ const TQPixmap* KDGanttViewItem::pixmap( int column ) const
   for all items of a type with KDGanttView::setDefaultColor() in order to
   get a uniform Gantt view.
 
-  If the item displays its subitems (tqchildren) as a group,
+  If the item displays its subitems (children) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
@@ -1187,7 +1187,7 @@ TQColor KDGanttViewItem::defaultColor() const
   for all items of a type with KDGanttView::setDefaultHighlightColor()
   in order to get a uniform Gantt view.
 
-  If the item displays its subitems (tqchildren) as a group,
+  If the item displays its subitems (children) as a group,
   (displaySubitemsAsGroup() == true)
   all changes apply to all subitems as well.
 
@@ -1226,7 +1226,7 @@ TQColor KDGanttViewItem::defaultHighlightColor() const
 /*!
   Returns the first child of this item.
 
-  \return the first child of this item, 0 if this item has no tqchildren
+  \return the first child of this item, 0 if this item has no children
 */
 KDGanttViewItem* KDGanttViewItem::firstChild() const
 {
@@ -1469,10 +1469,10 @@ void KDGanttViewItem::initColorAndShapes(Type t)
     setDefaultColor( myGanttView->defaultColor(myType));
     // set default highlight color
     setDefaultHighlightColor(myGanttView->defaultHighlightColor(myType));
-    // set tqshapes
-    if (!( tqshapeDefined = (myGanttView->tqshapes(myType,myStartShape,myMiddleShape,myEndShape)))) {
+    // set shapes
+    if (!( shapeDefined = (myGanttView->shapes(myType,myStartShape,myMiddleShape,myEndShape)))) {
 
-        //qDebug("KDGantt::KDGanttViewItem created with not user defined tqshapes");
+        //qDebug("KDGantt::KDGanttViewItem created with not user defined shapes");
     };
 
     setShapes(myStartShape,myMiddleShape,myEndShape);
@@ -1486,12 +1486,12 @@ void KDGanttViewItem::initColorAndShapes(Type t)
     floatStartShape = (KDCanvasPolygonItem*)new  KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem);
     floatEndShape = (KDCanvasPolygonItem*)new  KDCanvasRectangle(myGanttView->myTimeTable,this,Type_is_KDGanttViewItem);
 
-    // set color of tqshapes
+    // set color of shapes
     if (!( colorDefined = (myGanttView->colors(myType,myStartColor,myMiddleColor,myEndColor)))) {
 
     };
     setColors(defaultColor(),defaultColor(), defaultColor());
-    // set highlight color of tqshapes
+    // set highlight color of shapes
     if (!( colorHLDefined = (myGanttView->highlightColors(myType,myStartColorHL,myMiddleColorHL,myEndColorHL)))) {
 
     };
@@ -1508,9 +1508,9 @@ void KDGanttViewItem::initColorAndShapes(Type t)
 }
 
 
-TQString KDGanttViewItem::tqshapeToString( Shape tqshape )
+TQString KDGanttViewItem::shapeToString( Shape shape )
 {
-    switch( tqshape ) {
+    switch( shape ) {
     case TriangleDown:
         return "TriangleDown";
     case TriangleUp:
@@ -1571,13 +1571,13 @@ void KDGanttViewItem::createNode( TQDomDocument& doc,
     KDGanttXML::createBoolNode( doc, itemElement, "Open", isOpen() );
     KDGanttXML::createBoolNode( doc, itemElement, "Highlight", highlight() );
     Shape startShape, middleShape, endShape;
-    tqshapes( startShape, middleShape, endShape );
+    shapes( startShape, middleShape, endShape );
     KDGanttXML::createStringNode( doc, itemElement, "StartShape",
-                             tqshapeToString( startShape ) );
+                             shapeToString( startShape ) );
     KDGanttXML::createStringNode( doc, itemElement, "MiddleShape",
-                             tqshapeToString( middleShape ) );
+                             shapeToString( middleShape ) );
     KDGanttXML::createStringNode( doc, itemElement, "EndShape",
-                             tqshapeToString( endShape ) );
+                             shapeToString( endShape ) );
     KDGanttXML::createColorNode( doc, itemElement, "DefaultColor", defaultColor() );
     TQColor startColor, middleColor, endColor;
     colors( startColor, middleColor, endColor );
@@ -1944,9 +1944,9 @@ void KDGanttViewItem::showSubitemTree( int CoordY )
 
 
 /*!
-  Returns the start time of the tqchildren of this item.
+  Returns the start time of the children of this item.
 
-  \return the start time of the tqchildren of this item
+  \return the start time of the children of this item
 */
 TQDateTime KDGanttViewItem::myChildStartTime()
 {
@@ -1978,9 +1978,9 @@ TQDateTime KDGanttViewItem::myChildStartTime()
 
 
 /*!
-  Returns the end time of the tqchildren of this item.
+  Returns the end time of the children of this item.
 
-  \return the end time of the tqchildren of this item
+  \return the end time of the children of this item
 */
 TQDateTime KDGanttViewItem::myChildEndTime()
 {
@@ -2044,7 +2044,7 @@ void KDGanttViewItem::setShowNoInformation( bool show )
 /*!
   If the name of this item is \a name (i.e., listViewText() == name),
   the pointer to this item is returned.  Otherwise, it looks for an
-  item with name \a name in the set of tqchildren and subtqchildren of
+  item with name \a name in the set of children and subchildren of
   this item.
   \param  name the name of the item
   \return the pointer to the item with name \a name
@@ -2365,37 +2365,37 @@ bool KDGanttViewItem::isCalendar( ) const
 /*!
   \var KDGanttViewItem::startShape
 
-  the tqshape at the beginning of the item
+  the shape at the beginning of the item
 */
 
 /*!
   \var KDGanttViewItem::midShape
 
-  the tqshape in the middle of the item
+  the shape in the middle of the item
 */
 
 /*!
   \var KDGanttViewItem::endShape
 
-  the tqshape at the end of the item
+  the shape at the end of the item
 */
 
 /*!
   \var KDGanttViewItem::startShapeBack
 
-  the background tqshape at the beginning of the item
+  the background shape at the beginning of the item
 */
 
 /*!
   \var KDGanttViewItem::midShapeBack
 
-  the background tqshape in the middle of the item
+  the background shape in the middle of the item
 */
 
 /*!
   \var KDGanttViewItem::endShapeBack
 
-  the background tqshape at the end of the item
+  the background shape at the end of the item
 */
 
 
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index 9e54755b..e645029d 100644
--- a/kdgantt/KDGanttViewItem.h
+++ b/kdgantt/KDGanttViewItem.h
@@ -146,7 +146,7 @@ public:
   //bool isCalendar( ) const;
 
     void setShapes( Shape start, Shape middle, Shape end );
-    void tqshapes( Shape& start, Shape& middle, Shape& end ) const;
+    void shapes( Shape& start, Shape& middle, Shape& end ) const;
     void setDefaultColor( const TQColor& );
     TQColor defaultColor() const;
     void setColors( const TQColor& start, const TQColor& middle,
@@ -202,7 +202,7 @@ private:
     friend class KDGanttViewItemDrag;
     friend class itemAttributeDialog;
 
-    static TQString tqshapeToString( Shape tqshape );
+    static TQString shapeToString( Shape shape );
     static Shape stringToShape( const TQString& string );
     static TQString typeToString( Type type );
 
@@ -242,7 +242,7 @@ private:
     bool isMyTextCanvas(TQCanvasItem *tc);
     TQPoint myTextOffset;
     TQString _name;
-    bool tqshapeDefined;
+    bool shapeDefined;
     int _priority;
     static TQDict<KDGanttViewItem> sItemDict;
 
diff --git a/kdgantt/KDGanttViewItemDrag.cpp b/kdgantt/KDGanttViewItemDrag.cpp
index 92c60201..158da041 100644
--- a/kdgantt/KDGanttViewItemDrag.cpp
+++ b/kdgantt/KDGanttViewItemDrag.cpp
@@ -63,7 +63,7 @@ KDGanttViewItemDrag::KDGanttViewItemDrag( KDGanttViewItem* item , TQWidget *sour
         pix = *(item->pixmap()) ;
     else {
         KDGanttViewItem::Shape start,  middle, end;
-        item->tqshapes( start, middle, end );
+        item->shapes( start, middle, end );
         TQColor st, mi, en;
         item->colors( st, mi, en );
         pix =item->myGanttView->getPixmap( start, st, item->myGanttView->lvBackgroundColor(), 11 );
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index 57bd2566..77bc4db7 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -792,7 +792,7 @@ void  KDTimeHeaderWidget::preparePopupMenu()
     if (flagZoomToFit)
         myPopupMenu->changeItem( 1, i18n("Zoom (Fit)"));
     else
-        myPopupMenu->changeItem( 1, i18n("Zoom (%1)").tqarg( TQString::number( zoomFactor(), 'f',3) ) );
+        myPopupMenu->changeItem( 1, i18n("Zoom (%1)").arg( TQString::number( zoomFactor(), 'f',3) ) );
     int i = 0;
     int id;
     while ( ( id = scalePopupMenu->idAt( i++ )) >= 0 ) {
@@ -1140,7 +1140,7 @@ void KDTimeHeaderWidget::zoomToSelection( TQDateTime start, TQDateTime end)
     }
     flagDoNotRepaintAfterChange = false;
     updateTimeTable();
-    tqrepaint();
+    repaint();
     moveTimeLineTo((getCoordX(start)-(viewWid-timeWid)/2));
     // Since we have disconnected autoupdate of scrollbars, we must do it ourselves
     if (myGanttView && myGanttView->myCanvasView)
@@ -2207,7 +2207,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     myGridMinorWidth = Width;
     // the width of this widget is the gridwidth * the amount of items
     Width *= minorItems;
-    // if size changed, reset tqgeometry
+    // if size changed, reset geometry
     if (width() != Width   || height() != Height  )
         {
             resize( Width, Height );
@@ -2343,7 +2343,7 @@ void KDTimeHeaderWidget::computeTicks(bool doNotComputeRealScale)
     myGanttView->myTimeTable->setBlockUpdating( block );
     updateTimeTable();
     centerDateTime(myCenterDateTime);
-    tqrepaint();
+    repaint();
 }
 
 
@@ -2489,7 +2489,7 @@ void KDTimeHeaderWidget::mouseReleaseEvent ( TQMouseEvent *  )
         //zoomToSelection( getDateTimeForIndex(start),getDateTimeForIndex(end) );
     }
     mouseDown = false;
-    tqrepaint();
+    repaint();
 }
 
 
@@ -2504,11 +2504,11 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
     if ( mouseDown ) {
         if ( e->pos().y() < -height() || e->pos().y() > 2* height() ) {
             mouseDown = false;
-            tqrepaint();
+            repaint();
             return;
         }
         endMouseDown = e->pos().x();
-        //tqrepaint;
+        //repaint;
         int val = -1;
         if (endMouseDown <  -x() ) {
             val = myGanttView->myCanvasView->horizontalScrollBar()->value() -
@@ -2661,10 +2661,10 @@ void KDLegendWidget::clearLegend ( )
 }
 
 
-void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text )
+void KDLegendWidget::addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text )
 {
     TQLabel * temp;
-    TQPixmap p = KDGanttView::getPixmap( tqshape,  tqshapeColor, TQt::white, 10);
+    TQPixmap p = KDGanttView::getPixmap( shape,  shapeColor, TQt::white, 10);
     TQWidget *w = new TQWidget( myLegend );
     w->setBackgroundColor( TQt::white );
     TQHBoxLayout *lay = new TQHBoxLayout( w ,0, 6);
@@ -2921,7 +2921,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
         if ( tx < 0 )
             tx = header()->cellPos( cell );
 
-        // do any tqchildren of current need to be painted?
+        // do any children of current need to be painted?
 /* FIXME: painting branches doesn't work for some reason...
         if ( ih != ith &&
             rootIsDecorated() &&
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index 7b553222..a2180850 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -337,7 +337,7 @@ public:
   KDLegendWidget ( TQWidget* parent, KDGanttMinimizeSplitter* legendParent );
   void showMe(bool);
   bool isShown();
-  void addLegendItem( KDGanttViewItem::Shape tqshape, const TQColor& tqshapeColor, const TQString& text );
+  void addLegendItem( KDGanttViewItem::Shape shape, const TQColor& shapeColor, const TQString& text );
   void clearLegend();
   void setFont( TQFont );
   void drawToPainter( TQPainter *p );
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index a89f2360..605cb991 100644
--- a/kdgantt/KDGanttViewTaskItem.cpp
+++ b/kdgantt/KDGanttViewTaskItem.cpp
@@ -43,7 +43,7 @@
 
   This class represents calendar items in Gantt charts.
 
-  A calendar item in a Gantt chart has no start/end tqshape,
+  A calendar item in a Gantt chart has no start/end shape,
   it is displayed as a rectangle.
   You can set the colors as usual, where only the first argument of
   setColors( col, col, col )
diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui
index a98d65a1..5a34dbb5 100644
--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@@ -462,7 +462,7 @@
                             <property name="text">
                                 <string>Text color:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
diff --git a/kdgantt/itemAttributeDialog.ui.h b/kdgantt/itemAttributeDialog.ui.h
index 3ab24af8..8624d45d 100644
--- a/kdgantt/itemAttributeDialog.ui.h
+++ b/kdgantt/itemAttributeDialog.ui.h
@@ -54,7 +54,7 @@ void itemAttributeDialog::ChangeText_clicked()
       myItem->setTextColor( c );
     TQPixmap *  pix  = (TQPixmap *)ChangeText->pixmap();
     pix->fill( myItem->textColor() );
-    ChangeText->tqrepaint();
+    ChangeText->repaint();
 }
 
 
@@ -62,7 +62,7 @@ void itemAttributeDialog::ChangeStart_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
     TQColor c = TQColorDialog::getColor( st, this );
@@ -79,7 +79,7 @@ void itemAttributeDialog::ChangeMiddle_clicked()
 {
     if ( !myItem) return;
      KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
     TQColor c = TQColorDialog::getColor( mi, this );
@@ -95,7 +95,7 @@ void itemAttributeDialog::ChangeEnd_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->colors( st, mi, en );
      TQColor c = TQColorDialog::getColor( en, this );
@@ -244,7 +244,7 @@ void itemAttributeDialog::reset( KDGanttViewItem * item )
   //  DateEdit3->setRange(item->startTime().date(), item->endTime().date().addYears(10));
     LineEdit1->setText( item->text() );
     KDGanttViewItem::Shape start,  middle, end;
-    item->tqshapes( start, middle, end );
+    item->shapes( start, middle, end );
     TQColor st, mi, en;
     item->colors( st, mi, en );
     ChangeStart->setPixmap(  KDGanttView::getPixmap( start, st, backgroundColor(), 10 )  );
@@ -272,7 +272,7 @@ void itemAttributeDialog::HighStart_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = TQColorDialog::getColor( st, this );
@@ -289,7 +289,7 @@ void itemAttributeDialog::HighMiddle_clicked()
 {
     if ( !myItem) return;
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = TQColorDialog::getColor( mi, this );
@@ -306,7 +306,7 @@ void itemAttributeDialog::HighEnd_clicked()
 {
     if ( !myItem) return;
    KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     TQColor st, mi, en;
     myItem->highlightColors( st, mi, en );
     TQColor c = TQColorDialog::getColor( en, this );
@@ -409,7 +409,7 @@ void itemAttributeDialog::LineEdit1_textChanged( const TQString & )
 void itemAttributeDialog::StartBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     start = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
@@ -419,7 +419,7 @@ void itemAttributeDialog::StartBox_activated( const TQString & s )
 void itemAttributeDialog::MiddleBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     middle = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );
@@ -430,7 +430,7 @@ void itemAttributeDialog::MiddleBox_activated( const TQString & s )
 void itemAttributeDialog::EndBox_activated( const TQString & s )
 {
     KDGanttViewItem::Shape start,  middle, end;
-    myItem->tqshapes( start, middle, end );
+    myItem->shapes( start, middle, end );
     end = KDGanttViewItem::stringToShape( s );
     myItem->setShapes( start, middle, end );
     reset( myItem );