rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

15 files changed, 54 insertions, 54 deletions

diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h
index 9673d8cc..e61beed2 100644
--- a/lib/widgets/fancylistviewitem.h
+++ b/lib/widgets/fancylistviewitem.h
@@ -53,7 +53,7 @@ class TextPaintStyleStore {
         }
         
         Item& getStyle( int num ) {
-            Store::Iterator it = m_styles.tqfind( num );
+            Store::Iterator it = m_styles.find( num );
             if( it != m_styles.end() ) return *it;
             return m_styles[0];
         }
@@ -67,7 +67,7 @@ class TextPaintStyleStore {
         }
         
         bool hasStyle( int num ) {
-            Store::Iterator it = m_styles.tqfind( num );
+            Store::Iterator it = m_styles.find( num );
             return ( it != m_styles.end() );
         }
         
diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp
index 47659fc4..a12c5092 100644
--- a/lib/widgets/flagboxes.cpp
+++ b/lib/widgets/flagboxes.cpp
@@ -105,12 +105,12 @@ void FlagListBox::readFlags(TQStringList *list)
     TQListViewItem *item = firstChild();
     for (; item; item = item->nextSibling()) {
         FlagListItem *flitem = static_cast<FlagListItem*>(item);
-        TQStringList::Iterator sli = list->tqfind(flitem->flag);
+        TQStringList::Iterator sli = list->find(flitem->flag);
         if (sli != list->end()) {
             flitem->setOn(true);
             list->remove(sli);
         }
-        sli = list->tqfind(flitem->off);
+        sli = list->find(flitem->off);
         if (sli != list->end()) {
             flitem->setOn(false);
             list->remove(sli);
@@ -205,13 +205,13 @@ void FlagCheckBoxController::readFlags(TQStringList *list)
     TQPtrListIterator<FlagCheckBox> it(cblist);
     for (; it.current(); ++it) {
         FlagCheckBox *fitem = it.current();
-        TQStringList::Iterator sli = list->tqfind(fitem->flag);
+        TQStringList::Iterator sli = list->find(fitem->flag);
         if (sli != list->end()) {
             fitem->setChecked(true);
             fitem->useDef = false;
             list->remove(sli);
         }
-        sli = list->tqfind(fitem->off);
+        sli = list->find(fitem->off);
         if (sli != list->end()) {
             fitem->setChecked(false);
             fitem->includeOff = true;
@@ -270,13 +270,13 @@ void FlagPathEditController::readFlags( TQStringList * list )
             if ((*sli).startsWith(peitem->flag))
             {
 //                kdDebug() << "Processing.." << endl;
-                peitem->setText((*sli).tqreplace(TQRegExp(TQRegExp_escape(peitem->flag)),""));
+                peitem->setText((*sli).replace(TQRegExp(TQRegExp_escape(peitem->flag)),""));
                 sli = list->remove(sli);
                 continue;
             }
              ++sli;
         }
-/*        TQStringList::Iterator sli = list->tqfind(peitem->flag);
+/*        TQStringList::Iterator sli = list->find(peitem->flag);
         if (sli != list->end()) {
             peitem->setText((*sli).remove(peitem->flag));
             list->remove(sli);
@@ -433,7 +433,7 @@ void FlagRadioButtonController::readFlags(TQStringList *list)
     TQPtrListIterator<FlagRadioButton> it(cblist);
     for (; it.current(); ++it) {
         FlagRadioButton *fitem = it.current();
-        TQStringList::Iterator sli = list->tqfind(fitem->flag);
+        TQStringList::Iterator sli = list->find(fitem->flag);
         if (sli != list->end()) {
             fitem->setChecked(true);
             list->remove(sli);
@@ -471,7 +471,7 @@ void FlagEditController::readFlags( TQStringList * list )
         {
             if ((*sli).startsWith(peitem->flag))
             {
-                peitem->appendText((*sli).tqreplace(TQRegExp(TQRegExp_escape(peitem->flag)),""));
+                peitem->appendText((*sli).replace(TQRegExp(TQRegExp_escape(peitem->flag)),""));
                 sli = list->remove(sli);
                 continue;
             }
@@ -489,7 +489,7 @@ void FlagEditController::readFlags( TQStringList * list )
         {
             if ((*sli).startsWith(sitem->flag))
             {
-                sitem->setText((*sli).tqreplace(TQRegExp(TQRegExp_escape(sitem->flag)),""));
+                sitem->setText((*sli).replace(TQRegExp(TQRegExp_escape(sitem->flag)),""));
                 sli = list->remove(sli);
                 continue;
             }
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 5bda3bed..220b846a 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -254,7 +254,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
 {
   // check for environment variables and make necessary translations
   TQString path = url;
-  int nDollarPos = path.tqfind( '$' );
+  int nDollarPos = path.find( '$' );
 
   // Note: the while loop below is a copy of code in kdecore/kconfigbase.cpp ;)
   while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(path.length())) {
@@ -275,7 +275,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
          result = ts.read().stripWhiteSpace();
          pclose(fs);
       }
-      path.tqreplace( nDollarPos, nEndPos-nDollarPos, result );
+      path.replace( nDollarPos, nEndPos-nDollarPos, result );
     } else if( (path)[nDollarPos+1] != '$' ) {
       uint nEndPos = nDollarPos+1;
       // the next character is no $
@@ -302,9 +302,9 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
         // A environment variables may contain values in 8bit
         // locale cpecified encoding or in UTF8 encoding.
         if (isUtf8( pEnv ))
-            path.tqreplace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) );
+            path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromUtf8(pEnv) );
         else
-            path.tqreplace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) );
+            path.replace( nDollarPos, nEndPos-nDollarPos, TQString::fromLocal8Bit(pEnv) );
       } else
       path.remove( nDollarPos, nEndPos-nDollarPos );
     } else {
@@ -312,7 +312,7 @@ TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url)
       path.remove( nDollarPos, 1 );
       nDollarPos++;
     }
-    nDollarPos = path.tqfind( '$', nDollarPos );
+    nDollarPos = path.find( '$', nDollarPos );
   }
 
   return path;
@@ -494,7 +494,7 @@ void KDevHTMLPart::addHistoryEntry()
 void KDevHTMLPart::slotCopy( )
 {
     TQString text = selectedText();
-    text.tqreplace( TQChar( 0xa0 ), ' ' );
+    text.replace( TQChar( 0xa0 ), ' ' );
     TQClipboard *cb = TQApplication::tqclipboard();
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
     cb->setText(text);
diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp
index ab267ff2..a2c2d87c 100644
--- a/lib/widgets/ksavealldialog.cpp
+++ b/lib/widgets/ksavealldialog.cpp
@@ -71,7 +71,7 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co
 	KURL::List::ConstIterator it = filelist.begin();
 	while ( it != filelist.end() )
 	{
-		if ( !ignorelist.tqcontains( *it ) )
+		if ( !ignorelist.contains( *it ) )
 		{
 			TQCheckListItem * x = new CheckURL( _listview, *it );
 			x->setOn( true );
diff --git a/lib/widgets/processlinemaker.cpp b/lib/widgets/processlinemaker.cpp
index ad5f307c..8fdbc5d2 100644
--- a/lib/widgets/processlinemaker.cpp
+++ b/lib/widgets/processlinemaker.cpp
@@ -39,7 +39,7 @@ void ProcessLineMaker::slotReceivedStdout( const char *buffer )
 {
     stdoutbuf += buffer;
     int pos;
-    while ( (pos = stdoutbuf.tqfind('\n')) != -1) {
+    while ( (pos = stdoutbuf.find('\n')) != -1) {
         TQCString line = stdoutbuf.left( pos );
         emit receivedStdoutLine(line);
         stdoutbuf.remove(0, pos+1);
@@ -60,7 +60,7 @@ void ProcessLineMaker::slotReceivedStderr( const char *buffer )
 {
     stderrbuf += buffer;
     int pos;
-    while ( (pos = stderrbuf.tqfind('\n')) != -1) {
+    while ( (pos = stderrbuf.find('\n')) != -1) {
         TQCString line = stderrbuf.left( pos );
         emit receivedStderrLine(line);
         stderrbuf.remove(0, pos+1);
diff --git a/lib/widgets/processlinemaker.h b/lib/widgets/processlinemaker.h
index cf5e78e4..f304cdd8 100644
--- a/lib/widgets/processlinemaker.h
+++ b/lib/widgets/processlinemaker.h
@@ -65,4 +65,4 @@ private:
 
 #endif
 
-//kate: tqreplace-tabs off; indent-spaces off;
+//kate: replace-tabs off; indent-spaces off;
diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp
index 66796266..cf13248c 100644
--- a/lib/widgets/processwidget.cpp
+++ b/lib/widgets/processwidget.cpp
@@ -33,9 +33,9 @@ ProcessListBoxItem::ProcessListBoxItem(const TQString &s, Type type)
     : TQListBoxText(s), t(type)
 {
     TQString clean = s;
-    clean.tqreplace( TQChar('\t'), TQString("  ") );
-    clean.tqreplace( TQChar('\n'), TQString() );
-    clean.tqreplace( TQChar('\r'), TQString() );
+    clean.replace( TQChar('\t'), TQString("  ") );
+    clean.replace( TQChar('\n'), TQString() );
+    clean.replace( TQChar('\r'), TQString() );
     setText( clean );
 
     setCustomHighlighting(true);
diff --git a/lib/widgets/propeditor/Mainpage.dox b/lib/widgets/propeditor/Mainpage.dox
index 1f98b4ac..6bc81be0 100644
--- a/lib/widgets/propeditor/Mainpage.dox
+++ b/lib/widgets/propeditor/Mainpage.dox
@@ -56,7 +56,7 @@ called @ref PropertyLib::PropertyMachineFactory. Static function @ref PropertyLi
 can be used to obtain the reference to the factory instance. Factory creates and returns
 so-called @ref PropertyLib::Machine for each registered property type (either predefined or user defined).
 
-@ref PropertyLib::Machine tqcontains @ref PropertyLib::PropertyWidget and a list of "detailed" machines.
+@ref PropertyLib::Machine contains @ref PropertyLib::PropertyWidget and a list of "detailed" machines.
 Usually only property widget is necessary for a property but there are 
 complex properties like "Font" for example. We would like to see separate editors
 for font family, size, etc. and a button to choose all of these in the dialog.
diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp
index 18cad9b6..7732866c 100644
--- a/lib/widgets/propeditor/pcombobox.cpp
+++ b/lib/widgets/propeditor/pcombobox.cpp
@@ -58,7 +58,7 @@ void PComboBox::fillBox()
 
 TQVariant PComboBox::value() const
 {
-    TQMap<TQString, TQVariant>::const_iterator it = m_valueList.tqfind(m_edit->currentText());
+    TQMap<TQString, TQVariant>::const_iterator it = m_valueList.find(m_edit->currentText());
     if (it == m_valueList.end())
         return TQVariant("");
     return TQVariant(it.data());
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index b51ff4fc..c7e5523c 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -263,7 +263,7 @@ void PropertyEditor::addChildProperties(PropertyItem *tqparent)
 {
     MultiProperty *prop = tqparent->property();
     //force machine creation to get detailed properties appended to current multiproperty
-    if ( !m_registeredForType.tqcontains(prop->name())
+    if ( !m_registeredForType.contains(prop->name())
         && (PropertyMachineFactory::getInstance()->hasDetailedEditors(prop->type())) )
     {
         //FIXME: find better solution
@@ -328,10 +328,10 @@ void PropertyEditor::propertyChanged(MultiProperty *property, const TQVariant &v
 
     emit changed();
 
-/*    if (m_list->tqcontains(name))
+/*    if (m_list->contains(name))
     {
         (*m_list)[name]->setValue(value, false);
-//    else if (m_detailedList->tqcontains(*/
+//    else if (m_detailedList->contains(*/
 }
 
 void PropertyEditor::hideEditor()
diff --git a/lib/widgets/propeditor/propertylist.cpp b/lib/widgets/propeditor/propertylist.cpp
index 20feeb43..b831e6d2 100644
--- a/lib/widgets/propeditor/propertylist.cpp
+++ b/lib/widgets/propeditor/propertylist.cpp
@@ -41,7 +41,7 @@ PropertyList::~PropertyList()
 
 MultiProperty *PropertyList::operator[](const TQString &name)
 {
-    if (m_list.tqcontains(name))
+    if (m_list.contains(name))
         return m_list[name];
     else
         return new MultiProperty(this);
@@ -49,7 +49,7 @@ MultiProperty *PropertyList::operator[](const TQString &name)
 
 MultiProperty *PropertyList::property( const TQString &name )
 {
-	if (m_list.tqcontains(name))
+	if (m_list.contains(name))
 		return m_list[name];
 	else
 		return new MultiProperty(this);
@@ -60,7 +60,7 @@ void PropertyList::addProperty(Property *property)
     if (property == 0)
         return;
     MultiProperty *mp = 0;
-    if ( m_list.tqcontains(property->name()) )
+    if ( m_list.contains(property->name()) )
     {
         mp = m_list[property->name()];
         mp->addProperty(property);
@@ -79,7 +79,7 @@ void PropertyList::addProperty(const TQString &group, Property *property)
         return;
 
     MultiProperty *mp = 0;
-    if (m_list.tqcontains(property->name()))
+    if (m_list.contains(property->name()))
     {
         mp = m_list[property->name()];
         mp->addProperty(property);
@@ -119,7 +119,7 @@ void PropertyList::removeProperty(Property *property)
 
 void PropertyList::removeProperty(const TQString &name)
 {
-    if (m_list.tqcontains(name))
+    if (m_list.contains(name))
     {
         TQString group = m_groupOfProperty[m_list[name]];
         removeFromGroup(m_list[name]);
@@ -162,7 +162,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property)
         return;
 
     //do not add same property to the group twice
-    if (m_groupOfProperty.tqcontains(property) && (m_groupOfProperty[property] == group))
+    if (m_groupOfProperty.contains(property) && (m_groupOfProperty[property] == group))
         return;
 
     TQPair<TQString, TQValueList<TQString> > *groupPair = 0;
@@ -185,7 +185,7 @@ void PropertyList::addToGroup(const TQString &group, MultiProperty *property)
         return;
     }
     //check if group already contains property with the same name
-    if (!groupPair->second.tqcontains(property->name()))
+    if (!groupPair->second.contains(property->name()))
         groupPair->second.append(property->name());
 
     m_groupOfProperty[property] = group;
@@ -217,16 +217,16 @@ void PropertyList::clear( )
         removeProperty(it.key());
 }
 
-bool PropertyList::tqcontains( const TQString & name )
+bool PropertyList::contains( const TQString & name )
 {
-    if (m_list.tqcontains(name))
+    if (m_list.contains(name))
         return true;
     return false;
 }
 
 TQPtrList<Property> PropertyList::properties(const TQString &name)
 {
-    if (m_list.tqcontains(name))
+    if (m_list.contains(name))
         return m_list[name]->list;
     return TQPtrList<Property>();
 }
@@ -309,9 +309,9 @@ void PropertyBuffer::intersect(const PropertyList *list)
     for (TQMap<TQString, MultiProperty*>::iterator it = m_list.begin(); it != m_list.end(); ++it)
     {
 //        qWarning("intersect:: for mp = %s", it.data()->name().ascii());
-        if (list->m_list.tqcontains(it.key()))
+        if (list->m_list.contains(it.key()))
         {
-/*            qWarning("intersect::     list tqcontains %s", it.key().ascii());
+/*            qWarning("intersect::     list contains %s", it.key().ascii());
             if ( (*(it.data()) == *(list->m_list[it.key()])))
                 qWarning("intersect::     equal properties");
             else
@@ -334,7 +334,7 @@ void PropertyBuffer::intersectedValueChanged(Property *property)
 {
 //     qWarning("PropertyBuffer::intersectedValueChanged");
     TQString propertyName = property->name();
-    if (!tqcontains(propertyName))
+    if (!contains(propertyName))
         return;
 
     MultiProperty mp(property);
diff --git a/lib/widgets/propeditor/propertylist.h b/lib/widgets/propeditor/propertylist.h
index c549048b..94baf50d 100644
--- a/lib/widgets/propeditor/propertylist.h
+++ b/lib/widgets/propeditor/propertylist.h
@@ -118,7 +118,7 @@ public:
     /**Clears the list of properties.*/
     virtual void clear();
     /**Returns true if the list of properties contains property with given name.*/
-    virtual bool tqcontains(const TQString &name);
+    virtual bool contains(const TQString &name);
     
     /**The list of properties with given name.*/
     TQPtrList<Property> properties(const TQString &name);
diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp
index cccc3a37..e8390e18 100644
--- a/lib/widgets/propeditor/propertymachinefactory.cpp
+++ b/lib/widgets/propeditor/propertymachinefactory.cpp
@@ -76,7 +76,7 @@ Machine *PropertyMachineFactory::machineForProperty(MultiProperty *property)
     TQString propertyName = property->name();
     TQMap<TQString, TQVariant> valueList = property->valueList();
 
-    if (m_registeredForType.tqcontains(propertyName))
+    if (m_registeredForType.contains(propertyName))
         return (*m_registeredForType[propertyName])();
 
     switch (type)
diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp
index 565786f0..0c3119da 100644
--- a/lib/widgets/propeditor/qeditlistbox.cpp
+++ b/lib/widgets/propeditor/qeditlistbox.cpp
@@ -185,7 +185,7 @@ void QEditListBox::typedSomething(const TQString& text)
         else
         {
             StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive );
-            bool enable = (m_listBox->tqfindItem( text, mode ) == 0L);
+            bool enable = (m_listBox->findItem( text, mode ) == 0L);
             servNewButton->setEnabled( enable );
         }
     }
@@ -256,7 +256,7 @@ void QEditListBox::addItem()
         else
         {
             StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive );
-            alreadyInList =(m_listBox->tqfindItem(currentTextLE, mode) != 0);
+            alreadyInList =(m_listBox->findItem(currentTextLE, mode) != 0);
         }
     }
 
diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp
index 6a53f92b..793c52d2 100644
--- a/lib/widgets/qcomboview.cpp
+++ b/lib/widgets/qcomboview.cpp
@@ -480,13 +480,13 @@ void QComboView::mousePressEvent( TQMouseEvent *e )
     // and thus has a rect that doesn't fit the button.
     arrowRect.setHeight( TQMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) );
 
-    if ( childCount() && ( !editable() || arrowRect.tqcontains( e->pos() ) ) ) {
+    if ( childCount() && ( !editable() || arrowRect.contains( e->pos() ) ) ) {
         d->arrowPressed = FALSE;
         listView()->blockSignals( TRUE );
         tqApp->sendEvent( listView(), e ); // trigger the listbox's autoscroll
         listView()->blockSignals( FALSE );
         popup();
-        if ( arrowRect.tqcontains( e->pos() ) ) {
+        if ( arrowRect.contains( e->pos() ) ) {
             d->arrowPressed = TRUE;
             d->arrowDown    = TRUE;
             tqrepaint( FALSE );
@@ -895,7 +895,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
             if ( !d->mouseWasInsidePopup  ) {
 //                qWarning("!d->mouseWasInsidePopup");
                 TQPoint pos = e->pos();
-                if ( TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( pos ) )
+                if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( pos ) )
                     d->mouseWasInsidePopup = TRUE;
                 // Check if arrow button should toggle
                 if ( d->arrowPressed ) {
@@ -905,7 +905,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
                     tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
                                     TQStyle::SC_ComboBoxArrow);
                     arrowRect = TQStyle::tqvisualRect(arrowRect, this);
-                    if ( arrowRect.tqcontains( comboPos ) ) {
+                    if ( arrowRect.contains( comboPos ) ) {
                         if ( !d->arrowDown  ) {
                             d->arrowDown = TRUE;
                             tqrepaint( FALSE );
@@ -935,7 +935,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
 
             break;
         case TQEvent::MouseButtonRelease:
-            if ( TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( e->pos() ) ) {
+            if ( TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) {
                 TQMouseEvent tmp( TQEvent::MouseButtonDblClick,
                         e->pos(), e->button(), e->state() ) ;
                 // will hide popup
@@ -955,7 +955,7 @@ bool QComboView::eventFilter( TQObject *object, TQEvent *event )
             break;
         case TQEvent::MouseButtonDblClick:
         case TQEvent::MouseButtonPress:
-            if ( !TQT_TQRECT_OBJECT(d->listView()->rect()).tqcontains( e->pos() ) ) {
+            if ( !TQT_TQRECT_OBJECT(d->listView()->rect()).contains( e->pos() ) ) {
                 TQPoint globalPos = d->listView()->mapToGlobal(e->pos());
                 if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) {
                     d->discardNextMousePress = TRUE;
@@ -1085,7 +1085,7 @@ void QComboView::returnPressed()
     TQListViewItem *c = 0;
     bool doInsert = TRUE;
     if ( !d->duplicatesEnabled ) {
-        c = listView()->tqfindItem(s, 0);
+        c = listView()->findItem(s, 0);
         if ( c )
             doInsert = FALSE;
     }
@@ -1457,7 +1457,7 @@ void QComboView::setLineEdit( TQLineEdit *edit )
 void QComboView::setCurrentText( const TQString& txt )
 {
     TQListViewItem *i;
-    i = listView()->tqfindItem(txt, 0);
+    i = listView()->findItem(txt, 0);
     if ( i )
         setCurrentItem( i );
     else if ( d->ed )