4 files changed, 6 insertions, 6 deletions
diff --git a/chalk/core/kis_boundary.cpp b/chalk/core/kis_boundary.cpp
index a15697a7..b56795b6 100644
--- a/chalk/core/kis_boundary.cpp
+++ b/chalk/core/kis_boundary.cpp
@@ -52,7 +52,7 @@ void KisBoundary::generateBoundary(int w, int h) {
             darkBot = cs->getAlpha(botIt.rawData());
             if (darkTop != darkBot) {
                 // detected a change
-                m_horSegments.back().append(tqMakePair(KisPoint(botIt.x(), botIt.y()), 1));
+                m_horSegments.back().append(qMakePair(KisPoint(botIt.x(), botIt.y()), 1));
             }
             ++topIt;
             ++botIt;
@@ -73,7 +73,7 @@ void KisBoundary::generateBoundary(int w, int h) {
             darkRight = cs->getAlpha(rightIt.rawData());
             if (darkLeft != darkRight) {
                 // detected a change
-                m_vertSegments.back().append(tqMakePair(KisPoint(rightIt.x(), rightIt.y()), 1));
+                m_vertSegments.back().append(qMakePair(KisPoint(rightIt.x(), rightIt.y()), 1));
             }
             ++leftIt;
             ++rightIt;
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index 268a24d8..a05ce3e2 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -161,7 +161,7 @@ void RegionGrabber::drawRubber()
   p.setPen( TQPen( color0, 1 ) );
   p.setBrush( NoBrush );
 
-  style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
+  style().drawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
       TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) );
 
   p.end();
diff --git a/chalk/ui/kis_color_cup.cpp b/chalk/ui/kis_color_cup.cpp
index 198cb01f..751cfdda 100644
--- a/chalk/ui/kis_color_cup.cpp
+++ b/chalk/ui/kis_color_cup.cpp
@@ -83,7 +83,7 @@ void KisColorCup::slotClicked()
 
 TQSize KisColorCup::sizeHint() const
 {
-    return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
+    return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
             expandedTo(TQApplication::globalStrut());
 }
 
@@ -110,7 +110,7 @@ void KisColorCup::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() );
     }
 
 }
diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp
index d0cd8825..6656e35d 100644
--- a/chalk/ui/squeezedcombobox.cpp
+++ b/chalk/ui/squeezedcombobox.cpp
@@ -98,7 +98,7 @@ TQSize SqueezedComboBox::sizeHint() const
     int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18;
     int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2;
 
-    return style().tqsizeFromContents(TQStyle::CT_ComboBox, this,
+    return style().sizeFromContents(TQStyle::CT_ComboBox, this,
     TQSize(maxW, maxH)).
             expandedTo(TQApplication::globalStrut());
 }