Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 8d79c40791fa0bcac4d4ce1dc7385b19e523ba08)

14 files changed, 20 insertions, 20 deletions

diff --git a/tdeui/karrowbutton.cpp b/tdeui/karrowbutton.cpp
index b1ecc4c88..c02e4a028 100644
--- a/tdeui/karrowbutton.cpp
+++ b/tdeui/karrowbutton.cpp
@@ -63,7 +63,7 @@ void KArrowButton::drawButton(TQPainter *p)
 	const unsigned int margin = 2;
 	
         p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
-	style().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
+	style().drawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
 			       colorGroup(), 
 			       isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default,
 			       TQStyleOption( 2, 0 ) );
@@ -103,7 +103,7 @@ void KArrowButton::drawButton(TQPainter *p)
 	int flags = TQStyle::Style_Enabled;
 	if ( isDown() )
 		flags |= TQStyle::Style_Down;
-	style().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
+	style().drawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
 			       colorGroup(), flags );
 }
 
diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp
index a4cc92791..76ec10bf2 100644
--- a/tdeui/kcharselect.cpp
+++ b/tdeui/kcharselect.cpp
@@ -173,7 +173,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
     }
 
     if ( c == focusItem.unicode() && hasFocus() ) {
-	style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), 
+	style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), 
 			       colorGroup() );
 	focusPos = TQPoint( col, row );
     }
diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp
index 37ab8a111..bebedf6c9 100644
--- a/tdeui/kcolorbutton.cpp
+++ b/tdeui/kcolorbutton.cpp
@@ -126,13 +126,13 @@ void KColorButton::drawButtonLabel( TQPainter *painter )
 
   if ( hasFocus() ) {
     TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this );
-    style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
+    style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
   }
 }
 
 TQSize KColorButton::sizeHint() const
 {
-  return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
+  return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
 	  	expandedTo(TQApplication::globalStrut());
 }
 
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index a6dffca89..3d57d5a3f 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -507,7 +507,7 @@ KDatePicker::setFontSize(int s)
       maxMonthRect.setHeight(TQMAX(r.height(),  maxMonthRect.height()));
     }
 
-  TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton,
+  TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton,
                                                selectMonth,
                                                maxMonthRect);
   selectMonth->setMinimumSize(metricBound);
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index d423ea161..7e5e6bd64 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
 
   paint.begin( this );
 
-  style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
+  style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
 
   paint.end();
 }
@@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
 	TQWidget::paintEvent(pe);
         TQPainter paint;
         paint.begin( this );
-        style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
+        style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
         paint.end();
 }
 
diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp
index 647f62ba5..f97a54080 100644
--- a/tdeui/kseparator.cpp
+++ b/tdeui/kseparator.cpp
@@ -95,7 +95,7 @@ void KSeparator::drawFrame(TQPainter *p)
    }
 
    TQStyleOption opt( lineWidth(), midLineWidth() );
-   style().tqdrawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g,
+   style().drawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g,
 		          TQStyle::Style_Sunken, opt );
 }
 
diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp
index 3091092f5..0ed7241dd 100644
--- a/tdeui/kstdguiitem.cpp
+++ b/tdeui/kstdguiitem.cpp
@@ -199,7 +199,7 @@ KGuiItem KStdGuiItem::forward( BidiMode useBidi )
 
 TQPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward()
 {
-    return tqMakePair( back( UseRTL ), forward( UseRTL ) );
+    return qMakePair( back( UseRTL ), forward( UseRTL ) );
 }
 
 KGuiItem KStdGuiItem::print()
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index a6f14d2a2..10ed6ae76 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -190,7 +190,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
         int iw = 0;
         if ( tab->iconSet() )
           iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
-        x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this,
+        x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this,
                    TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
                    TQStyleOption( tab ) ) ).width();
     }
diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index 754871c17..c87695e68 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -367,7 +367,7 @@ bool KURLLabel::event (TQEvent *e)
     if (result && hasFocus()) {
         TQPainter p(this);
         TQRect r( activeRect() );
-        style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
+        style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
     }
     return result;
   }
diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp
index ce7f530be..4935bf566 100644
--- a/tdeui/tdelistview.cpp
+++ b/tdeui/tdelistview.cpp
@@ -1399,7 +1399,7 @@ TQRect TDEListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item
     r = itemRect(item);
     r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize());
     if (painter)
-      style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
+      style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
                             TQStyle::Style_FocusAtBorder, colorGroup().highlight());
   }
 
@@ -2152,7 +2152,7 @@ void TDEListView::viewportPaintEvent(TQPaintEvent *e)
       TQPainter painter(viewport());
 
       // This is where we actually draw the drop-highlighter
-      style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
+      style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
                             TQStyle::Style_FocusAtBorder);
     }
   d->painting = false;
diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp
index 6110667f9..453a3e41f 100644
--- a/tdeui/tdepopupmenu.cpp
+++ b/tdeui/tdepopupmenu.cpp
@@ -86,7 +86,7 @@ void TDEPopupTitle::paintEvent(TQPaintEvent *)
 {
     TQRect r(rect());
     TQPainter p(this);
-    kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
+    kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
 
     if (!miniicon.isNull())
         p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon);
diff --git a/tdeui/tdeselect.cpp b/tdeui/tdeselect.cpp
index 9d1a898fd..3d453f01e 100644
--- a/tdeui/tdeselect.cpp
+++ b/tdeui/tdeselect.cpp
@@ -122,7 +122,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
 	TQPainter painter;
 	painter.begin( this );
 
-	style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, 
+	style().drawPrimitive(TQStyle::PE_Panel, &painter, 
 			      borderRect, colorGroup(), 
 			      TQStyle::Style_Sunken);
 
@@ -281,7 +281,7 @@ void TDESelector::paintEvent( TQPaintEvent * )
 			r.addCoords(0, iw - w, -iw, w - iw);
 		else
 			r.addCoords(iw - w, 0, w - iw, -iw);
-		style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, 
+		style().drawPrimitive(TQStyle::PE_Panel, &painter, 
 			r, colorGroup(), 
 			TQStyle::Style_Sunken);
 	}
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 039c483d8..651e789a9 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -170,7 +170,7 @@ void TDEToolBarSeparator::drawContents( TQPainter* p )
         if ( orientation() == TQt::Horizontal )
             flags = flags | TQStyle::Style_Horizontal;
 
-        style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p,
+        style().drawPrimitive(TQStyle::PE_DockWindowSeparator, p,
                               contentsRect(), colorGroup(), flags);
     } else {
         TQFrame::drawContents(p);
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index 9e3313de3..854ad2f9b 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -251,7 +251,7 @@ void TDEToolBarButton::modeChange()
     break;
   }
 
-  mysize = style().tqsizeFromContents(TQStyle::CT_ToolButton, this, mysize).
+  mysize = style().sizeFromContents(TQStyle::CT_ToolButton, this, mysize).
                expandedTo(TQApplication::globalStrut());
 
   // make sure that this isn't taller then it is wide
@@ -628,7 +628,7 @@ void TDEToolBarButton::drawButton( TQPainter *_painter )
     if (isDown())	arrowFlags |= TQStyle::Style_Down;
     if (isEnabled()) 	arrowFlags |= TQStyle::Style_Enabled;
 
-      style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
+      style().drawPrimitive(TQStyle::PE_ArrowDown, _painter,
           TQRect(width()-7, height()-7, 7, 7), colorGroup(),
 	  arrowFlags, TQStyleOption() );
   }