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

22 files changed, 69 insertions, 69 deletions

diff --git a/kivio/LICENSE b/kivio/LICENSE
index 73901f58..ebb24a85 100644
--- a/kivio/LICENSE
+++ b/kivio/LICENSE
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which tqcontains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/kivio/kivio.spec b/kivio/kivio.spec
index 70171536..09cc47a8 100644
--- a/kivio/kivio.spec
+++ b/kivio/kivio.spec
@@ -38,9 +38,9 @@ make
 make prefix=$RPM_BUILD_ROOT%{prefix} install
 
 cd $RPM_BUILD_ROOT
-tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
-tqfind . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
-tqfind . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
+find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
+find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
+find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index f30b256e..778ea2b9 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -927,17 +927,17 @@ KivioStencilSpawner* KivioDoc::findStencilSpawner( const TQString& setId, const
     KivioStencilSpawnerSet *pSpawnerSet = m_pLstSpawnerSets->first();
     while( pSpawnerSet )
     {
-        if( pSpawnerSet->id() == setId && pSpawnerSet->tqfind(stencilId) )
+        if( pSpawnerSet->id() == setId && pSpawnerSet->find(stencilId) )
         {
-            return pSpawnerSet->tqfind(stencilId);
-	    // return pSpawnerSet->tqfind(name)
+            return pSpawnerSet->find(stencilId);
+	    // return pSpawnerSet->find(name)
         }
         pSpawnerSet = m_pLstSpawnerSets->next();
     }
 
-    if( m_pInternalSet->id() == setId && m_pInternalSet->tqfind(stencilId) )
+    if( m_pInternalSet->id() == setId && m_pInternalSet->find(stencilId) )
     {
-        return m_pInternalSet->tqfind(stencilId);
+        return m_pInternalSet->find(stencilId);
     }
 
     return NULL;
@@ -945,7 +945,7 @@ KivioStencilSpawner* KivioDoc::findStencilSpawner( const TQString& setId, const
 
 KivioStencilSpawner* KivioDoc::findInternalStencilSpawner( const TQString& stencilId )
 {
-    return m_pInternalSet->tqfind(stencilId);
+    return m_pInternalSet->find(stencilId);
 }
 
 void KivioDoc::addInternalStencilSpawner(KivioStencilSpawner* spawner)
diff --git a/kivio/kiviopart/kivio_map.cpp b/kivio/kiviopart/kivio_map.cpp
index d2cecdba..18914650 100644
--- a/kivio/kiviopart/kivio_map.cpp
+++ b/kivio/kiviopart/kivio_map.cpp
@@ -51,14 +51,14 @@ KivioMap::~KivioMap()
 
 void KivioMap::takePage( KivioPage* page )
 {
-    int pos=m_lstPages.tqfindRef(page);
+    int pos=m_lstPages.findRef(page);
     m_lstPages.take( pos );
     m_lstDeletedPages.append( page );
 }
 
 void KivioMap::insertPage( KivioPage* page )
 {
-    int pos=m_lstDeletedPages.tqfindRef(page);
+    int pos=m_lstDeletedPages.findRef(page);
     if ( pos != -1 )
         m_lstDeletedPages.take( pos);
     m_lstPages.append(page);
@@ -74,8 +74,8 @@ void KivioMap::movePage( const TQString& fromPageName, const TQString& toPageNam
   KivioPage* pagefrom = findPage(fromPageName);
   KivioPage* pageto = findPage(toPageName);
 
-  int from = m_lstPages.tqfind(pagefrom);
-  int to = m_lstPages.tqfind(pageto);
+  int from = m_lstPages.find(pagefrom);
+  int to = m_lstPages.find(pageto);
   if (!before)
     ++to;
 
diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp
index 6e799f93..0b60344b 100644
--- a/kivio/kiviopart/kivio_page.cpp
+++ b/kivio/kiviopart/kivio_page.cpp
@@ -130,7 +130,7 @@ KivioPage::~KivioPage()
   delete m_dcop;
 }
 
-KivioPage* KivioPage::tqfind( int _id )
+KivioPage* KivioPage::find( int _id )
 {
   if ( !s_mapPages )
     return 0L;
@@ -306,7 +306,7 @@ bool KivioPage::loadXML( const TQDomElement& pageE )
        kdDebug(43000) << "KivioLayer::loadXML() - loading layer connections" << endl;
        pLayer->searchForConnections(this);
 
-       m_lstLayers.tqfind( pLayerBak );
+       m_lstLayers.find( pLayerBak );
 
        pLayer = m_lstLayers.next();
     }
@@ -560,7 +560,7 @@ void KivioPage::selectStencil( KivioStencil *pStencil )
   }
 
   // Don't allow reselection
-  if(m_lstSelection.tqfindRef(pStencil) != -1) {
+  if(m_lstSelection.findRef(pStencil) != -1) {
     return;
   }
 
@@ -631,7 +631,7 @@ void KivioPage::unselectAllStencils()
 
 bool KivioPage::isStencilSelected(KivioStencil *pStencil)
 {
-  return m_lstSelection.tqfindRef( pStencil ) == -1;
+  return m_lstSelection.findRef( pStencil ) == -1;
 }
 
 /**
@@ -1049,7 +1049,7 @@ bool KivioPage::removeCurrentLayer()
 
     if( pLayer != m_pCurLayer )
     {
-        if( m_lstLayers.tqfind( m_pCurLayer )==false )
+        if( m_lstLayers.find( m_pCurLayer )==false )
         {
 	   kdDebug(43000) << "KivioLayer::removeCurrentLayer() - Couldn't find current layer in the list. Bad!" << endl;
             return false;
@@ -1069,7 +1069,7 @@ bool KivioPage::removeCurrentLayer()
         return false;
     }
 
-    KivioRemoveLayerCommand * cmd = new KivioRemoveLayerCommand( i18n("Remove Layer"), this , m_pCurLayer , m_lstLayers.tqfindRef(m_pCurLayer) );
+    KivioRemoveLayerCommand * cmd = new KivioRemoveLayerCommand( i18n("Remove Layer"), this , m_pCurLayer , m_lstLayers.findRef(m_pCurLayer) );
     doc()->addCommand( cmd );
     takeLayer( m_pCurLayer );
 /*
@@ -1087,7 +1087,7 @@ bool KivioPage::removeCurrentLayer()
 
 void KivioPage::takeLayer( KivioLayer *pLayer )
 {
-    int pos=m_lstLayers.tqfindRef(pLayer);
+    int pos=m_lstLayers.findRef(pLayer);
     m_lstLayers.take( pos );
 }
 
diff --git a/kivio/kiviopart/kivio_page.h b/kivio/kiviopart/kivio_page.h
index 872018a6..16d9db48 100644
--- a/kivio/kiviopart/kivio_page.h
+++ b/kivio/kiviopart/kivio_page.h
@@ -107,7 +107,7 @@ class KIVIO_EXPORT KivioPage : public TQObject
     void print( TQPainter &painter, KPrinter *_printer );
     void update();
     int id()const { return m_id; }
-    static KivioPage* tqfind( int _id );
+    static KivioPage* find( int _id );
 
     KoPageLayout paperLayout()const { return m_pPageLayout; }
     void setPaperLayout(const KoPageLayout&);
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 664d8af4..8d529449 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -2191,7 +2191,7 @@ int KivioView::vTextAlign()
 
 void KivioView::updatePageStatusLabel()
 {
-  TQString text = i18n("Page %1/%2").tqarg(m_pDoc->map()->pageList().tqfind(activePage()) + 1).tqarg(m_pDoc->map()->count());
+  TQString text = i18n("Page %1/%2").tqarg(m_pDoc->map()->pageList().find(activePage()) + 1).tqarg(m_pDoc->map()->count());
   m_pageCountSLbl->setText(text);
 }
 
diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp
index b90be1e1..657faf48 100644
--- a/kivio/kiviopart/kivio_zoomaction.cpp
+++ b/kivio/kiviopart/kivio_zoomaction.cpp
@@ -72,12 +72,12 @@ void ZoomAction::insertItem( int zoom )
     regexp.search(*it);
     const int val=regexp.cap(1).toInt(&ok);
     //zoom : limit inferior=10
-    if(ok && val>9 && list.tqcontains(val)==0)
+    if(ok && val>9 && list.contains(val)==0)
       list.append( val );
   }
   //necessary at the beginning when we read config
   //this value is not in combo list
-  if(list.tqcontains(zoom)==0)
+  if(list.contains(zoom)==0)
     list.append( zoom );
 
   qHeapSort( list );
@@ -86,7 +86,7 @@ void ZoomAction::insertItem( int zoom )
   for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
     lst.append( i18n("%1%").tqarg(*it) );
   setItems(lst);
-  setCurrentItem(lst.tqfindIndex(i18n("%1%").tqarg(zoom)));
+  setCurrentItem(lst.findIndex(i18n("%1%").tqarg(zoom)));
 }
 
 void ZoomAction::setEditZoom( int zoom )
diff --git a/kivio/kiviopart/kiviosdk/kivio_common.cpp b/kivio/kiviopart/kiviosdk/kivio_common.cpp
index e43c9fda..b67efc23 100644
--- a/kivio/kiviopart/kiviosdk/kivio_common.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_common.cpp
@@ -224,7 +224,7 @@ TQColor XmlReadColor( const TQDomElement &e, const TQString &att, const TQColor
     bool ok=false;
     TQColor newColor;
 
-    if( val.tqcontains("#") ) // Is it #RRGGBB format?
+    if( val.contains("#") ) // Is it #RRGGBB format?
     {
         newColor.setNamedColor(val);
         return newColor;
@@ -393,7 +393,7 @@ KoRect XmlReadRect( const TQDomElement &e, const TQString &att, const KoRect &de
     // Read the attribute
     TQString val = e.attribute( att );
 
-    if (val.tqfind("[") == 0 && val.tqfind("]") == (int)val.length()-1) {
+    if (val.find("[") == 0 && val.find("]") == (int)val.length()-1) {
       val.remove(0,1);
       val.remove(val.length()-1,1);
       TQStringList vlist = TQStringList::split(",",val);
diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
index e3cf726b..4407d2d0 100644
--- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
@@ -417,7 +417,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				if(svgChild.hasAttribute("d"))
 				{
 
-					if(svgChild.attribute("d").tqcontains('z') || svgChild.attribute("d").tqcontains('Z'))
+					if(svgChild.attribute("d").contains('z') || svgChild.attribute("d").contains('Z'))
 					{
 						isClosed = true;
 						kivioShape.setAttribute("type", "ClosedPath");
@@ -451,12 +451,12 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 					for( uint idx = 0; idx < styles.count(); idx++)
 					{
 						//kdDebug(43000) << "Style: " << styles[idx] << endl;
-						if( isClosed && styles[idx].tqcontains("fill:"))
+						if( isClosed && styles[idx].contains("fill:"))
 						{
 							TQDomElement fillStyle = kivio.createElement("KivioFillStyle");
-							if( styles[idx].tqcontains("forground"))
+							if( styles[idx].contains("forground"))
 								fillStyle.setAttribute("color", "#0000");
-							else if (styles[idx].tqcontains("background"))
+							else if (styles[idx].contains("background"))
 								fillStyle.setAttribute("color", "#ffff");
 
 							fillStyle.setAttribute("colorStyle", "1");
diff --git a/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp
index 2965ee74..c83f41f4 100644
--- a/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_group_stencil.cpp
@@ -503,7 +503,7 @@ void KivioGroupStencil::searchForConnections( KivioPage *p )
         pStencil->searchForConnections( p );
 
         // Restore it
-        m_pGroupList->tqfind( pCur );
+        m_pGroupList->find( pCur );
 
         pStencil = m_pGroupList->next();
     }
diff --git a/kivio/kiviopart/kiviosdk/kivio_layer.cpp b/kivio/kiviopart/kiviosdk/kivio_layer.cpp
index 999d053d..13ed44f5 100644
--- a/kivio/kiviopart/kiviosdk/kivio_layer.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_layer.cpp
@@ -81,7 +81,7 @@ KivioLayer::~KivioLayer()
 
 bool KivioLayer::addStencil( KivioStencil *pStencil )
 {
-    int pos = m_pDeletedStencilList->tqfindRef(pStencil);
+    int pos = m_pDeletedStencilList->findRef(pStencil);
     if ( pos != -1 )
         m_pDeletedStencilList->take( pos);
 
@@ -92,14 +92,14 @@ bool KivioLayer::addStencil( KivioStencil *pStencil )
 
 void KivioLayer::takeStencilFromList(  KivioStencil *pStencil )
 {
-    int pos=m_pStencilList->tqfindRef(pStencil);
+    int pos=m_pStencilList->findRef(pStencil);
     m_pStencilList->take( pos );
     m_pDeletedStencilList->append( pStencil );
 }
 
 void KivioLayer::insertStencil( KivioStencil *pStencil )
 {
-    int pos=m_pDeletedStencilList->tqfindRef(pStencil);
+    int pos=m_pDeletedStencilList->findRef(pStencil);
     if ( pos != -1 )
         m_pDeletedStencilList->take( pos);
 
@@ -532,7 +532,7 @@ void KivioLayer::searchForConnections( KivioPage *p )
         pStencil->searchForConnections( p );
 
         // Restore it
-        m_pStencilList->tqfind( pCur );
+        m_pStencilList->find( pCur );
 
         pStencil = m_pStencilList->next();
     }
@@ -540,7 +540,7 @@ void KivioLayer::searchForConnections( KivioPage *p )
 
 KivioStencil *KivioLayer::takeStencil( KivioStencil *p )
 {
-    m_pStencilList->tqfind( p );
+    m_pStencilList->find( p );
 
     return m_pStencilList->take();
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil.cpp
index 915df3bb..5533a257 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil.cpp
@@ -256,8 +256,8 @@ void KivioStencil::move(double xOffset, double yOffset)
 bool KivioStencil::isInRect(const KoRect& rect)
 {
   bool retVal;
-  retVal = rect.tqcontains(m_x, m_y);
-  retVal = retVal && rect.tqcontains(m_x + m_w, m_y + m_h);
+  retVal = rect.contains(m_x, m_y);
+  retVal = retVal && rect.contains(m_x + m_w, m_y + m_h);
 
   return retVal;
 }
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
index 64d5a7c9..c2e54a58 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
@@ -118,23 +118,23 @@ KivioStencilSpawner* KivioStencilSpawnerSet::loadFile( const TQString &fileName
 
     KivioStencilSpawner *pSpawner;
 
-    if( fileName.tqcontains( ".sml", false ) )
+    if( fileName.contains( ".sml", false ) )
     {
         pSpawner = new KivioSMLStencilSpawner(this);
     }
-    else if( fileName.tqcontains( ".ksp", false ) )
+    else if( fileName.contains( ".ksp", false ) )
     {
         pSpawner = new KivioPluginStencilSpawner(this);
     }
-    else if( fileName.tqcontains( ".so", false ) )
+    else if( fileName.contains( ".so", false ) )
     {
         pSpawner = new KivioPluginStencilSpawner(this);
     }
-    else if( fileName.tqcontains( ".spy", false ) )
+    else if( fileName.contains( ".spy", false ) )
     {
         pSpawner = new KivioPyStencilSpawner(this);
     }
-    else if( fileName.tqcontains( ".tqshape", false ) )
+    else if( fileName.contains( ".tqshape", false ) )
     {
 	pSpawner = new KivioDiaStencilSpawner(this);
     }
@@ -167,7 +167,7 @@ TQString KivioStencilSpawnerSet::readTitle( const TQString &dir )
   {
     kdDebug(43000) << "KivioStencilSpawnerSet::readTitle() - Error opening stencil set title: " <<
         dir << "/desc" << endl;
-    return dir.right(dir.length() - dir.tqfindRev('/')-1);
+    return dir.right(dir.length() - dir.findRev('/')-1);
   }
 
   d.setContent(&f);
@@ -289,7 +289,7 @@ TQString KivioStencilSpawnerSet::readDescription(const TQString& dir)
 }
 
 
-KivioStencilSpawner* KivioStencilSpawnerSet::tqfind( const TQString& id)
+KivioStencilSpawner* KivioStencilSpawnerSet::find( const TQString& id)
 {
   if(!m_pSpawners || m_pSpawners->isEmpty()) {
     return 0;
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h
index 9b215560..22b6d964 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.h
@@ -61,7 +61,7 @@ class KivioStencilSpawnerSet
     void setId( const TQString &s ) { m_id=s; }
 
     KivioStencilSpawner *spawnerAt( int i ) { return m_pSpawners->at(i); }
-    KivioStencilSpawner *tqfind( const TQString& );
+    KivioStencilSpawner *find( const TQString& );
 
     int count() { return m_pSpawners->count(); }
 
diff --git a/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp b/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp
index 71910eff..5906ab16 100644
--- a/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp
+++ b/kivio/kiviopart/kiviosdk/kiviopolylineconnector.cpp
@@ -408,7 +408,7 @@ namespace Kivio {
     bool retVal = true;
 
     for(it = m_points.begin(); it != m_points.end(); ++it) {
-      retVal = retVal && rect.tqcontains((*it));
+      retVal = retVal && rect.contains((*it));
     }
 
     return retVal;
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index b12d157f..0d3eada8 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -213,7 +213,7 @@ void KivioStencilSetAction::loadCollections( const TQString& rootDirStr )
     {
       cId = KivioStencilSpawnerSet::readId(colFInfo->absFilePath());
       KPopupMenu* ch;
-      int index = m_collectionIdList.tqfindIndex(cId);
+      int index = m_collectionIdList.findIndex(cId);
       
       if(index < 0) {
         ch = new KPopupMenu;
diff --git a/kivio/kiviopart/stencilbarbutton.cpp b/kivio/kiviopart/stencilbarbutton.cpp
index 67d6c079..b44ab4c2 100644
--- a/kivio/kiviopart/stencilbarbutton.cpp
+++ b/kivio/kiviopart/stencilbarbutton.cpp
@@ -229,7 +229,7 @@ void DragBarButton::mousePressEvent( TQMouseEvent* ev )
     closeRect.setRect(0, 20 - m_pClosePix->width(), width(), m_pClosePix->width());
   }
 
-  if ( closeRect.tqcontains(ev->pos())) {
+  if ( closeRect.contains(ev->pos())) {
     m_bClose = true;
     tqrepaint();
     return;
@@ -252,7 +252,7 @@ void DragBarButton::mouseReleaseEvent( TQMouseEvent* ev )
       closeRect.setRect(0, 20 - m_pClosePix->width(), width(), m_pClosePix->width());
     }
 
-    if ( closeRect.tqcontains(ev->pos()))
+    if ( closeRect.contains(ev->pos()))
     {
        kdDebug(43000) << "DragBarButton::mouseReleaseEvent() - Emitting closeRequest" << endl;
         emit closeRequired(this);
diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp
index a0dca0ee..d0121dd0 100644
--- a/kivio/kiviopart/stencilbardockmanager.cpp
+++ b/kivio/kiviopart/stencilbardockmanager.cpp
@@ -183,7 +183,7 @@ void StencilBarDockManager::slotFinishDragPage( DragBarButton* )
 
   // remove KivioStackBar if no more pages
   if (!bar->visiblePage()) {
-    int k = m_pBars.tqfindRef(bar);
+    int k = m_pBars.findRef(bar);
 
     if ( k!= -1 ) {
       m_pBars.remove(k);
@@ -205,7 +205,7 @@ void StencilBarDockManager::slotMoving()
 
   // check existing bars
   for ( KivioStackBar* bar = m_pBars.first(); bar; bar = m_pBars.next() ) {
-    if ( bar->tqgeometry().tqcontains(p) ) {
+    if ( bar->tqgeometry().contains(p) ) {
       if(bar->place() == TQDockWindow::OutsideDock) {
         dragPos = OnTopLevelBar;
         globalPos = bar->tqgeometry().topLeft();
@@ -227,10 +227,10 @@ void StencilBarDockManager::slotMoving()
   // check "on mainView"
   TQRect mr(m_pView->mapToGlobal(TQPoint(0,0)),m_pView->size());
 
-  if ( mr.tqcontains(p) ) {
+  if ( mr.contains(p) ) {
     TQRect r(mr);
     r.setWidth(r.width()/4);
-    if ( r.tqcontains(p) && !m_pBars.at(Left) ) {
+    if ( r.contains(p) && !m_pBars.at(Left) ) {
       moveManager->movePause();
       moveManager->setGeometry(r);
       dragPos = Left;
@@ -239,7 +239,7 @@ void StencilBarDockManager::slotMoving()
 
     r.moveBy(r.width()*3,0);
 
-    if ( r.tqcontains(p) && !m_pBars.at(Right) ) {
+    if ( r.contains(p) && !m_pBars.at(Right) ) {
       moveManager->movePause();
       moveManager->setGeometry(r);
       dragPos = Right;
@@ -249,7 +249,7 @@ void StencilBarDockManager::slotMoving()
     TQRect t(mr);
 
     t.setHeight(t.height()/4);
-    if ( t.tqcontains(p) && !m_pBars.at(Top) ) {
+    if ( t.contains(p) && !m_pBars.at(Top) ) {
       moveManager->movePause();
       moveManager->setGeometry(t);
       dragPos = Top;
@@ -258,7 +258,7 @@ void StencilBarDockManager::slotMoving()
 
     t.moveBy(0,t.height()*3);
 
-    if ( t.tqcontains(p) && !m_pBars.at(Bottom) ) {
+    if ( t.contains(p) && !m_pBars.at(Bottom) ) {
       moveManager->movePause();
       moveManager->setGeometry(t);
       dragPos = Bottom;
@@ -278,7 +278,7 @@ void StencilBarDockManager::slotDeleteStencilSet( DragBarButton* pBtn, TQWidget
 
   // remove KivioStackBar if no more pages
   if (!pBar->visiblePage()) {
-    int k = m_pBars.tqfindRef(pBar);
+    int k = m_pBars.findRef(pBar);
 
     if ( k!= -1 ) {
       m_pBars.remove(k);
diff --git a/kivio/kiviopart/ui/export_page_dialog_base.ui b/kivio/kiviopart/ui/export_page_dialog_base.ui
index bc993ed8..18195eeb 100644
--- a/kivio/kiviopart/ui/export_page_dialog_base.ui
+++ b/kivio/kiviopart/ui/export_page_dialog_base.ui
@@ -106,7 +106,7 @@ This will cause the entire page to be exported to the file. This means that &lt;
                 </property>
                 <property name="whatsThis" stdset="0">
                     <string>&lt;b&gt;Crop picture to edges&lt;/b&gt;&lt;br&gt;
-This will eliminate all blank portions of the drawing. The picture will only be as large as the stencils it tqcontains. If your stencils are located in the upper right corner of the page, then only the upper right corner will be exported.</string>
+This will eliminate all blank portions of the drawing. The picture will only be as large as the stencils it contains. If your stencils are located in the upper right corner of the page, then only the upper right corner will be exported.</string>
                 </property>
             </widget>
         </widget>
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 55b88d82..546c3203 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -181,34 +181,34 @@ void KivioBirdEyePanel::handleMouseMove(TQPoint p)
   handlePress = true;
 
   TQRect r1 = TQRect(varea.x()-1, varea.y()-1, 3, varea.height()+2);
-  if (r1.tqcontains(p)) {
+  if (r1.contains(p)) {
     canvas->setCursor(sizeHorCursor);
     apos = AlignLeft;
     return;
   }
 
   r1.moveBy(varea.width(),0);
-  if (r1.tqcontains(p)) {
+  if (r1.contains(p)) {
     canvas->setCursor(sizeHorCursor);
     apos = AlignRight;
     return;
   }
 
   TQRect r2 = TQRect(varea.x()-1, varea.y()-1, varea.width()+2, 3);
-  if (r2.tqcontains(p)) {
+  if (r2.contains(p)) {
     canvas->setCursor(sizeVerCursor);
     apos = AlignTop;
     return;
   }
 
   r2.moveBy(0, varea.height());
-  if (r2.tqcontains(p)) {
+  if (r2.contains(p)) {
     canvas->setCursor(sizeVerCursor);
     apos = AlignBottom;
     return;
   }
 
-  if (varea.tqcontains(p)) {
+  if (varea.contains(p)) {
     canvas->setCursor(sizeAllCursor);
     apos = AlignCenter;
     return;
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp
index 92161ba3..2e92bd00 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp
@@ -181,7 +181,7 @@ void KivioLayerPanel::upItem()
   KivioPage* page = m_pView->activePage();
   KivioLayer* layer = item->data;
 
-  int pos = page->layers()->tqfind(layer);
+  int pos = page->layers()->find(layer);
   // It's already the top layer... return
   if(pos == (static_cast<int>(page->layers()->count()) - 1))
     return;
@@ -217,7 +217,7 @@ void KivioLayerPanel::downItem()
   KivioPage* page = m_pView->activePage();
   KivioLayer* layer = item->data;
 
-  int pos = page->layers()->tqfind(layer);
+  int pos = page->layers()->find(layer);
   // It's already the bottom layer... return
   if (pos == 0)
     return;