Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

16 files changed, 59 insertions, 59 deletions

diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index 35c3eb0fb..10ef33730 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -90,7 +90,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e )
     if ( _activeButton != 0)
         return;
 
-    TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
+    TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
 		 - mouseOffset;
     if ( opaque() ) {
 	s->moveSplitter( pos, id() );
@@ -159,7 +159,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
     }
     else {
         if ( !opaque() && e->button() == Qt::LeftButton ) {
-            TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
+            TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
             s->setRubberband( -1 );
             s->moveSplitter( pos, id() );
@@ -241,8 +241,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     p.setBrush( tqcolorGroup().background() );
     p.setPen( tqcolorGroup().foreground() );
     p.drawRect( rect() );
-    tqparentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
-                                           tqparentWidget()->tqcolorGroup());
+    parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
+                                           parentWidget()->tqcolorGroup());
 
     int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size
 
@@ -256,8 +256,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         if ( index == _activeButton ) {
             p.save();
-            p.translate( tqparentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
-                         tqparentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
+            p.translate( parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
+                         parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
             p.tqdrawPolygon( *it, true );
             p.restore();
         }
@@ -962,7 +962,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
 	}
     }
     if ( empty ) {
-        if ( tqparentWidget() != 0 && tqparentWidget()->inherits("KDGanttMinimizeSplitter") ) {
+        if ( parentWidget() != 0 && parentWidget()->inherits("KDGanttMinimizeSplitter") ) {
             // nested splitters; be nice
             maxl = maxt = 0;
         } else {
@@ -1341,7 +1341,7 @@ KDGanttMinimizeSplitter::Direction KDGanttMinimizeSplitter::minimizeDirection()
 }
 
 /*
-  This is a copy of qGeomCalc() in qtqlayoutengine.cpp which
+  This is a copy of qGeomCalc() in qlayoutengine.cpp which
   unfortunately isn't exported.
 */
 static inline int toFixed( int i ) { return i * 256; }
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index db9d85360..6624a4c2a 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -691,9 +691,9 @@ void KDGanttView::setShowListView( bool show )
     if(listViewIsVisible == show) return;
     listViewIsVisible = show;
     if (listViewIsVisible)
-        myListView->tqparentWidget()->show();
+        myListView->parentWidget()->show();
     else
-        myListView->tqparentWidget()->hide();
+        myListView->parentWidget()->hide();
 }
 
 
diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp
index 9c385d46b..137c8ea3c 100644
--- a/kdgantt/KDGanttViewEventItem.cpp
+++ b/kdgantt/KDGanttViewEventItem.cpp
@@ -209,7 +209,7 @@ void KDGanttViewEventItem::hideMe()
 void KDGanttViewEventItem::showItem(bool show, int coordY)
 {
   isVisibleInGanttView = show;
-  tqinvalidateHeight () ;
+  invalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index 9c9c1e98b..ba6ad3437 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -133,7 +133,7 @@
   overlapping tqchildren, call \a setPriority() for the childs.
 
   Blocking of user interaction to open item:
-  If you want to block users to open items used as tqparents of calendar items,
+  If you want to block users to open items used as parents of calendar items,
   call \a KDGanttView::setCalendarMode( true );
 
   Example 1, Color:
@@ -182,16 +182,16 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
   Constructs an empty Gantt item.
 
   \param type the type of the item to insert
-  \param tqparentItem a tqparent item under which this one goes
+  \param parentItem a tqparent item under which this one goes
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
 
-KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* tqparentItem,
+KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* parentItem,
                                   const TQString& lvtext,
                                   const TQString& name ) :
-    TQListViewItem(tqparentItem,lvtext)
+    TQListViewItem(parentItem,lvtext)
 {
     initColorAndShapes(type);
     generateAndInsertName( name );
@@ -224,18 +224,18 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
   Constructs an empty Gantt item.
 
   \param type the type of the item to insert
-  \param tqparentItem a tqparent item under which this one goes
+  \param parentItem a tqparent item under which this one goes
   \param after another item at the same level behind which this one should go
   \param lvtext the text to show in the list view
   \param name the name by which the item can be identified. If no name
   is specified, a unique name will be generated
 */
 
-KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* tqparentItem,
+KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* parentItem,
                                   KDGanttViewItem* after,
                                   const TQString& lvtext,
                                   const TQString& name ) :
-    TQListViewItem( tqparentItem, after, lvtext )
+    TQListViewItem( parentItem, after, lvtext )
 {
     initColorAndShapes(type);
     generateAndInsertName( name );
@@ -1547,13 +1547,13 @@ KDGanttViewItem::Shape KDGanttViewItem::stringToShape( const TQString& string )
   Creates a DOM node that describes this item.
 
   \param doc the DOM document to which the node belongs
-  \param tqparentElement the element into which to insert this node
+  \param parentElement the element into which to insert this node
 */
 void KDGanttViewItem::createNode( TQDomDocument& doc,
-                                  TQDomElement& tqparentElement )
+                                  TQDomElement& parentElement )
 {
     TQDomElement itemElement = doc.createElement( "Item" );
-    tqparentElement.appendChild( itemElement );
+    parentElement.appendChild( itemElement );
     itemElement.setAttribute( "Type", typeToString( type() ) );
 
     KDGanttXML::createDateTimeNode( doc, itemElement, "StartTime", startTime() );
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index 8c29760ae..88713fb3a 100644
--- a/kdgantt/KDGanttViewItem.h
+++ b/kdgantt/KDGanttViewItem.h
@@ -174,7 +174,7 @@ public:
     static KDGanttViewItem* tqfind( const TQString& name );
 
     void createNode( TQDomDocument& doc,
-                     TQDomElement& tqparentElement );
+                     TQDomElement& parentElement );
     static KDGanttViewItem* createFromDomElement( KDGanttView* view,
                                                   TQDomElement& element );
     static KDGanttViewItem* createFromDomElement( KDGanttView* view,
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index 1c076b3ca..2b63d1b1e 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -140,13 +140,13 @@ void KDTimeTableWidget::removeItemFromTasklinks( KDGanttViewItem* item)
 
 void KDTimeTableWidget::expandItem( TQListViewItem * item)
 {
-    item->tqinvalidateHeight () ;
+    item->invalidateHeight () ;
     //tqApp->processEvents();
     updateMyContent();
 }
 void KDTimeTableWidget::collapseItem( TQListViewItem * item)
 {
-    item->tqinvalidateHeight () ;
+    item->invalidateHeight () ;
     //tqApp->processEvents();
     updateMyContent();
 }
@@ -160,7 +160,7 @@ void KDTimeTableWidget::highlightItem( TQListViewItem * item )
     highlightedItem = ( KDGanttViewItem*)item;
     itemwashighlighted = highlightedItem->highlight();
     highlightedItem->setHighlight(true);
-    item->tqinvalidateHeight () ;
+    item->invalidateHeight () ;
     myGanttView->myListView->contentsY();
     updateMyContent();
 }
@@ -2517,19 +2517,19 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
                 val = 0;
             }
         }
-        if (endMouseDown >  -x() +tqparentWidget()->width() ) {
+        if (endMouseDown >  -x() +parentWidget()->width() ) {
             val = myGanttView->myCanvasView->horizontalScrollBar()->value() +
                 myGanttView->myCanvasView->horizontalScrollBar()->lineStep();
 
         }
-        repaintMe(-x(),tqparentWidget()->width());
+        repaintMe(-x(),parentWidget()->width());
         if ( val > -1 ) {
             if ( val > myGanttView->myCanvasView->horizontalScrollBar()->maxValue() ) {
                 val = myGanttView->myCanvasView->horizontalScrollBar()->maxValue();
             }
             myGanttView->myCanvasView->horizontalScrollBar()->setValue( val );
         }
-        //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),tqparentWidget()->width() , e->pos().y());
+        //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),parentWidget()->width() , e->pos().y());
     }
 }
 
@@ -3091,62 +3091,62 @@ void KDListView::startDrag ()
 }
 
 KDCanvasText::KDCanvasText( KDTimeTableWidget* canvas,
-                            void* tqparentItem,
+                            void* parentItem,
                             int type ) :
     TQCanvasText(canvas)
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
 KDCanvasLine::KDCanvasLine( KDTimeTableWidget* canvas,
-                            void* tqparentItem,
+                            void* parentItem,
                             int type ) :
     TQCanvasLine(canvas)
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
 KDCanvasPolygonItem::KDCanvasPolygonItem( KDTimeTableWidget* canvas,
-                                          void* tqparentItem,
+                                          void* parentItem,
                                           int type ) :
     TQCanvasPolygonalItem( canvas )
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
 KDCanvasPolygon::KDCanvasPolygon( KDTimeTableWidget* canvas,
-                                  void* tqparentItem,
+                                  void* parentItem,
                                   int type ) :
     TQCanvasPolygon( canvas )
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
 KDCanvasEllipse::KDCanvasEllipse( KDTimeTableWidget* canvas,
-                                  void* tqparentItem,
+                                  void* parentItem,
                                   int type ) :
     TQCanvasEllipse( canvas )
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
 KDCanvasRectangle::KDCanvasRectangle( KDTimeTableWidget* canvas,
-                                      void* tqparentItem,
+                                      void* parentItem,
                                       int type ) :
     TQCanvasRectangle( canvas )
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index 8c0c61485..37e70a563 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -403,7 +403,7 @@ private slots:
 class KDCanvasText : public TQCanvasText
 {
 public:
-    KDCanvasText( KDTimeTableWidget* canvas, void* tqparentItem, int type );
+    KDCanvasText( KDTimeTableWidget* canvas, void* parentItem, int type );
     int myParentType;
     void* myParentItem;
 };
@@ -412,7 +412,7 @@ public:
 class KDCanvasLine : public TQCanvasLine
 {
 public:
-    KDCanvasLine( KDTimeTableWidget* canvas, void* tqparentItem, int type );
+    KDCanvasLine( KDTimeTableWidget* canvas, void* parentItem, int type );
     int myParentType;
     void* myParentItem;
 };
@@ -421,7 +421,7 @@ public:
 class KDCanvasPolygonItem: public TQCanvasPolygonalItem
 {
 public:
-    KDCanvasPolygonItem( KDTimeTableWidget* canvas, void* tqparentItem,
+    KDCanvasPolygonItem( KDTimeTableWidget* canvas, void* parentItem,
                          int type );
     int myParentType;
     void* myParentItem;
@@ -431,7 +431,7 @@ public:
 class KDCanvasPolygon: public TQCanvasPolygon
 {
 public:
-    KDCanvasPolygon( KDTimeTableWidget* canvas, void* tqparentItem, int type );
+    KDCanvasPolygon( KDTimeTableWidget* canvas, void* parentItem, int type );
     int myParentType;
     void* myParentItem;
 };
@@ -440,7 +440,7 @@ public:
 class KDCanvasEllipse: public TQCanvasEllipse
 {
 public:
-    KDCanvasEllipse( KDTimeTableWidget* canvas, void* tqparentItem, int type );
+    KDCanvasEllipse( KDTimeTableWidget* canvas, void* parentItem, int type );
     int myParentType;
     void* myParentItem;
 };
@@ -449,7 +449,7 @@ public:
 class KDCanvasRectangle: public TQCanvasRectangle
 {
 public:
-    KDCanvasRectangle( KDTimeTableWidget* canvas, void* tqparentItem, int type );
+    KDCanvasRectangle( KDTimeTableWidget* canvas, void* parentItem, int type );
     int myParentType;
     void* myParentItem;
 };
diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp
index 7237cf31e..31d21cf9d 100644
--- a/kdgantt/KDGanttViewSummaryItem.cpp
+++ b/kdgantt/KDGanttViewSummaryItem.cpp
@@ -267,7 +267,7 @@ void KDGanttViewSummaryItem::hideMe()
 void KDGanttViewSummaryItem::showItem( bool show, int coordY )
 {
   isVisibleInGanttView = show;
-  tqinvalidateHeight () ;
+  invalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index b7cc8a9dd..8154216bf 100644
--- a/kdgantt/KDGanttViewTaskItem.cpp
+++ b/kdgantt/KDGanttViewTaskItem.cpp
@@ -201,7 +201,7 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY)
 
   //qDebug("KDGanttViewTaskItem::showItem() %d %s ", (int) show, listViewText().latin1());
   isVisibleInGanttView = show;
-  tqinvalidateHeight () ;
+  invalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp
index d0aa9bd00..51ed43f58 100644
--- a/kdgantt/KDGanttViewTaskLink.cpp
+++ b/kdgantt/KDGanttViewTaskLink.cpp
@@ -732,13 +732,13 @@ TQPtrList<KDGanttViewItem> KDGanttViewTaskLink::to() const
   Creates a DOM node that describes this task link.
 
   \param doc the DOM document to which the node belongs
-  \param tqparentElement the element into which to insert this node
+  \param parentElement the element into which to insert this node
 */
 void KDGanttViewTaskLink::createNode( TQDomDocument& doc,
-                                      TQDomElement& tqparentElement )
+                                      TQDomElement& parentElement )
 {
     TQDomElement taskLinkElement = doc.createElement( "TaskLink" );
-    tqparentElement.appendChild( taskLinkElement );
+    parentElement.appendChild( taskLinkElement );
 
     TQDomElement fromItemsElement = doc.createElement( "FromItems" );
     taskLinkElement.appendChild( fromItemsElement );
diff --git a/kdgantt/KDGanttViewTaskLink.h b/kdgantt/KDGanttViewTaskLink.h
index f09e23702..ad16265b2 100644
--- a/kdgantt/KDGanttViewTaskLink.h
+++ b/kdgantt/KDGanttViewTaskLink.h
@@ -89,7 +89,7 @@ public:
     TQString whatsThisText() const;
 
     void createNode( TQDomDocument& doc,
-                     TQDomElement& tqparentElement );
+                     TQDomElement& parentElement );
     static KDGanttViewTaskLink* createFromDomElement( TQDomElement& );
 
     int linkType();
diff --git a/kdgantt/KDGanttViewTaskLinkGroup.cpp b/kdgantt/KDGanttViewTaskLinkGroup.cpp
index 5b39f4b49..c6e56c0b8 100644
--- a/kdgantt/KDGanttViewTaskLinkGroup.cpp
+++ b/kdgantt/KDGanttViewTaskLinkGroup.cpp
@@ -280,13 +280,13 @@ KDGanttViewTaskLinkGroup* KDGanttViewTaskLinkGroup::tqfind( const TQString& name
   Creates a DOM node that describes this task link group.
 
   \param doc the DOM document to which the node belongs
-  \param tqparentElement the element into which to insert this node
+  \param parentElement the element into which to insert this node
 */
 void KDGanttViewTaskLinkGroup::createNode( TQDomDocument& doc,
-                                           TQDomElement& tqparentElement )
+                                           TQDomElement& parentElement )
 {
     TQDomElement taskLinkGroupElement = doc.createElement( "TaskLink" );
-    tqparentElement.appendChild( taskLinkGroupElement );
+    parentElement.appendChild( taskLinkGroupElement );
 
     KDGanttXML::createBoolNode( doc, taskLinkGroupElement, "Highlight",
                            highlight() );
diff --git a/kdgantt/KDGanttViewTaskLinkGroup.h b/kdgantt/KDGanttViewTaskLinkGroup.h
index 56f5d2b9e..e3959089f 100644
--- a/kdgantt/KDGanttViewTaskLinkGroup.h
+++ b/kdgantt/KDGanttViewTaskLinkGroup.h
@@ -65,7 +65,7 @@ public:
     static KDGanttViewTaskLinkGroup* tqfind( const TQString& name );
 
     void createNode( TQDomDocument& doc,
-                     TQDomElement& tqparentElement );
+                     TQDomElement& parentElement );
     static KDGanttViewTaskLinkGroup* createFromDomElement( TQDomElement& );
 
     void generateAndInsertName( const TQString& name );
diff --git a/kdgantt/Makefile.am b/kdgantt/Makefile.am
index de319d12f..fe3a34ace 100644
--- a/kdgantt/Makefile.am
+++ b/kdgantt/Makefile.am
@@ -33,7 +33,7 @@ noinst_HEADERS =	\
 			KDGanttViewTaskLink.h		\
 			KDGanttXMLTools.h			\
 			itemAttributeDialog.ui.h	\
-			qlayoutengine_p.h
+			qtqlayoutengine_p.h
 
 METASOURCES = AUTO
 
diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui
index a31e0cdb0..a3616dcad 100644
--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@@ -733,5 +733,5 @@
     <slot>PrioSlider_valueChanged( int val )</slot>
     <slot returnType="KDGanttViewItem *">getItem()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h
index a071dae3e..1f03331d2 100644
--- a/kdgantt/qlayoutengine_p.h
+++ b/kdgantt/qlayoutengine_p.h
@@ -46,7 +46,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qtqlayout.cpp, qtqlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp.
+// of qtqlayout.cpp, qlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //