rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

27 files changed, 82 insertions, 82 deletions

diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc
index a290cb8..df9296c 100644
--- a/khexedit/dialog.cc
+++ b/khexedit/dialog.cc
@@ -501,7 +501,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *tqparent, const char *name, bool modal
   connect( mFindSelector, TQT_SIGNAL(activated(int)),
 	   TQT_SLOT(findSelectorChanged(int)) );
 
-  text = i18n("Fo&rmat (tqfind):");
+  text = i18n("Fo&rmat (find):");
   TQLabel *label = new TQLabel( mFindSelector, text, plainPage() );
   if( label == 0 ) { return; }
 
@@ -530,7 +530,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *tqparent, const char *name, bool modal
   connect( mReplaceSelector, TQT_SIGNAL(activated(int)),
 	   TQT_SLOT(replaceSelectorChanged(int)) );
 
-  text = i18n("For&mat (tqreplace):");
+  text = i18n("For&mat (replace):");
   label = new TQLabel( mReplaceSelector, text, plainPage() );
   if( label == 0 ) { return; }
   label->setFixedHeight( label->tqsizeHint().height() );
diff --git a/khexedit/draglabel.cc b/khexedit/draglabel.cc
index 4f40110..b404f8e 100644
--- a/khexedit/draglabel.cc
+++ b/khexedit/draglabel.cc
@@ -104,7 +104,7 @@ void CDragLabel::prepPixmap( KURLDrag &uriDrag )
   }
 
   TQString text;
-  int index = mUrl.tqfindRev( '/', mUrl.length() );
+  int index = mUrl.findRev( '/', mUrl.length() );
   if( index < 0 )
   {
     text = mUrl;
diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc
index df99fef..7ea3573 100644
--- a/khexedit/exportdialog.cc
+++ b/khexedit/exportdialog.cc
@@ -47,7 +47,7 @@ CExportDialog::CExportDialog( TQWidget *tqparent, char *name, bool modal )
   readConfiguration();
 
   TQString path = mDestination.fileInput->text();
-  int index = path.tqfindRev( '/' );
+  int index = path.findRev( '/' );
   if( index != -1 ) { mWorkDir = path.left( index+1 ); }
 }
 
@@ -474,7 +474,7 @@ void CExportDialog::browserClicked( void )
     return;
   }
   
-  int index = url.tqfindRev( '/' );
+  int index = url.findRev( '/' );
   if( index != -1 ) 
   { 
     mWorkDir = url.left( index+1 ); 
diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc
index 7d823dc..25c1330 100644
--- a/khexedit/hexbuffer.cc
+++ b/khexedit/hexbuffer.cc
@@ -568,7 +568,7 @@ bool CHexBuffer::hasFileName( void )
   //
   // FIXME: Files can be called "Untitled" so this must be corrected.
   //
-  if( mUrl.isEmpty() || mUrl.tqcontains( i18n( "Untitled" ), false ) )
+  if( mUrl.isEmpty() || mUrl.contains( i18n( "Untitled" ), false ) )
   {
     return( false );
   }
@@ -4360,7 +4360,7 @@ void CHexBuffer::doActionGroup( CHexActionGroup *group )
 
 void CHexBuffer::doAction( CHexAction *action )
 {
-  if( action->mAction == CHexAction::tqreplace )
+  if( action->mAction == CHexAction::replace )
   {
     doReplace( action, true );
   }
@@ -4406,7 +4406,7 @@ void CHexBuffer::recordStart( SCursor &cursor )
 void CHexBuffer::recordReplace( SCursor &cursor, uint size, char *data1,
 				uint data1Size )
 {
-  CHexAction *hexAction = new CHexAction( CHexAction::tqreplace,
+  CHexAction *hexAction = new CHexAction( CHexAction::replace,
 					  cursor.curr.offset );
   if( hexAction == 0 )
   {
@@ -4786,7 +4786,7 @@ void CHexBuffer::printHtmlTocPage( const TQString &tocName,
   for( uint i=0; i<=numPage; i++ )
   {
     TQString n( fileNames[i].right( fileNames[i].length() -
-				   fileNames[i].tqfindRev('/') - 1) );
+				   fileNames[i].findRev('/') - 1) );
     os << "<A HREF=\"" << n << "\">" << i18n("Page") << i+1;
     os << "</A>";
     os << " " << offsets[i];
@@ -4802,7 +4802,7 @@ void CHexBuffer::printHtmlTocPage( const TQString &tocName,
     // Make a symlink. We ignore any error here. I don't consider
     // it to be fatal.
     //
-    TQString n( tocName.right( tocName.length() - tocName.tqfindRev('/') - 1) );
+    TQString n( tocName.right( tocName.length() - tocName.findRev('/') - 1) );
     symlink( n.latin1(), linkName.latin1() );
   }
 
@@ -4825,7 +4825,7 @@ void CHexBuffer::printHtmlCaption( TQTextStream &os, uint captionType,
     break;
 
     case 2:
-      caption = mUrl.right( mUrl.length() - mUrl.tqfindRev('/') - 1);
+      caption = mUrl.right( mUrl.length() - mUrl.findRev('/') - 1);
     break;
 
     case 3:
@@ -4854,7 +4854,7 @@ void CHexBuffer::printHtmlNavigator( TQTextStream &os, const TQString *next,
   }
   else
   {
-    TQString n( next->right( next->length() - next->tqfindRev('/') - 1) );
+    TQString n( next->right( next->length() - next->findRev('/') - 1) );
     os << "<A HREF=\"" << n << "\">" << i18n("Next") << "</A>" << " ";
   }
 
@@ -4864,7 +4864,7 @@ void CHexBuffer::printHtmlNavigator( TQTextStream &os, const TQString *next,
   }
   else
   {
-    TQString p( prev->right( prev->length() - prev->tqfindRev('/') - 1) );
+    TQString p( prev->right( prev->length() - prev->findRev('/') - 1) );
     os << "<A HREF=\"" << p << "\">" << i18n("Previous") << "</A>" << " ";
   }
 
@@ -4874,7 +4874,7 @@ void CHexBuffer::printHtmlNavigator( TQTextStream &os, const TQString *next,
   }
   else
   {
-    TQString t( toc->right( toc->length() - toc->tqfindRev('/') - 1) );
+    TQString t( toc->right( toc->length() - toc->findRev('/') - 1) );
     os << "<A HREF=\"" << t << "\">" << i18n("Contents");
     os << "</A>" << " ";
   }
diff --git a/khexedit/hexbuffer.h b/khexedit/hexbuffer.h
index e5026de..2955af0 100644
--- a/khexedit/hexbuffer.h
+++ b/khexedit/hexbuffer.h
@@ -967,7 +967,7 @@ class CHexAction
   public:
     enum HexAction 
     { 
-      tqreplace
+      replace
     };
     
   public:
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index e84d5ce..5b17d60 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -564,7 +564,7 @@ void CHexEditorWidget::saveWorkingDirectory( const TQString &url )
     return;
   }
 
-  int index = url.tqfindRev( '/' );
+  int index = url.findRev( '/' );
   if( index != -1 )
   {
     mWorkDir = url.left( index+1 );
@@ -1456,7 +1456,7 @@ void CHexEditorWidget::gotoOffset( void )
 }
 
 
-void CHexEditorWidget::tqfind( void )
+void CHexEditorWidget::find( void )
 {
   if( mFindNavigatorDialog != 0 )
   {
@@ -1619,7 +1619,7 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc )
 	     TQT_SIGNAL(findData(SSearchControl &, uint, bool)),
 	     TQT_SLOT(findData(SSearchControl &, uint, bool)) );
     connect( mFindNavigatorDialog, TQT_SIGNAL(makeKey(void)),
-	     TQT_SLOT(tqfind()) );
+	     TQT_SLOT(find()) );
   }
   if( mFindNavigatorDialog->isVisible() == false )
   {
@@ -1630,7 +1630,7 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc )
 
 
 
-void CHexEditorWidget::tqreplace( void )
+void CHexEditorWidget::replace( void )
 {
   hideReplacePrompt();
 
diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h
index 7cd8cfa..92491e5 100644
--- a/khexedit/hexeditorwidget.h
+++ b/khexedit/hexeditorwidget.h
@@ -150,12 +150,12 @@ class CHexEditorWidget : public TQWidget
     void gotoNextBookmark( void );
     void gotoPrevBookmark( void );
     void gotoOffset( void );
-    void tqfind( void );
+    void find( void );
     void findAgain( void );
     void findNext( void );
     void findPrevious( void );
     void findData( SSearchControl &sc, uint mode, bool navigator );
-    void tqreplace( void );
+    void replace( void );
     void insertPattern( void );
     void encoding( void );
     void strings( void );
diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc
index bc7a4bc..40f72fe 100644
--- a/khexedit/hexmanagerwidget.cc
+++ b/khexedit/hexmanagerwidget.cc
@@ -267,9 +267,9 @@ CTabBar::CTabBar( TQWidget *tqparent, char *name )
 
 void CTabBar::addName( const TQString &name )
 {
-  TQString n( name.right(name.length()-name.tqfindRev('/')-1) );
+  TQString n( name.right(name.length()-name.findRev('/')-1) );
 
-  TQTab *t = tqfind( n );
+  TQTab *t = find( n );
   if( t == 0 )
   {
     t = new TQTab();
@@ -283,8 +283,8 @@ void CTabBar::addName( const TQString &name )
 
 void CTabBar::removeName( const TQString &name )
 {
-  TQString n( name.right(name.length()-name.tqfindRev('/')-1) );
-  TQTab *t = tqfind(n);
+  TQString n( name.right(name.length()-name.findRev('/')-1) );
+  TQTab *t = find(n);
   if( t == 0 )
   {
     return;
@@ -306,8 +306,8 @@ void CTabBar::removeName( const TQString &name )
 
 void CTabBar::changeName( const TQString &curName, const TQString &newName )
 {
-  TQString n( curName.right(curName.length()-curName.tqfindRev('/')-1) );
-  TQTab *t = tqfind(n);
+  TQString n( curName.right(curName.length()-curName.findRev('/')-1) );
+  TQTab *t = find(n);
   if( t == 0 )
   {
     return;
@@ -318,7 +318,7 @@ void CTabBar::changeName( const TQString &curName, const TQString &newName )
   {
     if( (*it).id() == t->identifier() )
     {
-      TQString m( newName.right(newName.length()-newName.tqfindRev('/')-1) );
+      TQString m( newName.right(newName.length()-newName.findRev('/')-1) );
       t->setText(m);
 
       mFileList.remove(it);
@@ -331,7 +331,7 @@ void CTabBar::changeName( const TQString &curName, const TQString &newName )
 }
 
 
-TQTab *CTabBar::tqfind( const TQString &name )
+TQTab *CTabBar::find( const TQString &name )
 {
   TQPtrList<TQTab> &list = *tabList();
   for( TQTab *t = list.first(); t != 0; t = list.next() )
diff --git a/khexedit/hexmanagerwidget.h b/khexedit/hexmanagerwidget.h
index 40dfc9f..e4b4652 100644
--- a/khexedit/hexmanagerwidget.h
+++ b/khexedit/hexmanagerwidget.h
@@ -88,7 +88,7 @@ class CTabBar : public TQTabBar
     void slotSelected( int id );
 
   private:
-    TQTab *tqfind( const TQString &name );
+    TQTab *find( const TQString &name );
 
   private:
     TQValueList<CFileKey> mFileList;
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 2d99264..ca2edd2 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -1942,7 +1942,7 @@ void CHexViewWidget::paintText( const TQRect &rect, bool expand )
     #endif
   }
 
-  if( contentsRect().tqcontains( r ) == false )
+  if( contentsRect().contains( r ) == false )
   {
     paintFrame();
     if( r.left() < frameWidth() ) { r.setLeft( frameWidth() ); }
diff --git a/khexedit/lib/codecs/kcharcodec.cpp b/khexedit/lib/codecs/kcharcodec.cpp
index dea28c1..1aab79b 100644
--- a/khexedit/lib/codecs/kcharcodec.cpp
+++ b/khexedit/lib/codecs/kcharcodec.cpp
@@ -42,7 +42,7 @@ KCharCodec *KCharCodec::createCodec( const TQString &Name )
 {
   KCharCodec *Codec = 0;
 
-  if( KTextCharCodec::codecNames().tqfindIndex(Name) != -1 )
+  if( KTextCharCodec::codecNames().findIndex(Name) != -1 )
     Codec = KTextCharCodec::createCodec( Name );
   else if( KEBCDIC1047CharCodec::codecName() == Name )
     Codec = KEBCDIC1047CharCodec::create();
diff --git a/khexedit/lib/controller/kvalueeditor.cpp b/khexedit/lib/controller/kvalueeditor.cpp
index 9baff80..70b9c41 100644
--- a/khexedit/lib/controller/kvalueeditor.cpp
+++ b/khexedit/lib/controller/kvalueeditor.cpp
@@ -207,7 +207,7 @@ void KValueEditor::doValueEditAction( KValueEditAction Action, int Input )
     EditValue = NewValue;
     ByteCodec->encode( ByteBuffer, 0, EditValue );
 
-    HexEdit->DataBuffer->tqreplace( Index, 1, (char*)&EditValue, 1 );
+    HexEdit->DataBuffer->replace( Index, 1, (char*)&EditValue, 1 );
   }
 
   HexEdit->updateCursor();
diff --git a/khexedit/lib/kbigbuffer.cpp b/khexedit/lib/kbigbuffer.cpp
index 08be888..99925da 100644
--- a/khexedit/lib/kbigbuffer.cpp
+++ b/khexedit/lib/kbigbuffer.cpp
@@ -83,7 +83,7 @@ int KBigBuffer::remove( KSection /*Section*/ )
   return 0;
 }
 
-unsigned int KBigBuffer::tqreplace( KSection /*Section*/, const char*, unsigned int /*Length*/ )
+unsigned int KBigBuffer::replace( KSection /*Section*/, const char*, unsigned int /*Length*/ )
 {
   return 0;
 }
@@ -95,8 +95,8 @@ int KBigBuffer::fill( char /*FillChar*/, int /*Length*/, unsigned int /*Pos*/ )
 
 
 int KBigBuffer::move( int /*DestPos*/, KSection /*SourceSection*/ ) { return 0; }
-//int KBigBuffer::tqfind( const char*, int /*Length*/, int /*Pos*/ ) const  { return 0; }
-int KBigBuffer::tqfind( const char*/*KeyData*/, int /*Length*/, KSection /*Section*/ ) const { return 0; }
+//int KBigBuffer::find( const char*, int /*Length*/, int /*Pos*/ ) const  { return 0; }
+int KBigBuffer::find( const char*/*KeyData*/, int /*Length*/, KSection /*Section*/ ) const { return 0; }
 
 int KBigBuffer::rfind( const char*, int /*Length*/, int /*Pos*/ ) const { return 0; }
 
diff --git a/khexedit/lib/kbigbuffer.h b/khexedit/lib/kbigbuffer.h
index b4461ab..63e6ec4 100644
--- a/khexedit/lib/kbigbuffer.h
+++ b/khexedit/lib/kbigbuffer.h
@@ -52,18 +52,18 @@ class KHEXEDIT_EXPORT KBigBuffer : public KDataBuffer
 
     virtual int insert( int Pos, const char*, int Length );
     virtual int remove( KSection S );
-    virtual unsigned int tqreplace( KSection S, const char*, unsigned int InputLength );
+    virtual unsigned int replace( KSection S, const char*, unsigned int InputLength );
     virtual int move( int DestPos, KSection SourceSection );
     virtual int fill( char FillChar, int Length = -1, unsigned int Pos = 0 );
     virtual void setDatum( unsigned int Offset, const char Char );
 
     virtual void setModified( bool M = true );
 
-    //virtual int tqfind( const char*, int Length, int Pos = 0 ) const;
-    virtual int tqfind( const char*KeyData, int Length, KSection Section ) const;
+    //virtual int find( const char*, int Length, int Pos = 0 ) const;
+    virtual int find( const char*KeyData, int Length, KSection Section ) const;
     virtual int rfind( const char*, int Length, int Pos = -1 ) const;
 
-/*     virtual int tqfind( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */
+/*     virtual int find( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */
 
   public:
     void setReadOnly( bool RO = true );
diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp
index 8fa1973..c9cc54a 100644
--- a/khexedit/lib/kbufferdrag.cpp
+++ b/khexedit/lib/kbufferdrag.cpp
@@ -50,7 +50,7 @@ static const char *localTextPlain()
     TextPlainLocal = TQCString(KGlobal::locale()->encoding()).lower();
     // remove the whitespaces
     int s;
-    while( (s=TextPlainLocal.tqfind(' ')) >= 0 )
+    while( (s=TextPlainLocal.find(' ')) >= 0 )
       TextPlainLocal.remove( s, 1 );
 
     TextPlainLocal.prepend( TextPlainLocalStub );
@@ -62,12 +62,12 @@ static const char *localTextPlain()
 // tries to create a codec by the given charset description
 static TQTextCodec* codecForCharset( const TQCString& Desc )
 {
-  int i = Desc.tqfind( "charset=" );
+  int i = Desc.find( "charset=" );
   if( i >= 0 )
   {
     TQCString CharSetName = Desc.mid( i+8 );
     // remove any further attributes
-    if( (i=CharSetName.tqfind( ';' )) >= 0 )
+    if( (i=CharSetName.find( ';' )) >= 0 )
       CharSetName = CharSetName.left( i );
 
     // try to find codec
diff --git a/khexedit/lib/kdatabuffer.cpp b/khexedit/lib/kdatabuffer.cpp
index 4c4f365..054d792 100644
--- a/khexedit/lib/kdatabuffer.cpp
+++ b/khexedit/lib/kdatabuffer.cpp
@@ -25,13 +25,13 @@ using namespace KHE;
 
 int KDataBuffer::insert( int Pos, const char* D, int Length )
 {
-  return tqreplace( Pos,0,D,Length );
+  return replace( Pos,0,D,Length );
 }
 
 
 int KDataBuffer::remove( KSection Remove )
 {
-  tqreplace( Remove, 0, 0 );
+  replace( Remove, 0, 0 );
   return Remove.width(); // TODO: check if this is true
 }
 
diff --git a/khexedit/lib/kdatabuffer.h b/khexedit/lib/kdatabuffer.h
index 796ccd6..e7cc3bc 100644
--- a/khexedit/lib/kdatabuffer.h
+++ b/khexedit/lib/kdatabuffer.h
@@ -146,9 +146,9 @@ class KHEXEDIT_EXPORT KDataBuffer
       * @param SourceLength
       * @return length of replacced data
       */
-    virtual unsigned int tqreplace( KSection DestSection, const char* Source, unsigned int SourceLength ) = 0;
+    virtual unsigned int replace( KSection DestSection, const char* Source, unsigned int SourceLength ) = 0;
     /** convenience function, behaves as above */
-    unsigned int tqreplace( unsigned int Pos, unsigned int RemoveLength,
+    unsigned int replace( unsigned int Pos, unsigned int RemoveLength,
                           const char* Source, unsigned int SourceLength );
 
     /** moves a part of the data to a new position, while floating the other data around
@@ -201,7 +201,7 @@ class KHEXEDIT_EXPORT KDataBuffer
       * @param Pos the position to start the search
       * @return index of the first  or -1
       */
-    //virtual int tqfind( const char*, int Length, int Pos = 0 ) const = 0;
+    //virtual int find( const char*, int Length, int Pos = 0 ) const = 0;
     /** searches for a given data string
       * The section limits the data within which the key has to be found
       * If the end of the section is lower then the start the search continues at the start???
@@ -210,7 +210,7 @@ class KHEXEDIT_EXPORT KDataBuffer
       * @param Section section within the keydata is to be found
       * @return index of the first occurence or -1
       */
-    virtual int tqfind( const char*KeyData, int Length, KSection Section ) const = 0;
+    virtual int find( const char*KeyData, int Length, KSection Section ) const = 0;
     /** searches backward beginning with byte at Pos.
       * @param 
       * @param Length length of search string
@@ -219,7 +219,7 @@ class KHEXEDIT_EXPORT KDataBuffer
       */
     virtual int rfind( const char*, int Length, int Pos = -1 ) const = 0;
 
-/*     virtual int tqfind( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */
+/*     virtual int find( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */
 };
 
 
@@ -235,9 +235,9 @@ inline const char *KDataBuffer::dataSet( int Offset, int Length ) const
 inline int KDataBuffer::remove( int Pos, int Length )
 { return remove( KSection(Pos,Pos+Length-1) ); }
 
-inline unsigned int KDataBuffer::tqreplace( unsigned int Pos, unsigned int RemoveLength,
+inline unsigned int KDataBuffer::replace( unsigned int Pos, unsigned int RemoveLength,
                                  const char* D, unsigned int InputLength )
-{ return tqreplace( KSection(Pos,Pos+RemoveLength-1), D, InputLength ); }
+{ return replace( KSection(Pos,Pos+RemoveLength-1), D, InputLength ); }
 
 inline bool KDataBuffer::isReadOnly() const { return false; }
 
diff --git a/khexedit/lib/kfixedsizebuffer.cpp b/khexedit/lib/kfixedsizebuffer.cpp
index 0c13e94..83fd134 100644
--- a/khexedit/lib/kfixedsizebuffer.cpp
+++ b/khexedit/lib/kfixedsizebuffer.cpp
@@ -89,7 +89,7 @@ int KFixedSizeBuffer::remove( KSection Remove )
 }
 
 
-unsigned int KFixedSizeBuffer::tqreplace( KSection Remove, const char* D, unsigned int InputLength )
+unsigned int KFixedSizeBuffer::replace( KSection Remove, const char* D, unsigned int InputLength )
 {
   // check all parameters
   if( Remove.startsBehind( Size-1 ) || (Remove.width()==0 && InputLength==0) )
@@ -262,7 +262,7 @@ int KFixedSizeBuffer::compare( const KDataBuffer &Other, KSection OtherRange, un
 }
 
 
-int KFixedSizeBuffer::tqfind(  const char*/*KeyData*/, int /*Length*/, KSection /*Section*/  ) const { return 0; }
+int KFixedSizeBuffer::find(  const char*/*KeyData*/, int /*Length*/, KSection /*Section*/  ) const { return 0; }
 int KFixedSizeBuffer::rfind( const char*, int /*Length*/, int /*Pos*/ ) const { return 0; }
 
 
diff --git a/khexedit/lib/kfixedsizebuffer.h b/khexedit/lib/kfixedsizebuffer.h
index e5997c3..90060f0 100644
--- a/khexedit/lib/kfixedsizebuffer.h
+++ b/khexedit/lib/kfixedsizebuffer.h
@@ -48,17 +48,17 @@ class KFixedSizeBuffer : public KDataBuffer
 
     virtual int insert( int Pos, const char*, int Length );
     virtual int remove( KSection Remove );
-    virtual unsigned int tqreplace( KSection Remove, const char*, unsigned int InputLength );
+    virtual unsigned int replace( KSection Remove, const char*, unsigned int InputLength );
     virtual int move( int DestPos, KSection SourceSection );
     virtual int fill( const char FillChar, int Length = -1, unsigned int Pos = 0 );
     virtual void setDatum( unsigned int Offset, const char Char );
 
     virtual void setModified( bool M = true );
 
-    virtual int tqfind( const char*KeyData, int Length, KSection Section ) const;
+    virtual int find( const char*KeyData, int Length, KSection Section ) const;
     virtual int rfind( const char*, int Length, int Pos = -1 ) const;
 
-/*     virtual int tqfind( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */
+/*     virtual int find( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */
 
   public:
     void setReadOnly( bool RO = true );
diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp
index 0a52090..01d7602 100644
--- a/khexedit/lib/khexedit.cpp
+++ b/khexedit/lib/khexedit.cpp
@@ -904,7 +904,7 @@ void KHexEdit::insert( const TQByteArray &D )
       // we restrict the replacement to the minimum length of selection and input
       ChangedRange = BufferRanges->selection();
       ChangedRange.restrictEndTo( ChangedRange.start()+D.size()-1 );
-      int W = DataBuffer->tqreplace( ChangedRange, D.data(), ChangedRange.width() );
+      int W = DataBuffer->replace( ChangedRange, D.data(), ChangedRange.width() );
       BufferCursor->gotoCIndex( ChangedRange.start()+W );
       BufferRanges->removeSelection();
     }
@@ -917,7 +917,7 @@ void KHexEdit::insert( const TQByteArray &D )
         ChangedRange.restrictEndTo( BufferLayout->length()-1 );
         if( ChangedRange.isValid() )
         {
-          int W = DataBuffer->tqreplace( ChangedRange, D.data(), ChangedRange.width() );
+          int W = DataBuffer->replace( ChangedRange, D.data(), ChangedRange.width() );
           BufferCursor->gotoNextByte( W );
         }
       }
@@ -930,7 +930,7 @@ void KHexEdit::insert( const TQByteArray &D )
       // replacing the selection
       KSection Selection = BufferRanges->selection();
       int OldLastIndex = BufferLayout->length() - 1;
-      int W = DataBuffer->tqreplace( Selection, D.data(), D.size() );
+      int W = DataBuffer->replace( Selection, D.data(), D.size() );
       updateLength();
       BufferCursor->gotoIndex( Selection.start() + W );
       if( W > 0 )
@@ -1933,7 +1933,7 @@ void KHexEdit::handleInternalDrag( TQDropEvent *e )
           ChangedRange.restrictEndTo( BufferLayout->length()-1 );
           if( ChangedRange.isValid() )
           {
-            int NoOfReplaced = DataBuffer->tqreplace( ChangedRange, Data.data(), ChangedRange.width() );
+            int NoOfReplaced = DataBuffer->replace( ChangedRange, Data.data(), ChangedRange.width() );
             BufferCursor->gotoNextByte( NoOfReplaced );
           }
         }
diff --git a/khexedit/lib/kplainbuffer.cpp b/khexedit/lib/kplainbuffer.cpp
index 1d79756..08874ba 100644
--- a/khexedit/lib/kplainbuffer.cpp
+++ b/khexedit/lib/kplainbuffer.cpp
@@ -108,7 +108,7 @@ int KPlainBuffer::remove( KSection Remove )
 }
 
 
-unsigned int KPlainBuffer::tqreplace( KSection Remove, const char* D, unsigned int InputLength )
+unsigned int KPlainBuffer::replace( KSection Remove, const char* D, unsigned int InputLength )
 {
   // check all parameters
   if( Remove.start() >= (int)Size || (Remove.width()==0 && InputLength==0) )
@@ -259,7 +259,7 @@ int KPlainBuffer::fill( const char FChar, int FillLength, unsigned int Pos )
 }
 
 
-int KPlainBuffer::tqfind( const char* SearchString, int Length, KSection Section ) const  
+int KPlainBuffer::find( const char* SearchString, int Length, KSection Section ) const  
 {
   Section.restrictEndTo( Size-1 );
 
diff --git a/khexedit/lib/kplainbuffer.h b/khexedit/lib/kplainbuffer.h
index c0d8846..31851ae 100644
--- a/khexedit/lib/kplainbuffer.h
+++ b/khexedit/lib/kplainbuffer.h
@@ -54,18 +54,18 @@ class KPlainBuffer : public KDataBuffer
 
     virtual int insert( int Pos, const char*, int Length );
     virtual int remove( KSection Remove );
-    virtual unsigned int tqreplace( KSection Remove, const char*, unsigned int InputLength );
+    virtual unsigned int replace( KSection Remove, const char*, unsigned int InputLength );
     virtual int move( int DestPos, KSection SourceSection );
     virtual int fill( const char FillChar, int Length = -1, unsigned int Pos = 0 );
     virtual void setDatum( unsigned int Offset, const char Char );
 
     virtual void setModified( bool M = true );
 
-    //virtual int tqfind( const char*, int Length, int Pos = 0 ) const;
-    virtual int tqfind( const char*KeyData, int Length, KSection Section ) const;
+    //virtual int find( const char*, int Length, int Pos = 0 ) const;
+    virtual int find( const char*KeyData, int Length, KSection Section ) const;
     virtual int rfind( const char*, int Length, int Pos = -1 ) const;
 
-/*     virtual int tqfind( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */
+/*     virtual int find( const TQString &expr, bool cs, bool wo, bool forward = true, int *index = 0 ); */
 
   public:
     void setReadOnly( bool RO = true );
diff --git a/khexedit/lib/kwrappingrobuffer.cpp b/khexedit/lib/kwrappingrobuffer.cpp
index a47745c..b913c1a 100644
--- a/khexedit/lib/kwrappingrobuffer.cpp
+++ b/khexedit/lib/kwrappingrobuffer.cpp
@@ -50,7 +50,7 @@ void KWrappingROBuffer::set( const char* D, int L )
 }
 
 
-int KWrappingROBuffer::tqfind( const char*/*KeyData*/, int /*Length*/, KSection /*Section*/ ) const
+int KWrappingROBuffer::find( const char*/*KeyData*/, int /*Length*/, KSection /*Section*/ ) const
 {
   return 0;
 }
diff --git a/khexedit/lib/kwrappingrobuffer.h b/khexedit/lib/kwrappingrobuffer.h
index 97ae33c..51ee7b8 100644
--- a/khexedit/lib/kwrappingrobuffer.h
+++ b/khexedit/lib/kwrappingrobuffer.h
@@ -47,13 +47,13 @@ class KWrappingROBuffer : public KReadOnlyBuffer
 
     virtual int insert( int Pos, const char*, int Length );
     virtual int remove( KSection S );
-    virtual unsigned int tqreplace( KSection S, const char*, unsigned int Length );
+    virtual unsigned int replace( KSection S, const char*, unsigned int Length );
     virtual int fill( const char FillChar, int, int );
     virtual void setDatum( unsigned int Offset, const char Char );
 
     virtual void setModified( bool M );
 
-    virtual int tqfind( const char*KeyData, int Length, KSection Section ) const;
+    virtual int find( const char*KeyData, int Length, KSection Section ) const;
     virtual int rfind( const char*, int Length, int Pos = -1 ) const;
 
 
@@ -75,7 +75,7 @@ inline char KWrappingROBuffer::datum( unsigned int Offset ) const { return Data[
 
 inline int KWrappingROBuffer::insert( int, const char*, int )        { return 0; }
 inline int KWrappingROBuffer::remove( KSection )                     { return 0; }
-inline unsigned int KWrappingROBuffer::tqreplace( KSection, const char*, unsigned int )  { return 0; }
+inline unsigned int KWrappingROBuffer::replace( KSection, const char*, unsigned int )  { return 0; }
 inline int KWrappingROBuffer::fill( const char , int, int )          { return 0; }
 inline void KWrappingROBuffer::setDatum( unsigned int, const char )  {}
 
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index 3d17dd5..5ccafbf 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -141,7 +141,7 @@ void KHexEditPart::fitActionSettings()
   ShowUnprintableAction->setChecked( HexEdit->showUnprintable() );
 
   CodingAction->setCurrentItem( (int)HexEdit->coding() );
-  EncodingAction->setCurrentItem( KCharCodec::codecNames().tqfindIndex(HexEdit->encodingName()) );
+  EncodingAction->setCurrentItem( KCharCodec::codecNames().findIndex(HexEdit->encodingName()) );
 
   ResizeStyleAction->setCurrentItem( (int)HexEdit->resizeStyle() );
 
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index 4be3bda..db63594 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -18,7 +18,7 @@
  *
  */
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
 
 #include <tqptrlist.h>
 #include <tqsignalmapper.h>
@@ -161,10 +161,10 @@ actionCollection());
   mAction.paste      = KStdAction::paste(     TQT_TQOBJECT(editor()), TQT_SLOT(paste()), actionCollection() );
   mAction.selectAll  = KStdAction::selectAll( TQT_TQOBJECT(editor()), TQT_SLOT(selectAll()),actionCollection() );
   mAction.unselect   = KStdAction::deselect(  TQT_TQOBJECT(editor()), TQT_SLOT(unselect()), actionCollection());
-  mAction.tqfind     = KStdAction::find(      TQT_TQOBJECT(editor()), TQT_SLOT(tqfind()), actionCollection() );
+  mAction.find     = KStdAction::find(      TQT_TQOBJECT(editor()), TQT_SLOT(find()), actionCollection() );
   mAction.findNext   = KStdAction::findNext(  TQT_TQOBJECT(editor()), TQT_SLOT(findNext()), actionCollection() );
   mAction.findPrev   = KStdAction::findPrev(  TQT_TQOBJECT(editor()),TQT_SLOT(findPrevious()),actionCollection() );
-  mAction.tqreplace  = KStdAction::replace(   TQT_TQOBJECT(editor()), TQT_SLOT(tqreplace()), actionCollection() );
+  mAction.replace  = KStdAction::replace(   TQT_TQOBJECT(editor()), TQT_SLOT(replace()), actionCollection() );
   mAction.gotoOffset = new KAction( i18n("&Goto Offset..."), CTRL+Key_G,
     TQT_TQOBJECT(editor()), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" );
   mAction.insertPattern = new KAction( i18n("&Insert Pattern..."), CTRL+Key_Insert,
@@ -479,7 +479,7 @@ void KHexEdit::addRecentFile( const TQString &fileName )
     return;
   }
 
-  if( fileName.tqcontains( i18n( "Untitled" ), false ) )
+  if( fileName.contains( i18n( "Untitled" ), false ) )
   {
     return;
   }
@@ -498,7 +498,7 @@ void KHexEdit::removeRecentFile( const TQString &fileName )
     return;
   }
 
-  if( fileName.tqcontains( i18n( "Untitled" ), false ) )
+  if( fileName.contains( i18n( "Untitled" ), false ) )
   {
     return;
   }
@@ -511,7 +511,7 @@ void KHexEdit::removeRecentFile( const TQString &fileName )
 
 void KHexEdit::renameRecentFile(const TQString &curName, const TQString &newName)
 {
-  if( curName.tqcontains( i18n( "Untitled" ), false ) )
+  if( curName.contains( i18n( "Untitled" ), false ) )
   {
     addRecentFile( newName );
   }
@@ -1232,7 +1232,7 @@ void KHexEdit::removeDocument( const TQString &fileName )
     {
       TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this);
 
-      documentMenu->removeItemAt( mDocumentList.tqfindIndex(*it) );
+      documentMenu->removeItemAt( mDocumentList.findIndex(*it) );
       mDocumentList.remove( it );
 
       for( uint i=0; i < mDocumentList.count(); i++ )
@@ -1259,7 +1259,7 @@ void KHexEdit::renameDocument( const TQString &curName, const TQString &newName
     if( *it == curName )
     {
       TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this);
-      documentMenu->changeItem( newName, mDocumentList.tqfindIndex(*it) );
+      documentMenu->changeItem( newName, mDocumentList.findIndex(*it) );
       mDocumentList.insert( it, newName );
       mDocumentList.remove( it );
       return;
diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h
index 398abf4..5e72dee 100644
--- a/khexedit/toplevel.h
+++ b/khexedit/toplevel.h
@@ -85,10 +85,10 @@ class KHexEdit : public KMainWindow
     KAction *paste;
     KAction *selectAll;
     KAction *unselect;
-    KAction *tqfind;
+    KAction *find;
     KAction *findNext;
     KAction *findPrev;
-    KAction *tqreplace;
+    KAction *replace;
     KAction *gotoOffset;
     KAction *insertPattern;
     KAction *copyAsText;