rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

15 files changed, 51 insertions, 51 deletions

diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h
index f69fe2a1..8d6a24f6 100644
--- a/chalk/plugins/filters/cimg/CImg.h
+++ b/chalk/plugins/filters/cimg/CImg.h
@@ -5144,7 +5144,7 @@ namespace cimg_library {
      
      \par Image structure
 
-     The \ref CImg<\c T> structure tqcontains \a five fields :
+     The \ref CImg<\c T> structure contains \a five fields :
      - \ref width defines the number of \a columns of the image (size along the X-axis).
      - \ref height defines the number of \a rows of the image (size along the Y-axis).
      - \ref depth defines the number of \a slices of the image (size along the Z-axis).
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
index d89db6ae..e9280425 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
@@ -87,7 +87,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s )
                 curve.clear(); // XXX TQPtrList, sure I won't leak stuff here?
                 for (TQStringList::Iterator it = pairStart; it != pairEnd; ++it) {
                     TQString pair = * it;
-                    if (pair.tqfind(",") > -1) {
+                    if (pair.find(",") > -1) {
                         TQPair<double,double> *p = new TQPair<double,double>;
                         p->first = pair.section(",", 0, 0).toDouble();
                         p->second = pair.section(",", 1, 1).toDouble();
diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
index 5c5a1b2c..1eaa1417 100644
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
@@ -86,7 +86,7 @@ curvesElement.text() );
                         TQStringList::Iterator pairEnd = data.end();
                         for (TQStringList::Iterator it = pairStart; it != pairEnd; ++it) {
                             TQString pair = * it;
-                            if (pair.tqfind(",") > -1) {
+                            if (pair.find(",") > -1) {
                                 TQPair<double,double> *p = new TQPair<double,double>;
                                 p->first = pair.section(",", 0, 0).toDouble();
                                 p->second = pair.section(",", 1, 1).toDouble();
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
index fc96b991..a658b863 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
@@ -159,7 +159,7 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const TQRect& b
 
     while (!it.isDone()) {
 
-        if (bounds.tqcontains(it.x(), it.y())) {
+        if (bounds.contains(it.x(), it.y())) {
 
 // XXX: COLORSPACE_INDEPENDENCE
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
index 32dbcf9d..b238e746 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
@@ -104,7 +104,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e)
 
         TQPoint pos = TQPoint(e->pos().floorX(), e->pos().floorY());
 
-        if (!img->bounds().tqcontains(pos)) {
+        if (!img->bounds().contains(pos)) {
             return;
         }
 
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
index 1e2b82c5..5a919771 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
@@ -151,7 +151,7 @@ void KisToolFill::buttonRelease(KisButtonReleaseEvent *e)
     int x, y;
     x = m_startPos.floorX();
     y = m_startPos.floorY();
-    if (!m_currentImage->bounds().tqcontains(x, y)) {
+    if (!m_currentImage->bounds().contains(x, y)) {
         return;
     }
     flood(x, y);
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
index 30709fd7..0d7d9728 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
@@ -818,7 +818,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         endy=start.y();
     }
 
-    if ( toTQRect ( startx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    if ( toTQRect ( startx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -827,7 +827,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return UpperLeft;
     }
-    else if ( toTQRect ( startx - m_handleSize / 2.0, endy -  m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( startx - m_handleSize / 2.0, endy -  m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -836,7 +836,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return LowerLeft;
     }
-    else if ( toTQRect ( endx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( endx - m_handleSize / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -845,7 +845,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return UpperRight;
     }
-    else if ( toTQRect ( endx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( endx - m_handleSize / 2.0, endy - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -854,7 +854,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return LowerRight;
     }
-    else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, starty - m_handleSize / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -862,7 +862,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return Upper;
     }
-    else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, endy - m_handleSize / 2, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( startx + ( endx - startx - m_handleSize ) / 2.0, endy - m_handleSize / 2, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -870,7 +870,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return Lower;
     }
-    else if ( toTQRect ( startx - m_handleSize / 2.0, starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( startx - m_handleSize / 2.0, starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -878,7 +878,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return Left;
     }
-    else if ( toTQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( endx - m_handleSize / 2.0 , starty + ( endy - starty - m_handleSize ) / 2.0, m_handleSize, m_handleSize ).contains( currentViewPoint ) )
     {
         if( !m_selecting )
         {
@@ -886,7 +886,7 @@ TQ_INT32 KisToolCrop::mouseOnHandle(TQPoint currentViewPoint)
         }
         return Right;
     }
-    else if ( toTQRect ( startx , starty, endx - startx , endy - starty ).tqcontains( currentViewPoint ) )
+    else if ( toTQRect ( startx , starty, endx - startx , endy - starty ).contains( currentViewPoint ) )
     {
         return Inside;
     }
diff --git a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc b/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
index 416d3bfd..8a9b4c88 100644
--- a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
+++ b/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
@@ -79,12 +79,12 @@ KisCurve KisCurve::selectedPivots(bool selected)
 
 KisCurve KisCurve::subCurve(const KisPoint& tend)
 {
-    return subCurve(tqfind(tend).previousPivot(),tqfind(tend));
+    return subCurve(find(tend).previousPivot(),find(tend));
 }
 
 KisCurve KisCurve::subCurve(const CurvePoint& tend)
 {
-    return subCurve(tqfind(tend).previousPivot(),tqfind(tend));
+    return subCurve(find(tend).previousPivot(),find(tend));
 }
 
 KisCurve KisCurve::subCurve(iterator tend)
@@ -94,12 +94,12 @@ KisCurve KisCurve::subCurve(iterator tend)
 
 KisCurve KisCurve::subCurve(const KisPoint& tstart, const KisPoint& tend)
 {
-    return subCurve(tqfind(tstart),tqfind(tend));
+    return subCurve(find(tstart),find(tend));
 }
 
 KisCurve KisCurve::subCurve(const CurvePoint& tstart, const CurvePoint& tend)
 {
-    return subCurve(tqfind(tstart),tqfind(tend));
+    return subCurve(find(tstart),find(tend));
 }
 
 KisCurve KisCurve::subCurve(iterator tstart, iterator tend)
@@ -137,7 +137,7 @@ KisCurve::iterator KisCurve::deleteCurve (const KisPoint& pos1, const KisPoint&
 
 KisCurve::iterator KisCurve::deleteCurve (const CurvePoint& pos1, const CurvePoint& pos2)
 {
-    return deleteCurve (tqfind(pos1),tqfind(pos2));
+    return deleteCurve (find(pos1),find(pos2));
 }
 
 KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::iterator pos2)
@@ -154,12 +154,12 @@ KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::ite
 
 KisCurve::iterator KisCurve::selectPivot(const KisPoint& pt, bool isSelected)
 {
-    return selectPivot(tqfind(CurvePoint(pt,true)),isSelected);
+    return selectPivot(find(CurvePoint(pt,true)),isSelected);
 }
 
 KisCurve::iterator KisCurve::selectPivot(const CurvePoint& pt, bool isSelected)
 {
-    return selectPivot(tqfind(pt),isSelected);
+    return selectPivot(find(pt),isSelected);
 }
 
 KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected)
@@ -171,7 +171,7 @@ KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected)
     }
     KisCurve selected = pivots();
     for (iterator i = selected.begin(); i != selected.end(); i++)
-        (*tqfind((*i))).setSelected(sel);
+        (*find((*i))).setSelected(sel);
     (*it).setSelected(isSelected);
 
     return it;
@@ -184,7 +184,7 @@ KisCurve::iterator KisCurve::movePivot(const KisPoint& oldPt, const KisPoint& ne
 
 KisCurve::iterator KisCurve::movePivot(const CurvePoint& oldPt, const KisPoint& newPt)
 {
-    return movePivot(tqfind(oldPt), newPt);
+    return movePivot(find(oldPt), newPt);
 }
 
 KisCurve::iterator KisCurve::movePivot(KisCurve::iterator it, const KisPoint& newPt)
@@ -213,7 +213,7 @@ void KisCurve::deletePivot (const KisPoint& pt)
 
 void KisCurve::deletePivot (const CurvePoint& pt)
 {
-    deletePivot(tqfind(pt));
+    deletePivot(find(pt));
 }
 
 void KisCurve::deletePivot (KisCurve::iterator it)
diff --git a/chalk/plugins/tools/tool_curves/kis_curve_framework.h b/chalk/plugins/tools/tool_curves/kis_curve_framework.h
index c27369aa..614d51ff 100644
--- a/chalk/plugins/tools/tool_curves/kis_curve_framework.h
+++ b/chalk/plugins/tools/tool_curves/kis_curve_framework.h
@@ -130,10 +130,10 @@ public:
     iterator begin() const;
     iterator lastIterator() const;
     iterator end() const;
-    iterator tqfind(const CurvePoint& pt);
-    iterator tqfind(const KisPoint& pt);
-    iterator tqfind(iterator it, const CurvePoint& pt);
-    iterator tqfind(iterator it, const KisPoint& pt);
+    iterator find(const CurvePoint& pt);
+    iterator find(const KisPoint& pt);
+    iterator find(iterator it, const CurvePoint& pt);
+    iterator find(iterator it, const KisPoint& pt);
     
     KisCurve pivots();
     KisCurve selectedPivots(bool = true);
@@ -312,34 +312,34 @@ inline KisCurve::iterator KisCurve::end() const
     return iterator(*this,m_curve.end());
 }
 
-inline KisCurve::iterator KisCurve::tqfind (const CurvePoint& pt)
+inline KisCurve::iterator KisCurve::find (const CurvePoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(pt));
+    return iterator(*this,m_curve.find(pt));
 }
 
-inline KisCurve::iterator KisCurve::tqfind (const KisPoint& pt)
+inline KisCurve::iterator KisCurve::find (const KisPoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(CurvePoint(pt)));
+    return iterator(*this,m_curve.find(CurvePoint(pt)));
 }
 
-inline KisCurve::iterator KisCurve::tqfind (KisCurve::iterator it, const CurvePoint& pt)
+inline KisCurve::iterator KisCurve::find (KisCurve::iterator it, const CurvePoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(it.position(),pt));
+    return iterator(*this,m_curve.find(it.position(),pt));
 }
 
-inline KisCurve::iterator KisCurve::tqfind (iterator it, const KisPoint& pt)
+inline KisCurve::iterator KisCurve::find (iterator it, const KisPoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(it.position(),CurvePoint(pt)));
+    return iterator(*this,m_curve.find(it.position(),CurvePoint(pt)));
 }
 
 inline void KisCurve::calculateCurve(const KisPoint& start, const KisPoint& end, KisCurve::iterator it)
 {
-    calculateCurve(tqfind(CurvePoint(start)),tqfind(CurvePoint(end)),it);
+    calculateCurve(find(CurvePoint(start)),find(CurvePoint(end)),it);
 }
 
 inline void KisCurve::calculateCurve(const CurvePoint& start, const CurvePoint& end, KisCurve::iterator it)
 {
-    calculateCurve(tqfind(start),tqfind(end),it);
+    calculateCurve(find(start),find(end),it);
 }
 
 inline void KisCurve::calculateCurve(KisCurve::iterator, KisCurve::iterator, KisCurve::iterator)
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
index e3baf49c..e18b096c 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
@@ -289,7 +289,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos)
             continue;
         if (hint == BEZIERENDHINT && (m_actionOptions & SHIFTOPTION))
             continue;
-        if (pivotRect(qpos).tqcontains(pos)) {
+        if (pivotRect(qpos).contains(pos)) {
             inHandle.pushPoint((*it));
             if (hint == BEZIERENDHINT && !(m_actionOptions & SHIFTOPTION))
                 break;
@@ -300,7 +300,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos)
     if (inHandle.isEmpty())
         return m_curve->end();
 
-    return m_curve->tqfind(inHandle.last());
+    return m_curve->find(inHandle.last());
 }
 
 KisCurve::iterator KisToolBezier::drawPoint (KisCanvasPainter& gc, KisCurve::iterator point)
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
index f98d2c72..08becf67 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
@@ -124,7 +124,7 @@ void KisToolCurve::buttonPress(KisButtonPressEvent *event)
             m_curve->selectAll(false);
             draw(true, true);
             draw(m_curve->end());
-            m_previous = m_curve->tqfind(m_curve->last());
+            m_previous = m_curve->find(m_curve->last());
             m_current = m_curve->pushPivot(event->pos());
             if (m_curve->pivots().count() > 1)
                 m_curve->calculateCurve(m_previous,m_current,m_current);
@@ -158,7 +158,7 @@ void KisToolCurve::keyPress(TQKeyEvent *event)
         draw(false);
         m_dragging = false;
         m_curve->deleteSelected();
-        m_current = m_curve->tqfind(m_curve->last());
+        m_current = m_curve->find(m_curve->last());
         m_previous = m_curve->selectPivot(m_current);
         draw(false);
     }
@@ -250,12 +250,12 @@ KisCurve::iterator KisToolCurve::handleUnderMouse(const TQPoint& pos)
     KisCurve pivs = m_curve->pivots(), inHandle;
     KisCurve::iterator it;
     for (it = pivs.begin(); it != pivs.end(); it++) {
-        if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).tqcontains(pos))
+        if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).contains(pos))
             inHandle.pushPoint((*it));
     }
     if (inHandle.isEmpty())
         return m_curve->end();
-    return m_curve->tqfind(inHandle.last());
+    return m_curve->find(inHandle.last());
 }
 
 KisCurve::iterator KisToolCurve::selectByMouse(KisCurve::iterator it)
@@ -344,8 +344,8 @@ void KisToolCurve::draw(KisCurve::iterator inf, bool pivotonly, bool minimal)
                 return;
             }
             for (KisCurve::iterator i = sel.begin(); i != sel.end(); i++) {
-                it = m_curve->tqfind(*i).previousPivot();
-                finish = m_curve->tqfind(*i).nextPivot();
+                it = m_curve->find(*i).previousPivot();
+                finish = m_curve->find(*i).nextPivot();
                 if ((*finish).isSelected())
                     finish = finish.previousPivot();
                 while (it != finish) {
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
index 3a21e72e..061db881 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
@@ -97,7 +97,7 @@ void KisToolPerspectiveGrid::update (KisCanvasSubject *subject)
 
 bool KisToolPerspectiveGrid::mouseNear(const TQPoint& mousep, const TQPoint point)
 {
-    return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).tqcontains(mousep) );
+    return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).contains(mousep) );
 }
 
 void KisToolPerspectiveGrid::buttonPress(KisButtonPressEvent *event)
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
index 809d1a7d..dbcfd74c 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
@@ -240,7 +240,7 @@ void KisToolPerspectiveTransform::paint(KisCanvasPainter& gc, const TQRect& rc)
 
 bool KisToolPerspectiveTransform::mouseNear(const TQPoint& mousep, const TQPoint point)
 {
-    return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).tqcontains(mousep) );
+    return (TQRect( (point.x() - m_handleHalfSize), (point.y() - m_handleHalfSize), m_handleSize, m_handleSize).contains(mousep) );
 }
 
 void KisToolPerspectiveTransform::buttonPress(KisButtonPressEvent *event)
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
index 207c86c3..15e21400 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
@@ -133,7 +133,7 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, TQ_INT32
         {
             TQRect shadowBounds = shadowDev->exactBounds();
 
-            if (!image->bounds().tqcontains(shadowBounds)) {
+            if (!image->bounds().contains(shadowBounds)) {
 
                 TQRect newImageSize = image->bounds() | shadowBounds;
                 image->resize(newImageSize.width(), newImageSize.height());
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index 1d3a451d..f4511554 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -60,7 +60,7 @@ void SizeTip::positionTip( const TQRect &rect )
     TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) );
 
     tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
-    if ( !rect.tqcontains( tipRect, true ) && rect.intersects( tipRect ) )
+    if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )
       tipRect.moveBottomRight( tqgeometry().bottomRight() );
   }