rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

6 files changed, 26 insertions, 26 deletions

diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 17d482e37..f5ebfe3bf 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -82,7 +82,7 @@ int KNote::s_ppOffset = 0;
 KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char *name )
   : TQFrame( tqparent, name, WStyle_Customize | WStyle_NoBorder | WDestructiveClose ),
     m_label( 0 ), m_pushpin( 0 ), m_fold( 0 ), m_button( 0 ), m_tool( 0 ), m_editor( 0 ),
-    m_config( 0 ), m_journal( j ), m_tqfind( 0 ),
+    m_config( 0 ), m_journal( j ), m_find( 0 ),
     m_kwinConf( KSharedConfig::openConfig( "kwinrc", true ) ),
     m_busy( 0 ), m_deleteWhenIdle( false ), m_blockEmitDataChanged( false )
 {
@@ -264,7 +264,7 @@ KNote::KNote( TQDomDocument buildDoc, Journal *j, TQWidget *tqparent, const char
     bool closeLeft = false;
     m_kwinConf->setGroup( "Style" );
     if ( m_kwinConf->readBoolEntry( "CustomButtonPositions" ) )
-        closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).tqfind( 'X' ) > -1;
+        closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).find( 'X' ) > -1;
 
     TQPixmap pushpin_pix;
     if ( closeLeft )
@@ -575,33 +575,33 @@ void KNote::setColor( const TQColor& fg, const TQColor& bg )
     emit sigColorChanged();
 }
 
-void KNote::tqfind( const TQString& pattern, long options )
+void KNote::find( const TQString& pattern, long options )
 {
-    delete m_tqfind;
-    m_tqfind = new KFind( pattern, options, this );
+    delete m_find;
+    m_find = new KFind( pattern, options, this );
 
-    connect( m_tqfind, TQT_SIGNAL(highlight( const TQString &, int, int )),
+    connect( m_find, TQT_SIGNAL(highlight( const TQString &, int, int )),
              TQT_TQOBJECT(this), TQT_SLOT(slotHighlight( const TQString &, int, int )) );
-    connect( m_tqfind, TQT_SIGNAL(findNext()), TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()) );
+    connect( m_find, TQT_SIGNAL(findNext()), TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()) );
 
-    m_tqfind->setData( plainText() );
+    m_find->setData( plainText() );
     slotFindNext();
 }
 
 void KNote::slotFindNext()
 {
     // TODO: honor FindBackwards
-    // TODO: dialogClosed() -> delete m_tqfind
+    // TODO: dialogClosed() -> delete m_find
 
     // Let KFind inspect the text fragment, and display a dialog if a match is found
-    KFind::Result res = m_tqfind->find();
+    KFind::Result res = m_find->find();
 
     if ( res == KFind::NoMatch ) // i.e. at end-pos
     {
         m_editor->removeSelection( 1 );
         emit sigFindFinished();
-        delete m_tqfind;
-        m_tqfind = 0;
+        delete m_find;
+        m_find = 0;
     }
     else
     {
@@ -1167,7 +1167,7 @@ void KNote::updateLayout()
 
     m_kwinConf->setGroup( "Style" );
     if ( m_kwinConf->readBoolEntry( "CustomButtonPositions" ) )
-        closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).tqfind( 'X' ) > -1;
+        closeLeft = m_kwinConf->readEntry( "ButtonsOnLeft" ).find( 'X' ) > -1;
 
     if ( s_ppOffset )
     {
diff --git a/knotes/knote.h b/knotes/knote.h
index eb548955a..50a007dad 100644
--- a/knotes/knote.h
+++ b/knotes/knote.h
@@ -74,7 +74,7 @@ public:
     TQColor bgColor() const;
     void setColor( const TQColor& fg, const TQColor& bg );
 
-    void tqfind( const TQString& pattern, long options );
+    void find( const TQString& pattern, long options );
 
     bool isModified() const;
 
@@ -165,7 +165,7 @@ private:
     KNoteConfig   *m_config;
     KCal::Journal *m_journal;
 
-    KFind         *m_tqfind;
+    KFind         *m_find;
 
     KPopupMenu    *m_menu;
     KPopupMenu    *m_edit_menu;
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index 5f2d74fb2..7b38121c3 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -94,7 +94,7 @@ int KNotesApp::KNoteActionList::compareItems( TQPtrCollection::Item s1, TQPtrCol
 
 KNotesApp::KNotesApp()
     : DCOPObject("KNotesIface"), TQLabel( 0, 0, WType_TopLevel ),
-      m_alarm( 0 ), m_listener( 0 ), m_tqfind( 0 ), m_findPos( 0 )
+      m_alarm( 0 ), m_listener( 0 ), m_find( 0 ), m_findPos( 0 )
 {
     connect( kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit()) );
 
@@ -521,8 +521,8 @@ void KNotesApp::slotOpenFindDialog()
     m_findPos = new TQDictIterator<KNote>( m_noteList );
 
     // this could be in an own method if searching without a dialog should be possible
-    delete m_tqfind;
-    m_tqfind = new KFind( findDia.pattern(), findDia.options(), this );
+    delete m_find;
+    m_find = new KFind( findDia.pattern(), findDia.options(), this );
 
     slotFindNext();
 }
@@ -533,13 +533,13 @@ void KNotesApp::slotFindNext()
     {
         KNote *note = **m_findPos;
         ++*m_findPos;
-        note->tqfind( m_tqfind->pattern(), m_tqfind->options() );
+        note->find( m_find->pattern(), m_find->options() );
     }
     else
     {
-        m_tqfind->displayFinalDialog();
-        delete m_tqfind;
-        m_tqfind = 0;
+        m_find->displayFinalDialog();
+        delete m_find;
+        m_find = 0;
         delete m_findPos;
         m_findPos = 0;
     }
@@ -703,7 +703,7 @@ void KNotesApp::updateNoteActions()
 
     for ( TQDictIterator<KNote> it( m_noteList ); it.current(); ++it )
     {
-        KAction *action = new KAction( it.current()->name().tqreplace("&", "&&"),
+        KAction *action = new KAction( it.current()->name().replace("&", "&&"),
                                        KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowNote()),
                                        (TQObject *)0,
                                        it.current()->noteId().utf8() );
diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h
index fc167ddf5..6a65027fe 100644
--- a/knotes/knotesapp.h
+++ b/knotes/knotesapp.h
@@ -150,7 +150,7 @@ private:
     TQDict<KNote>    m_noteList;
     KNoteActionList m_noteActions;
 
-    KFind           *m_tqfind;
+    KFind           *m_find;
     TQDictIterator<KNote> *m_findPos;
 
     KPopupMenu      *m_note_menu;
diff --git a/knotes/knotesappui.rc b/knotes/knotesappui.rc
index a49a90285..d5d682733 100644
--- a/knotes/knotesappui.rc
+++ b/knotes/knotesappui.rc
@@ -7,7 +7,7 @@
     <Action name="new_note"/>
     <Action name="new_note_clipboard"/>
     <Separator/>
-    <Action name="edit_tqfind"/>
+    <Action name="edit_find"/>
     <Separator/>
     <Action name="show_all_notes"/>
     <Action name="hide_all_notes"/>
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index 829398ba0..2adf8e784 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -130,7 +130,7 @@ void KNotesNetworkReceiver::slotConnectionClosed()
         TQString noteText = TQString( *m_buffer ).stripWhiteSpace();
 
         // First line is the note title or, in case of ATnotes, the id
-        int pos = noteText.tqfind( TQRegExp("[\r\n]") );
+        int pos = noteText.find( TQRegExp("[\r\n]") );
         TQString noteTitle = noteText.left( pos ).stripWhiteSpace() + m_titleAddon;
 
         noteText = noteText.mid( pos ).stripWhiteSpace();