Rename obsolete tq methods to standard names

4 files changed, 13 insertions, 13 deletions

diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index 70a22c709..66d711971 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -243,7 +243,7 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     p.setBrush( colorGroup().background() );
     p.setPen( colorGroup().foreground() );
     p.drawRect( rect() );
-    parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
+    parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
                                            parentWidget()->colorGroup());
 
     int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size
@@ -258,8 +258,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         if ( index == _activeButton ) {
             p.save();
-            p.translate( parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
-                         parentWidget()->tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical ) );
+            p.translate( parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
+                         parentWidget()->style().pixelMetric( TQStyle::PM_ButtonShiftVertical ) );
             p.drawPolygon( *it, true );
             p.restore();
         }
@@ -563,7 +563,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
     paint.setRasterOp( XorROP );
     TQRect r = contentsRect();
     const int rBord = 3; //Themable????
-    int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this);
+    int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
     if ( orient ==Qt::Horizontal ) {
 	if ( opaqueOldPos >= 0 )
 	    paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
@@ -603,7 +603,7 @@ bool KDGanttMinimizeSplitter::event( TQEvent *e )
 void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p,
 			      TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h )
 {
-    tqstyle().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(),
+    style().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(),
 			  (orientation() == Qt::Horizontal ?
 			   TQStyle::Style_Horizontal : 0));
 }
@@ -634,7 +634,7 @@ int KDGanttMinimizeSplitter::idAfter( TQWidget* w ) const
   close as possible to position \a p, which is the distance from the
   left (or top) edge of the widget.
 
-  For Arabic and Hebrew the tqlayout is reversed, and using this
+  For Arabic and Hebrew the layout is reversed, and using this
   function to set the position of the splitter might lead to
   unexpected results, since in Arabic and Hebrew the position of
   splitter one is to the left of the position of splitter zero.
@@ -839,7 +839,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
     }
     TQRect r = contentsRect();
     if ( orient ==Qt::Horizontal && TQApplication::reverseLayout() ) {
-	int splitterWidth = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this);
+	int splitterWidth = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
 	if ( min )
 	    *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth;
 	if ( max )
@@ -1231,7 +1231,7 @@ bool KDGanttMinimizeSplitter::isHidden( TQWidget *w ) const
   splitter.
 
   Giving the values to another splitter's setSizes() function will
-  produce a splitter with the same tqlayout as this one.
+  produce a splitter with the same layout as this one.
 
   Note that if you want to iterate over the list, you should
   iterate over a copy, e.g.
@@ -1311,7 +1311,7 @@ void KDGanttMinimizeSplitter::processChildEvents()
 
 void KDGanttMinimizeSplitter::styleChange( TQStyle& old )
 {
-    int sw = tqstyle().pixelMetric(TQStyle::PM_SplitterWidth, this);
+    int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this);
     KDGanttSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
 	if ( s->isSplitter )
diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp
index 8fa33775f..b51507f9d 100644
--- a/kdgantt/KDGanttSemiSizingControl.cpp
+++ b/kdgantt/KDGanttSemiSizingControl.cpp
@@ -258,7 +258,7 @@ void KDGanttSemiSizingControl::init()
 
 void KDGanttSemiSizingControl::setup()
 {
-    //-------------------------------------------------- Setup tqlayout
+    //-------------------------------------------------- Setup layout
     delete _layout;
     TQBoxLayout* butLayout; // _layout will delete me
 
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index a1499a847..4163fef13 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -4236,7 +4236,7 @@ TQColor KDGanttView::legendHeaderBackgroundColor () const
   may add as many widgets as you want. They are ordered horizontally
   from left to right.  To remove a widget from the spacer widget, call
   widget->reparent(newParent,...) or delete the widget.  Since the spacer
-  is a TQHBox, the tqlayout of the added widgets is managed by this
+  is a TQHBox, the layout of the added widgets is managed by this
   TQHBox.
 
   \param w A pointer to the widget to be added.
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index e1cedba6f..2bcbe5ae7 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -2664,7 +2664,7 @@ void KDLegendWidget::clearLegend ( )
     myLegend->setFont( font() );
     scroll->addChild(  myLegend );
     scroll->setResizePolicy( TQScrollView::AutoOneFit );
-    myLegend->tqlayout()->setMargin( 11 );
+    myLegend->layout()->setMargin( 11 );
     myLegend->setFrameStyle( TQFrame::NoFrame );
     if ( dock )
         scroll->setMaximumHeight( 32000 );
@@ -2896,7 +2896,7 @@ void KDListView::drawAllContents(TQPainter * p, int cx, int cy, int cw, int ch)
             c = fc;
             // draw to last interesting column
 
-            const TQColorGroup &cg = ( tqpalette().inactive() );
+            const TQColorGroup &cg = ( palette().inactive() );
 
             while ( c < lc && !drawables.isEmpty() ) {
                 int i = header()->mapToLogical( c );