From 6e21bc798ba1066147d69dcc2d5c222ffafb9a90 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 06:08:18 +0000 Subject: rename the following methods: tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeui/kaccelgen.h | 8 ++++---- kdeui/kaction.cpp | 2 +- kdeui/kactionclasses.cpp | 18 +++++++++--------- kdeui/kactioncollection.cpp | 2 +- kdeui/kbugreport.cpp | 2 +- kdeui/kcharselect.cpp | 2 +- kdeui/kcmenumngr.cpp | 2 +- kdeui/kcolordialog.cpp | 4 ++-- kdeui/kcombobox.cpp | 2 +- kdeui/kcommand.cpp | 18 +++++++++--------- kdeui/kconfigdialog.cpp | 2 +- kdeui/kcursor.cpp | 4 ++-- kdeui/kdatetbl.cpp | 2 +- kdeui/kdetrayproxy/kdetrayproxy.cpp | 16 ++++++++-------- kdeui/kdockwidget.cpp | 22 +++++++++++----------- kdeui/keditcl1.cpp | 2 +- kdeui/keditcl2.cpp | 14 +++++++------- kdeui/keditlistbox.cpp | 4 ++-- kdeui/kedittoolbar.cpp | 6 +++--- kdeui/kfontcombo.cpp | 4 ++-- kdeui/kfontdialog.cpp | 22 +++++++++++----------- kdeui/kiconview.cpp | 6 +++--- kdeui/kiconviewsearchline.cpp | 2 +- kdeui/kinputdialog.cpp | 4 ++-- kdeui/kjanuswidget.cpp | 8 ++++---- kdeui/klanguagebutton.cpp | 8 ++++---- kdeui/klineedit.cpp | 4 ++-- kdeui/klistview.cpp | 6 +++--- kdeui/klistviewsearchline.cpp | 8 ++++---- kdeui/kmenubar.cpp | 2 +- kdeui/knumvalidator.cpp | 12 ++++++------ kdeui/kpanelapplet.cpp | 6 +++--- kdeui/kpassdlg.cpp | 10 +++++----- kdeui/kpopupmenu.cpp | 24 ++++++++++++------------ kdeui/ksconfig.cpp | 10 +++++----- kdeui/kspell.cpp | 28 ++++++++++++++-------------- kdeui/kstringvalidator.cpp | 6 +++--- kdeui/kswitchlanguagedialog.cpp | 2 +- kdeui/ksyntaxhighlighter.cpp | 18 +++++++++--------- kdeui/ktabbar.cpp | 10 +++++----- kdeui/ktextbrowser.cpp | 2 +- kdeui/ktip.cpp | 4 ++-- kdeui/ktoolbar.cpp | 24 ++++++++++++------------ kdeui/ktoolbarhandler.cpp | 2 +- kdeui/ktoolbarradiogroup.cpp | 6 +++--- kdeui/kxmlguiclient.cpp | 14 +++++++------- kdeui/kxmlguifactory.cpp | 2 +- kdeui/kxmlguifactory_p.cpp | 14 +++++++------- kdeui/qxembed.cpp | 2 +- 49 files changed, 201 insertions(+), 201 deletions(-) (limited to 'kdeui') diff --git a/kdeui/kaccelgen.h b/kdeui/kaccelgen.h index 696f85cda..8f0c50bed 100644 --- a/kdeui/kaccelgen.h +++ b/kdeui/kaccelgen.h @@ -131,7 +131,7 @@ loadPredefined(Iter begin, Iter end, TQMap& keys) { for (Iter i = begin; i != end; ++i) { TQString item = Deref::deref(i); - int user_ampersand = item.tqfind(TQChar('&')); + int user_ampersand = item.find(TQChar('&')); if( user_ampersand >= 0 ) { // Sanity check. Note that we don't try to find an // accelerator if the user shoots him/herself in the foot @@ -178,7 +178,7 @@ generate(Iter begin, Iter end, TQStringList& target) // Attempt to find a good accelerator, but only if the user // has not manually hardcoded one. - int user_ampersand = item.tqfind(TQChar('&')); + int user_ampersand = item.find(TQChar('&')); if( user_ampersand < 0 || item[user_ampersand+1] == '&') { bool found = false; uint found_idx; @@ -187,7 +187,7 @@ generate(Iter begin, Iter end, TQStringList& target) // Check word-starting letters first. for( j=0; j < item.length(); ++j ) { if( isLegalAccelerator(item, j) - && !used_accels.tqcontains(item[j]) + && !used_accels.contains(item[j]) && (0 == j || (j > 0 && item[j-1].isSpace())) ) { found = true; found_idx = j; @@ -199,7 +199,7 @@ generate(Iter begin, Iter end, TQStringList& target) // No word-starting letter; search for any letter. for( j=0; j < item.length(); ++j ) { if( isLegalAccelerator(item, j) - && !used_accels.tqcontains(item[j]) ) { + && !used_accels.contains(item[j]) ) { found = true; found_idx = j; break; diff --git a/kdeui/kaction.cpp b/kdeui/kaction.cpp index 3502f9d20..6a0ad7812 100644 --- a/kdeui/kaction.cpp +++ b/kdeui/kaction.cpp @@ -530,7 +530,7 @@ void KAction::updateShortcut( TQPopupMenu* menu, int id ) // show the string representation of its shortcut. if ( d->m_kaccel || d->m_kaccelList.count() ) { TQString s = menu->text( id ); - int i = s.tqfind( '\t' ); + int i = s.find( '\t' ); if ( i >= 0 ) s.replace( i+1, s.length()-i, d->m_cut.seq(0).toString() ); else diff --git a/kdeui/kactionclasses.cpp b/kdeui/kactionclasses.cpp index 9c5d201fb..4c757157d 100644 --- a/kdeui/kactionclasses.cpp +++ b/kdeui/kactionclasses.cpp @@ -730,7 +730,7 @@ TQStringList KSelectAction::comboItems() const for( ; it != d->m_list.end(); ++it ) { TQString item = *it; - int i = item.tqfind( '&' ); + int i = item.find( '&' ); if ( i > -1 ) item = item.remove( i, 1 ); lst.append( item ); @@ -779,18 +779,18 @@ void KSelectAction::slotActivated( const TQString &text ) if ( isEditable() ) { TQStringList lst = d->m_list; - if(!lst.tqcontains(text)) + if(!lst.contains(text)) { lst.append( text ); setItems( lst ); } } - int i = d->m_list.tqfindIndex( text ); + int i = d->m_list.findIndex( text ); if ( i > -1 ) setCurrentItem( i ); else - setCurrentItem( comboItems().tqfindIndex( text ) ); + setCurrentItem( comboItems().findIndex( text ) ); // Delay this. Especially useful when the slot connected to activated() will re-create // the menu, e.g. in the recent files action. This prevents a crash. TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) ); @@ -1476,7 +1476,7 @@ void KFontAction::setFont( const TQString &family ) return; } } - i = lowerName.tqfind(" ["); + i = lowerName.find(" ["); if (i>-1) { lowerName = lowerName.left(i); @@ -1513,7 +1513,7 @@ void KFontAction::setFont( const TQString &family ) FcConfigSubstitute (config, pattern, FcMatchPattern); pattern = FcFontMatch(NULL, pattern, NULL); realFamily = (char*)FcNameUnparse(pattern); - realFamily.remove(realFamily.tqfind(regExp), realFamily.length()); + realFamily.remove(realFamily.find(regExp), realFamily.length()); if ( !realFamily.isEmpty() && realFamily != family ) setFont( realFamily ); @@ -1637,7 +1637,7 @@ void KFontSizeAction::init() void KFontSizeAction::setFontSize( int size ) { if ( size == fontSize() ) { - setCurrentItem( items().tqfindIndex( TQString::number( size ) ) ); + setCurrentItem( items().findIndex( TQString::number( size ) ) ); return; } @@ -1646,7 +1646,7 @@ void KFontSizeAction::setFontSize( int size ) return; } - int index = items().tqfindIndex( TQString::number( size ) ); + int index = items().findIndex( TQString::number( size ) ); if ( index == -1 ) { // Insert at the correct position in the list (to keep sorting) TQValueList lst; @@ -1664,7 +1664,7 @@ void KFontSizeAction::setFontSize( int size ) strLst.append( TQString::number(*it) ); KSelectAction::setItems( strLst ); // Find new current item - index = lst.tqfindIndex( size ); + index = lst.findIndex( size ); setCurrentItem( index ); } else diff --git a/kdeui/kactioncollection.cpp b/kdeui/kactioncollection.cpp index 671bc5d94..69a87eaee 100644 --- a/kdeui/kactioncollection.cpp +++ b/kdeui/kactioncollection.cpp @@ -426,7 +426,7 @@ TQStringList KActionCollection::groups() const TQAsciiDictIterator it( d->m_actionDict ); for( ; it.current(); ++it ) - if ( !it.current()->group().isEmpty() && !lst.tqcontains( it.current()->group() ) ) + if ( !it.current()->group().isEmpty() && !lst.contains( it.current()->group() ) ) lst.append( it.current()->group() ); return lst; diff --git a/kdeui/kbugreport.cpp b/kdeui/kbugreport.cpp index 8e37eff3d..0e0f6450d 100644 --- a/kdeui/kbugreport.cpp +++ b/kdeui/kbugreport.cpp @@ -289,7 +289,7 @@ void KBugReport::updateURL() void KBugReport::appChanged(int i) { TQString appName = d->appcombo->text(i); - int index = appName.tqfind( '/' ); + int index = appName.find( '/' ); if ( index > 0 ) appName = appName.left( index ); kdDebug() << "appName " << appName << endl; diff --git a/kdeui/kcharselect.cpp b/kdeui/kcharselect.cpp index 2ae916efe..7bd0320c9 100644 --- a/kdeui/kcharselect.cpp +++ b/kdeui/kcharselect.cpp @@ -460,7 +460,7 @@ TQSize KCharSelect::tqsizeHint() const //================================================================== void KCharSelect::setFont( const TQString &_font ) { - const TQValueList::Iterator it = fontList.tqfind( _font ); + const TQValueList::Iterator it = fontList.find( _font ); if ( it != fontList.end() ) { TQValueList::Iterator it2 = fontList.begin(); int pos = 0; diff --git a/kdeui/kcmenumngr.cpp b/kdeui/kcmenumngr.cpp index 2288a5963..d985c8e91 100644 --- a/kdeui/kcmenumngr.cpp +++ b/kdeui/kcmenumngr.cpp @@ -122,7 +122,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e) void KContextMenuManager::widgetDestroyed() { - if ( menus.tqfind( (TQObject*)sender() ) ) + if ( menus.find( (TQObject*)sender() ) ) menus.remove( (TQObject*)sender() ); } diff --git a/kdeui/kcolordialog.cpp b/kdeui/kcolordialog.cpp index 990e9df9e..a9b1c36ac 100644 --- a/kdeui/kcolordialog.cpp +++ b/kdeui/kcolordialog.cpp @@ -674,8 +674,8 @@ KPaletteTable::readNamedColor( void ) // that start with "gray". // TQString name = line.mid(pos).stripWhiteSpace(); - if( name.isNull() || name.tqfind(' ') != -1 || - name.tqfind( "gray" ) != -1 || name.tqfind( "grey" ) != -1 ) + if( name.isNull() || name.find(' ') != -1 || + name.find( "gray" ) != -1 || name.find( "grey" ) != -1 ) { continue; } diff --git a/kdeui/kcombobox.cpp b/kdeui/kcombobox.cpp index af4852ac2..2b6b0098c 100644 --- a/kdeui/kcombobox.cpp +++ b/kdeui/kcombobox.cpp @@ -163,7 +163,7 @@ void KComboBox::makeCompletion( const TQString& text ) if( text.isNull() || !listBox() ) return; - const int index = listBox()->index( listBox()->tqfindItem( text ) ); + const int index = listBox()->index( listBox()->findItem( text ) ); if( index >= 0 ) setCurrentItem( index ); } diff --git a/kdeui/kcommand.cpp b/kdeui/kcommand.cpp index 4960c8016..2c76b21cd 100644 --- a/kdeui/kcommand.cpp +++ b/kdeui/kcommand.cpp @@ -133,7 +133,7 @@ void KCommandHistory::addCommand(KCommand *command, bool execute) { return; int index; - if(d->m_present && (index=m_commands.tqfindRef(d->m_present))!=-1) { + if(d->m_present && (index=m_commands.findRef(d->m_present))!=-1) { if (m_first) --index; m_commands.insert(index+1, command); @@ -192,7 +192,7 @@ void KCommandHistory::undo() { m_redo->setText(i18n("&Redo: %1").arg(d->m_present->name())); } int index; - if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.prev()) { + if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.prev()) { d->m_present=m_commands.current(); if (m_undo) { m_undo->setEnabled(true); @@ -226,7 +226,7 @@ void KCommandHistory::redo() { if(!d->m_savedAt) emit documentRestored(); } - else if((index=m_commands.tqfindRef(d->m_present))!=-1 && m_commands.next()) { + else if((index=m_commands.findRef(d->m_present))!=-1 && m_commands.next()) { d->m_present=m_commands.current(); d->m_present->execute(); emit commandExecuted(); @@ -257,7 +257,7 @@ void KCommandHistory::redo() { void KCommandHistory::documentSaved() { if(d->m_present && !m_first) - d->m_savedAt=m_commands.tqfindRef(d->m_present); + d->m_savedAt=m_commands.findRef(d->m_present); else if(!d->m_present && !m_first) d->m_savedAt=-42; // this value signals that the document has // been saved with an empty history. @@ -287,7 +287,7 @@ void KCommandHistory::clipCommands() { if(count<=m_undoLimit && count<=m_redoLimit) return; - int index=m_commands.tqfindRef(d->m_present); + int index=m_commands.findRef(d->m_present); if(index>=m_undoLimit) { for(int i=0; i<=(index-m_undoLimit); ++i) { m_commands.removeFirst(); @@ -295,7 +295,7 @@ void KCommandHistory::clipCommands() { if(d->m_savedAt==-1) d->m_savedAt=-42; } - index=m_commands.tqfindRef(d->m_present); // calculate the new + index=m_commands.findRef(d->m_present); // calculate the new count=m_commands.count(); // values (for the redo-branch :) // make it easier for us... d->m_savedAt==-1 -> invalid if(d->m_savedAt!=-42 && d->m_savedAt<-1) @@ -316,7 +316,7 @@ void KCommandHistory::slotUndoAboutToShow() { m_undoPopup->clear(); int i = 0; - if (m_commands.tqfindRef(d->m_present)!=-1) + if (m_commands.findRef(d->m_present)!=-1) while ( m_commands.current() && i<10 ) // TODO make number of items configurable ? { m_undoPopup->insertItem( i18n("Undo: %1").arg(m_commands.current()->name()), i++ ); @@ -340,7 +340,7 @@ void KCommandHistory::slotRedoAboutToShow() d->m_present = m_commands.first(); m_redoPopup->insertItem( i18n("Redo: %1").arg(d->m_present->name()), i++ ); } - if (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next()) + if (m_commands.findRef(d->m_present)!=-1 && m_commands.next()) while ( m_commands.current() && i<10 ) // TODO make number of items configurable ? { m_redoPopup->insertItem( i18n("Redo: %1").arg(m_commands.current()->name()), i++ ); @@ -360,7 +360,7 @@ void KCommandHistory::updateActions() if ( m_undo && m_redo ) { m_undo->setEnabled( !m_first && ( d->m_present ) ); - m_redo->setEnabled(m_first || (m_commands.tqfindRef(d->m_present)!=-1 && m_commands.next())); + m_redo->setEnabled(m_first || (m_commands.findRef(d->m_present)!=-1 && m_commands.next())); } } diff --git a/kdeui/kconfigdialog.cpp b/kdeui/kconfigdialog.cpp index d0cb6aaa7..2a6f95a21 100644 --- a/kdeui/kconfigdialog.cpp +++ b/kdeui/kconfigdialog.cpp @@ -160,7 +160,7 @@ void KConfigDialog::setupManagerConnections(KConfigDialogManager *manager) KConfigDialog* KConfigDialog::exists(const char* name) { - return openDialogs.tqfind(name); + return openDialogs.find(name); } bool KConfigDialog::showDialog(const char* name) diff --git a/kdeui/kcursor.cpp b/kdeui/kcursor.cpp index da32249a9..5907c4ba0 100644 --- a/kdeui/kcursor.cpp +++ b/kdeui/kcursor.cpp @@ -386,7 +386,7 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve if ( enable ) { - if ( m_eventFilters.tqfind( w ) != NULL ) + if ( m_eventFilters.find( w ) != NULL ) return; KCursorPrivateAutoHideEventFilter* filter = new KCursorPrivateAutoHideEventFilter( w ); m_eventFilters.insert( w, filter ); @@ -412,7 +412,7 @@ bool KCursorPrivate::eventFilter( TQObject *o, TQEvent *e ) if ( !enabled ) return false; - KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.tqfind( o ); + KCursorPrivateAutoHideEventFilter* filter = m_eventFilters.find( o ); Q_ASSERT( filter != NULL ); if ( filter == NULL ) diff --git a/kdeui/kdatetbl.cpp b/kdeui/kdatetbl.cpp index e4f1ae988..a2bbdf9d3 100644 --- a/kdeui/kdatetbl.cpp +++ b/kdeui/kdatetbl.cpp @@ -596,7 +596,7 @@ void KDateTable::setCustomDatePainting(const TQDate &date, const TQColor &fgColo mode->fgColor=fgColor; mode->bgColor=bgColor; - d->customPaintingModes.tqreplace( date.toString(), mode ); + d->customPaintingModes.replace( date.toString(), mode ); d->useCustomColors=true; update(); } diff --git a/kdeui/kdetrayproxy/kdetrayproxy.cpp b/kdeui/kdetrayproxy/kdetrayproxy.cpp index 5e798ebab..7cb621bd8 100644 --- a/kdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/kdeui/kdetrayproxy/kdetrayproxy.cpp @@ -55,11 +55,11 @@ void KDETrayProxy::windowAdded( WId w ) if ( !trayWinFor ) // not a KDE tray window return; // kdDebug() << "New tray window:" << w << endl; - if( !tray_windows.tqcontains( w )) + if( !tray_windows.contains( w )) tray_windows.append( w ); withdrawWindow( w ); // window will be removed from pending_windows when after docked - if( !pending_windows.tqcontains( w )) + if( !pending_windows.contains( w )) pending_windows.append( w ); docked_windows.remove( w ); Window owner = selection.owner(); @@ -85,21 +85,21 @@ bool KDETrayProxy::x11Event( XEvent* e ) { if( tray_windows.isEmpty()) return false; - if( e->type == DestroyNotify && tray_windows.tqcontains( e->xdestroywindow.window )) + if( e->type == DestroyNotify && tray_windows.contains( e->xdestroywindow.window )) { tray_windows.remove( e->xdestroywindow.window ); pending_windows.remove( e->xdestroywindow.window ); docked_windows.remove( e->xdestroywindow.window ); } - if( e->type == ReparentNotify && tray_windows.tqcontains( e->xreparent.window )) + if( e->type == ReparentNotify && tray_windows.contains( e->xreparent.window )) { if( e->xreparent.parent == qt_xrootwin()) { - if( !docked_windows.tqcontains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] ) + if( !docked_windows.contains( e->xreparent.window ) || e->xreparent.serial >= docked_windows[ e->xreparent.window ] ) { // kdDebug() << "Window released:" << e->xreparent.window << endl; docked_windows.remove( e->xreparent.window ); - if( !pending_windows.tqcontains( e->xreparent.window )) + if( !pending_windows.contains( e->xreparent.window )) pending_windows.append( e->xreparent.window ); } } @@ -109,9 +109,9 @@ bool KDETrayProxy::x11Event( XEvent* e ) pending_windows.remove( e->xreparent.window ); } } - if( e->type == UnmapNotify && tray_windows.tqcontains( e->xunmap.window )) + if( e->type == UnmapNotify && tray_windows.contains( e->xunmap.window )) { - if( docked_windows.tqcontains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] ) + if( docked_windows.contains( e->xunmap.window ) && e->xunmap.serial >= docked_windows[ e->xunmap.window ] ) { // kdDebug() << "Window unmapped:" << e->xunmap.window << endl; XReparentWindow( qt_xdisplay(), e->xunmap.window, qt_xrootwin(), 0, 0 ); diff --git a/kdeui/kdockwidget.cpp b/kdeui/kdockwidget.cpp index f5dd09efc..5590299fc 100644 --- a/kdeui/kdockwidget.cpp +++ b/kdeui/kdockwidget.cpp @@ -355,7 +355,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { btn->reparent(this,TQPoint(0,0)); } btn->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - if (!d->btns.tqcontainsRef(btn)) d->btns.append(btn); + if (!d->btns.containsRef(btn)) d->btns.append(btn); btn->show(); @@ -383,7 +383,7 @@ void KDockWidgetHeader::addButton(KDockButton_Private* btn) { void KDockWidgetHeader::removeButton(KDockButton_Private* btn) { if (btn->parentWidget()==this) { - if (d->btns.tqcontainsRef(btn)) d->btns.removeRef(btn); + if (d->btns.containsRef(btn)) d->btns.removeRef(btn); delete btn; } } @@ -1860,12 +1860,12 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( qt_tqfind_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; + if ( qt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; + if ( qt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; if (tqt_dynamic_cast(w)) return 0L; if (!childDockWidgetList) return 0L; - if ( childDockWidgetList->tqfind(w) != -1 ) return 0L; + if ( childDockWidgetList->find(w) != -1 ) return 0L; if ( currentDragWidget->isGroup && ((KDockWidget*)w)->parentDockTabGroup() ) return 0L; KDockWidget* www = (KDockWidget*)w; @@ -1910,7 +1910,7 @@ void KDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const while ( it.current() ) { if ( it.current()->isWidgetType() ) { w = (TQWidget*)it.current(); - if ( w->isVisible() && w->tqgeometry().tqcontains(pos) ) { + if ( w->isVisible() && w->tqgeometry().contains(pos) ) { if ( w->inherits("KDockWidget") ) ww = w; findChildDockWidget( ww, w, w->mapFromParent(pos) ); return; @@ -2230,8 +2230,8 @@ void KDockManager::writeConfig(TQDomElement &base) TQStringList::Iterator nListIt=nList.begin(); while ( nListIt!=nList.end() ) { KDockWidget *obj = getDockWidgetFromName( *nListIt); - if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.tqfind( obj->firstName.latin1() ) == -1 - || nameList.tqfind(obj->lastName.latin1()) == -1)) { + if ((obj->isGroup && (!obj->d->isContainer)) && (nameList.find( obj->firstName.latin1() ) == -1 + || nameList.find(obj->lastName.latin1()) == -1)) { // Skip until children are saved (why?) ++nListIt; // nList.next(); @@ -2578,7 +2578,7 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) } /*************************************************************************************************/ if ( obj->isGroup ){ - if ( (findList.tqfind( obj->firstName ) != findList.end()) && (findList.tqfind( obj->lastName ) != findList.end() )){ + if ( (findList.find( obj->firstName ) != findList.end()) && (findList.find( obj->lastName ) != findList.end() )){ c->writeEntry( cname+":type", "GROUP"); if ( !obj->parent() ){ @@ -2601,9 +2601,9 @@ void KDockManager::writeConfig( KConfig* c, TQString group ) } else { /*************************************************************************************************/ //debug(" Skip %s", nList.current()); - //if ( findList.tqfind( obj->firstName ) == -1 ) + //if ( findList.find( obj->firstName ) == -1 ) // debug(" ? Not found %s", obj->firstName); - //if ( findList.tqfind( obj->lastName ) == -1 ) + //if ( findList.find( obj->lastName ) == -1 ) // debug(" ? Not found %s", obj->lastName); ++nListIt; // if ( !nList.current() ) nList.first(); diff --git a/kdeui/keditcl1.cpp b/kdeui/keditcl1.cpp index e32081fa9..fe886f434 100644 --- a/kdeui/keditcl1.cpp +++ b/kdeui/keditcl1.cpp @@ -359,7 +359,7 @@ void KEdit::computePosition() while(find >=0 && find <= coltemp- 1 ){ - find = linetext.tqfind('\t', find+start_of_line, true )-start_of_line; + find = linetext.find('\t', find+start_of_line, true )-start_of_line; if( find >=0 && find <= coltemp - 1 ){ found_one = true; pos = pos + find - mem; diff --git a/kdeui/keditcl2.cpp b/kdeui/keditcl2.cpp index c885b6b27..4bbc12c30 100644 --- a/kdeui/keditcl2.cpp +++ b/kdeui/keditcl2.cpp @@ -162,7 +162,7 @@ int KEdit::doSearch(TQString s_pattern, bool case_sensitive, string = textLine(i); - pos = string.tqfind(s_pattern, i == line ? col : 0, case_sensitive); + pos = string.find(s_pattern, i == line ? col : 0, case_sensitive); if( pos != -1){ @@ -191,7 +191,7 @@ int KEdit::doSearch(TQString s_pattern, bool case_sensitive, string = textLine(i); int line_length = string.length(); - pos = string.tqfindRev(s_pattern, line == i ? col : line_length , case_sensitive); + pos = string.findRev(s_pattern, line == i ? col : line_length , case_sensitive); if (pos != -1){ @@ -528,10 +528,10 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, string = textLine(line_counter); if (replace_all){ - pos = string.tqfind(s_pattern, replace_all_col, case_sensitive); + pos = string.find(s_pattern, replace_all_col, case_sensitive); } else{ - pos = string.tqfind(s_pattern, line_counter == line ? col : 0, case_sensitive); + pos = string.find(s_pattern, line_counter == line ? col : 0, case_sensitive); } if (pos == -1 ){ @@ -554,7 +554,7 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, replace_all_col = pos + replacement.length(); replace_all_line = line_counter; - pos = stringnew.tqfind(s_pattern, replace_all_col, case_sensitive); + pos = stringnew.find(s_pattern, replace_all_col, case_sensitive); } while( pos != -1); @@ -595,13 +595,13 @@ int KEdit::doReplace(TQString s_pattern, bool case_sensitive, if (replace_all_col < 0) pos = -1; else - pos = string.tqfindRev(s_pattern, replace_all_col , case_sensitive); + pos = string.findRev(s_pattern, replace_all_col , case_sensitive); } else{ if ((line == line_counter) && (col < 0)) pos = -1; else - pos = string.tqfindRev(s_pattern, + pos = string.findRev(s_pattern, line == line_counter ? col : line_length , case_sensitive); } diff --git a/kdeui/keditlistbox.cpp b/kdeui/keditlistbox.cpp index f8aeb096f..81277ed55 100644 --- a/kdeui/keditlistbox.cpp +++ b/kdeui/keditlistbox.cpp @@ -195,7 +195,7 @@ void KEditListBox::typedSomething(const TQString& text) else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - bool enable = (!m_listBox->tqfindItem( text, mode )); + bool enable = (!m_listBox->findItem( text, mode )); servNewButton->setEnabled( enable ); } } @@ -266,7 +266,7 @@ void KEditListBox::addItem() else { StringComparisonMode mode = (StringComparisonMode) (ExactMatch | CaseSensitive ); - alreadyInList =(m_listBox->tqfindItem(currentTextLE, mode) ); + alreadyInList =(m_listBox->findItem(currentTextLE, mode) ); } } diff --git a/kdeui/kedittoolbar.cpp b/kdeui/kedittoolbar.cpp index cb21c2160..98a1f0537 100644 --- a/kdeui/kedittoolbar.cpp +++ b/kdeui/kedittoolbar.cpp @@ -485,7 +485,7 @@ void KEditToolbar::slotDefault() } else { - int slash = d->m_file.tqfindRev('/')+1; + int slash = d->m_file.findRev('/')+1; if (slash) d->m_file = d->m_file.mid(slash); TQString xml_file = locateLocal("data", TQString::tqfromLatin1( KGlobal::instance()->instanceName() + '/' ) + d->m_file); @@ -1034,7 +1034,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem) KAction *action = actionCollection->action( i ); // skip our active ones - if (active_list.tqcontains(action->name())) + if (active_list.contains(action->name())) continue; ToolbarItem *act = new ToolbarItem(m_inactiveList, tagActionList, action->name(), action->toolTip()); @@ -1361,7 +1361,7 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem) continue; TQDomElement toolbar = (*xit).m_document.documentElement().toElement(); - toolbar.tqreplaceChild(elem, (*it)); + toolbar.replaceChild(elem, (*it)); return; } diff --git a/kdeui/kfontcombo.cpp b/kdeui/kfontcombo.cpp index 173b08cff..e62360521 100644 --- a/kdeui/kfontcombo.cpp +++ b/kdeui/kfontcombo.cpp @@ -212,7 +212,7 @@ void KFontCombo::setCurrentFont(const TQString &family) return; } } - int x = lowerName.tqfind(" ["); + int x = lowerName.find(" ["); if (x>-1) { lowerName = lowerName.left(x); @@ -251,7 +251,7 @@ void KFontCombo::setCurrentFont(const TQString &family) FcConfigSubstitute (config, pattern, FcMatchPattern); pattern = FcFontMatch(NULL, pattern, NULL); realFamily = (char*)FcNameUnparse(pattern); - realFamily.remove(realFamily.tqfind(regExp), realFamily.length()); + realFamily.remove(realFamily.find(regExp), realFamily.length()); if ( !realFamily.isEmpty() && realFamily != family ) setCurrentFont( realFamily ); diff --git a/kdeui/kfontdialog.cpp b/kdeui/kfontdialog.cpp index 6aae075e2..bea8e78fe 100644 --- a/kdeui/kfontdialog.cpp +++ b/kdeui/kfontdialog.cpp @@ -284,7 +284,7 @@ KFontChooser::KFontChooser(TQWidget *parent, const char *name, connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)), TQT_SLOT(size_chosen_slot(const TQString&)) ); - sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(10)), true); // default to 10pt. + sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt. row ++; @@ -469,13 +469,13 @@ void KFontChooser::family_chosen_slot(const TQString& family) currentStyles.clear(); for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) { TQString style = *it; - int pos = style.tqfind("Plain"); + int pos = style.find("Plain"); if(pos >=0) style = style.replace(pos,5,i18n("Regular")); - pos = style.tqfind("Normal"); + pos = style.find("Normal"); if(pos >=0) style = style.replace(pos,6,i18n("Regular")); - pos = style.tqfind("Oblique"); + pos = style.find("Oblique"); if(pos >=0) style = style.replace(pos,7,i18n("Italic")); - if(!styleListBox->tqfindItem(style)) { + if(!styleListBox->findItem(style)) { styleListBox->insertItem(i18n(style.utf8())); currentStyles.insert(i18n(style.utf8()), *it); } @@ -486,9 +486,9 @@ void KFontChooser::family_chosen_slot(const TQString& family) } styleListBox->blockSignals(true); - TQListBoxItem *item = styleListBox->tqfindItem(selectedStyle); + TQListBoxItem *item = styleListBox->findItem(selectedStyle); if (item) - styleListBox->setSelected(styleListBox->tqfindItem(selectedStyle), true); + styleListBox->setSelected(styleListBox->findItem(selectedStyle), true); else styleListBox->setSelected(0, true); styleListBox->blockSignals(false); @@ -538,7 +538,7 @@ void KFontChooser::style_chosen_slot(const TQString& style) fillSizeList(); } sizeListBox->blockSignals(true); - sizeListBox->setSelected(sizeListBox->tqfindItem(TQString::number(selectedSize)), true); + sizeListBox->setSelected(sizeListBox->findItem(TQString::number(selectedSize)), true); sizeListBox->blockSignals(false); sizeListBox->ensureCurrentVisible(); @@ -587,7 +587,7 @@ void KFontChooser::setupDisplay() { if (family.contains('[')) { - family = family.left(family.tqfind('[')).stripWhiteSpace(); + family = family.left(family.find('[')).stripWhiteSpace(); for (i = 0; i < numEntries; i++) { if (family == familyListBox->text(i).lower()) { familyListBox->setCurrentItem(i); @@ -684,10 +684,10 @@ void KFontChooser::addFont( TQStringList &list, const char *xfont ) TQString font = TQString::tqfromLatin1(ptr + 1); int pos; - if ( ( pos = font.tqfind( '-' ) ) > 0 ) { + if ( ( pos = font.find( '-' ) ) > 0 ) { font.truncate( pos ); - if ( font.tqfind( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) + if ( font.find( TQString::tqfromLatin1("open look"), 0, false ) >= 0 ) return; TQStringList::Iterator it = list.begin(); diff --git a/kdeui/kiconview.cpp b/kdeui/kiconview.cpp index ce1aec637..6d3f51a2b 100644 --- a/kdeui/kiconview.cpp +++ b/kdeui/kiconview.cpp @@ -258,7 +258,7 @@ void KIconView::emitExecute( TQIconViewItem *item, const TQPoint &pos ) void KIconView::updateDragHoldItem( TQDropEvent *e ) { - TQIconViewItem *item = tqfindItem( e->pos() ); + TQIconViewItem *item = findItem( e->pos() ); if ( d->dragHoldItem != item) { @@ -307,7 +307,7 @@ void KIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { TQIconView::contentsMouseDoubleClickEvent( e ); - TQIconViewItem* item = tqfindItem( e->pos() ); + TQIconViewItem* item = findItem( e->pos() ); if( item ) { if( (e->button() == Qt::LeftButton) && !m_bUseSingle ) @@ -417,7 +417,7 @@ TQFontMetrics *KIconView::itemFontMetrics() const TQPixmap KIconView::selectedIconPixmap( TQPixmap *pix, const TQColor &col ) const { TQPixmap m; - if ( d->maskCache.tqfind( TQString::number( pix->serialNumber() ), m ) ) + if ( d->maskCache.find( TQString::number( pix->serialNumber() ), m ) ) return m; m = KPixmapEffect::selectedPixmap( KPixmap(*pix), col ); d->maskCache.insert( TQString::number( pix->serialNumber() ), m ); diff --git a/kdeui/kiconviewsearchline.cpp b/kdeui/kiconviewsearchline.cpp index 1ee76c9df..701e15428 100644 --- a/kdeui/kiconviewsearchline.cpp +++ b/kdeui/kiconviewsearchline.cpp @@ -224,7 +224,7 @@ bool KIconViewSearchLine::itemMatches( const TQIconViewItem *item, return false; TQString itemtext = item->text(); - return ( itemtext.tqfind( s, 0, caseSensitive() ) >= 0 ); + return ( itemtext.find( s, 0, caseSensitive() ) >= 0 ); } void KIconViewSearchLine::init( TQIconView *iconView ) diff --git a/kdeui/kinputdialog.cpp b/kdeui/kinputdialog.cpp index 06ceeecd4..61b30cce1 100644 --- a/kdeui/kinputdialog.cpp +++ b/kdeui/kinputdialog.cpp @@ -229,7 +229,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, for ( TQStringList::ConstIterator it=select.begin(); it!=select.end(); ++it ) { - item = d->m_listBox->tqfindItem( *it, CaseSensitive|ExactMatch ); + item = d->m_listBox->findItem( *it, CaseSensitive|ExactMatch ); if ( item ) d->m_listBox->setSelected( item, true ); } @@ -242,7 +242,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, TQT_SLOT( slotOk() ) ); TQString text = select.first(); - item = d->m_listBox->tqfindItem( text, CaseSensitive|ExactMatch ); + item = d->m_listBox->findItem( text, CaseSensitive|ExactMatch ); if ( item ) d->m_listBox->setSelected( item, true ); } diff --git a/kdeui/kjanuswidget.cpp b/kdeui/kjanuswidget.cpp index 3605d492d..4109e6346 100644 --- a/kdeui/kjanuswidget.cpp +++ b/kdeui/kjanuswidget.cpp @@ -413,7 +413,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap curPath << name; TQString key = curPath.join("_/_"); - if (mFolderIconMap.tqcontains(key)) { + if (mFolderIconMap.contains(key)) { TQPixmap p = mFolderIconMap[key]; newChild->setPixmap(0,p); } @@ -1191,7 +1191,7 @@ void KJanusWidget::virtual_hook( int, void* ) // delete the node. void KJanusWidget::removePage( TQWidget *page ) { - if (!d || !d->mPageToInt.tqcontains(page)) + if (!d || !d->mPageToInt.contains(page)) return; int index = d->mPageToInt[page]; @@ -1237,7 +1237,7 @@ void KJanusWidget::removePage( TQWidget *page ) TQString KJanusWidget::pageTitle(int index) const { - if (!d || !d->mIntToTitle.tqcontains(index)) + if (!d || !d->mIntToTitle.contains(index)) return TQString::null; else return d->mIntToTitle[index]; @@ -1246,7 +1246,7 @@ TQString KJanusWidget::pageTitle(int index) const TQWidget *KJanusWidget::pageWidget(int index) const { - if (!d || !d->mIntToPage.tqcontains(index)) + if (!d || !d->mIntToPage.contains(index)) return 0; else return d->mIntToPage[index]; diff --git a/kdeui/klanguagebutton.cpp b/kdeui/klanguagebutton.cpp index 7da8b85e5..bfc160c8e 100644 --- a/kdeui/klanguagebutton.cpp +++ b/kdeui/klanguagebutton.cpp @@ -60,12 +60,12 @@ static void checkInsertPos( TQPopupMenu *popup, const TQString & str, static TQPopupMenu * checkInsertIndex( TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu ) { - int pos = tags->tqfindIndex( submenu ); + int pos = tags->findIndex( submenu ); TQPopupMenu *pi = 0; if ( pos != -1 ) { - TQMenuItem *p = popup->tqfindItem( pos ); + TQMenuItem *p = popup->findItem( pos ); pi = p ? p->popup() : 0; } if ( !pi ) @@ -232,7 +232,7 @@ void KLanguageButton::clear() bool KLanguageButton::contains( const TQString & id ) const { - return m_ids->tqcontains( id ) > 0; + return m_ids->contains( id ) > 0; } TQString KLanguageButton::current() const @@ -276,7 +276,7 @@ void KLanguageButton::setCurrentItem( int i ) void KLanguageButton::setCurrentItem( const TQString & id ) { - int i = m_ids->tqfindIndex( id ); + int i = m_ids->findIndex( id ); if ( id.isNull() ) i = 0; if ( i != -1 ) diff --git a/kdeui/klineedit.cpp b/kdeui/klineedit.cpp index 48861d38c..87fc29d83 100644 --- a/kdeui/klineedit.cpp +++ b/kdeui/klineedit.cpp @@ -1219,7 +1219,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest ) bool wasSelected = d->completionBox->isSelected( d->completionBox->currentItem() ); const TQString currentSelection = d->completionBox->currentText(); d->completionBox->setItems( items ); - TQListBoxItem* item = d->completionBox->tqfindItem( currentSelection, TQt::ExactMatch ); + TQListBoxItem* item = d->completionBox->findItem( currentSelection, TQt::ExactMatch ); // If no item is selected, that means the listbox hasn't been manipulated by the user yet, // because it's not possible otherwise to have no selected item. In such case make // always the first item current and unselected, so that the current item doesn't jump. @@ -1246,7 +1246,7 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest ) if ( d->autoSuggest && autoSuggest ) { - int index = items.first().tqfind( txt ); + int index = items.first().find( txt ); TQString newText = items.first().mid( index ); setUserSelection(false); setCompletedText(newText,true); diff --git a/kdeui/klistview.cpp b/kdeui/klistview.cpp index 97cef2627..29c563389 100644 --- a/kdeui/klistview.cpp +++ b/kdeui/klistview.cpp @@ -865,7 +865,7 @@ void KListView::contentsMouseReleaseEvent( TQMouseEvent *e ) if (!rootDecoClicked) { int col = header()->mapToLogical( header()->cellAt( p.x() ) ); - if ( d->renameable.tqcontains(col) ) + if ( d->renameable.contains(col) ) rename(at, col); } } @@ -1377,7 +1377,7 @@ void KListView::cleanItemHighlighter () void KListView::rename(TQListViewItem *item, int c) { - if (d->renameable.tqcontains(c)) + if (d->renameable.contains(c)) { ensureItemVisible(item); d->editor->load(item,c); @@ -1386,7 +1386,7 @@ void KListView::rename(TQListViewItem *item, int c) bool KListView::isRenameable (int col) const { - return d->renameable.tqcontains(col); + return d->renameable.contains(col); } void KListView::setRenameable (int col, bool renameable) diff --git a/kdeui/klistviewsearchline.cpp b/kdeui/klistviewsearchline.cpp index 6a73f9e38..fb02a8259 100644 --- a/kdeui/klistviewsearchline.cpp +++ b/kdeui/klistviewsearchline.cpp @@ -214,14 +214,14 @@ bool KListViewSearchLine::itemMatches(const TQListViewItem *item, const TQString TQValueList::ConstIterator it = d->searchColumns.begin(); for(; it != d->searchColumns.end(); ++it) { if(*it < item->listView()->columns() && - item->text(*it).tqfind(s, 0, d->caseSensitive) >= 0) + item->text(*it).find(s, 0, d->caseSensitive) >= 0) return true; } } else { for(int i = 0; i < item->listView()->columns(); i++) { if(item->listView()->columnWidth(i) > 0 && - item->text(i).tqfind(s, 0, d->caseSensitive) >= 0) + item->text(i).find(s, 0, d->caseSensitive) >= 0) { return true; } @@ -260,7 +260,7 @@ TQPopupMenu *KListViewSearchLine::createPopupMenu() columnText = i18n("Column number %1","Column No. %1").arg(visiblePosition); } subMenu->insertItem(columnText, visibleColumns); - if(d->searchColumns.isEmpty() || d->searchColumns.tqfind(i) != d->searchColumns.end()) + if(d->searchColumns.isEmpty() || d->searchColumns.find(i) != d->searchColumns.end()) subMenu->setItemChecked(visibleColumns, true); else allColumnsAreSearchColumns = false; @@ -320,7 +320,7 @@ void KListViewSearchLine::searchColumnsMenuActivated(int id) d->searchColumns.clear(); } else { - if(d->searchColumns.tqfind(id) != d->searchColumns.end()) + if(d->searchColumns.find(id) != d->searchColumns.end()) d->searchColumns.remove(id); else { if(d->searchColumns.isEmpty()) { diff --git a/kdeui/kmenubar.cpp b/kdeui/kmenubar.cpp index fcd56ddaa..2014142e8 100644 --- a/kdeui/kmenubar.cpp +++ b/kdeui/kmenubar.cpp @@ -518,7 +518,7 @@ void KMenuBar::drawContents( TQPainter* p ) for ( int i=0; i<(int)count(); i++ ) { - TQMenuItem *mi = tqfindItem( idAt( i ) ); + TQMenuItem *mi = findItem( idAt( i ) ); if ( !mi->text().isNull() || mi->pixmap() ) { diff --git a/kdeui/knumvalidator.cpp b/kdeui/knumvalidator.cpp index 4dba9d796..5ab97e840 100644 --- a/kdeui/knumvalidator.cpp +++ b/kdeui/knumvalidator.cpp @@ -339,17 +339,17 @@ TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const t = l->thousandsSeparator(); // first, delete p's and t's: if ( !p.isEmpty() ) - for ( int idx = s.tqfind( p ) ; idx >= 0 ; idx = s.tqfind( p, idx ) ) + for ( int idx = s.find( p ) ; idx >= 0 ; idx = s.find( p, idx ) ) s.remove( idx, p.length() ); if ( !t.isEmpty() ) - for ( int idx = s.tqfind( t ) ; idx >= 0 ; idx = s.tqfind( t, idx ) ) + for ( int idx = s.find( t ) ; idx >= 0 ; idx = s.find( t, idx ) ) s.remove( idx, t.length() ); // then, replace the d's and n's - if ( ( !n.isEmpty() && n.tqfind('.') != -1 ) || - ( !d.isEmpty() && d.tqfind('-') != -1 ) ) { + if ( ( !n.isEmpty() && n.find('.') != -1 ) || + ( !d.isEmpty() && d.find('-') != -1 ) ) { // make sure we don't replace something twice: kdWarning() << "KDoubleValidator: decimal symbol contains '-' or " "negative sign contains '.' -> improve algorithm" << endl; @@ -357,11 +357,11 @@ TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const } if ( !d.isEmpty() && d != "." ) - for ( int idx = s.tqfind( d ) ; idx >= 0 ; idx = s.tqfind( d, idx + 1 ) ) + for ( int idx = s.find( d ) ; idx >= 0 ; idx = s.find( d, idx + 1 ) ) s.replace( idx, d.length(), '.'); if ( !n.isEmpty() && n != "-" ) - for ( int idx = s.tqfind( n ) ; idx >= 0 ; idx = s.tqfind( n, idx + 1 ) ) + for ( int idx = s.find( n ) ; idx >= 0 ; idx = s.find( n, idx + 1 ) ) s.replace( idx, n.length(), '-' ); } diff --git a/kdeui/kpanelapplet.cpp b/kdeui/kpanelapplet.cpp index 152368b87..ece71ad54 100644 --- a/kdeui/kpanelapplet.cpp +++ b/kdeui/kpanelapplet.cpp @@ -146,13 +146,13 @@ void KPanelApplet::watchForFocus(TQWidget* widget, bool watch) if (watch) { - if (d->watchedForFocus.tqfind(TQT_TQOBJECT(widget)) == -1) + if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) == -1) { d->watchedForFocus.append(TQT_TQOBJECT(widget)); widget->installEventFilter(this); } } - else if (d->watchedForFocus.tqfind(TQT_TQOBJECT(widget)) != -1) + else if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) != -1) { d->watchedForFocus.remove(TQT_TQOBJECT(widget)); widget->removeEventFilter(this); @@ -172,7 +172,7 @@ void KPanelApplet::needsFocus(bool focus) bool KPanelApplet::eventFilter(TQObject *o, TQEvent * e) { - if (d->watchedForFocus.tqfind(o) != -1) + if (d->watchedForFocus.find(o) != -1) { if (e->type() == TQEvent::MouseButtonRelease || e->type() == TQEvent::FocusIn) diff --git a/kdeui/kpassdlg.cpp b/kdeui/kpassdlg.cpp index 5e5df81cd..dad923c62 100644 --- a/kdeui/kpassdlg.cpp +++ b/kdeui/kpassdlg.cpp @@ -69,10 +69,10 @@ static int * ourMaxLength( const KPasswordEdit* const e ) { d_ptr->setAutoDelete(true); qAddPostRoutine( cleanup_d_ptr ); } - int* ret = d_ptr->tqfind( (void*) e ); + int* ret = d_ptr->find( (void*) e ); if ( ! ret ) { ret = new int; - d_ptr->tqreplace( (void*) e, ret ); + d_ptr->replace( (void*) e, ret ); } return ret; } @@ -634,15 +634,15 @@ void KPasswordDialog::enableOkBtn() if (pwlength > 5) pwlength = 5; const TQRegExp numRxp("[0-9]", true, false); - int numeric = (int) (pass.tqcontains(numRxp) / lengthFactor); + int numeric = (int) (pass.contains(numRxp) / lengthFactor); if (numeric > 3) numeric = 3; const TQRegExp symbRxp("\\W", false, false); - int numsymbols = (int) (pass.tqcontains(symbRxp) / lengthFactor); + int numsymbols = (int) (pass.contains(symbRxp) / lengthFactor); if (numsymbols > 3) numsymbols = 3; const TQRegExp upperRxp("[A-Z]", true, false); - int upper = (int) (pass.tqcontains(upperRxp) / lengthFactor); + int upper = (int) (pass.contains(upperRxp) / lengthFactor); if (upper > 3) upper = 3; int pwstrength=((pwlength*10)-20) + (numeric*10) + (numsymbols*15) + (upper*10); diff --git a/kdeui/kpopupmenu.cpp b/kdeui/kpopupmenu.cpp index b6fa2b0d8..2e174422b 100644 --- a/kdeui/kpopupmenu.cpp +++ b/kdeui/kpopupmenu.cpp @@ -203,7 +203,7 @@ int KPopupMenu::insertTitle(const TQPixmap &icon, const TQString &text, int id, void KPopupMenu::changeTitle(int id, const TQString &text) { - TQMenuItem *item = tqfindItem(id); + TQMenuItem *item = findItem(id); if(item){ if(item->widget()) ((KPopupTitle *)item->widget())->setTitle(text); @@ -220,7 +220,7 @@ void KPopupMenu::changeTitle(int id, const TQString &text) void KPopupMenu::changeTitle(int id, const TQPixmap &icon, const TQString &text) { - TQMenuItem *item = tqfindItem(id); + TQMenuItem *item = findItem(id); if(item){ if(item->widget()) ((KPopupTitle *)item->widget())->setTitle(text, &icon); @@ -239,7 +239,7 @@ TQString KPopupMenu::title(int id) const { if(id == -1) // obsolete return d->m_lastTitle; - TQMenuItem *item = tqfindItem(id); + TQMenuItem *item = findItem(id); if(item){ if(item->widget()) return ((KPopupTitle *)item->widget())->title(); @@ -253,7 +253,7 @@ TQString KPopupMenu::title(int id) const TQPixmap KPopupMenu::titlePixmap(int id) const { - TQMenuItem *item = tqfindItem(id); + TQMenuItem *item = findItem(id); if(item){ if(item->widget()) return ((KPopupTitle *)item->widget())->icon(); @@ -382,13 +382,13 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) // if there is an accelerator present, remove it if ((int)accel(j) != 0) - thisText = thisText.tqreplace("&", TQString()); + thisText = thisText.replace("&", TQString()); // chop text to the search length thisText = thisText.left(seqLen); // do the search - if (!thisText.tqfind(d->keySeq, 0, false)) { + if (!thisText.find(d->keySeq, 0, false)) { if (firstpass) { // match @@ -429,8 +429,8 @@ void KPopupMenu::keyPressEvent(TQKeyEvent* e) activateItemAt(d->lastHitIndex); resetKeyboardVars(); - } else if (tqfindItem(idAt(d->lastHitIndex)) && - tqfindItem(idAt(d->lastHitIndex))->popup()) { + } else if (findItem(idAt(d->lastHitIndex)) && + findItem(idAt(d->lastHitIndex))->popup()) { // only activate sub-menus activateItemAt(d->lastHitIndex); resetKeyboardVars(); @@ -557,7 +557,7 @@ void KPopupMenu::itemHighlighted(int /* whichItem */) void KPopupMenu::showCtxMenu(TQPoint pos) { - TQMenuItem* item = tqfindItem(KPopupMenuPrivate::s_highlightedItem); + TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem); if (item) { TQPopupMenu* subMenu = item->popup(); @@ -577,7 +577,7 @@ void KPopupMenu::showCtxMenu(TQPoint pos) emit aboutToShowContextMenu(this, KPopupMenuPrivate::s_highlightedItem, d->m_ctxMenu); - TQPopupMenu* subMenu = tqfindItem(KPopupMenuPrivate::s_highlightedItem)->popup(); + TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { connect(subMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(ctxMenuHideShowingMenu())); @@ -601,7 +601,7 @@ void KPopupMenu::showCtxMenu(TQPoint pos) */ void KPopupMenu::ctxMenuHideShowingMenu() { - TQMenuItem* item = tqfindItem(KPopupMenuPrivate::s_highlightedItem); + TQMenuItem* item = findItem(KPopupMenuPrivate::s_highlightedItem); if (item) { TQPopupMenu* subMenu = item->popup(); @@ -616,7 +616,7 @@ void KPopupMenu::ctxMenuHiding() { if (KPopupMenuPrivate::s_highlightedItem) { - TQPopupMenu* subMenu = tqfindItem(KPopupMenuPrivate::s_highlightedItem)->popup(); + TQPopupMenu* subMenu = findItem(KPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu())); diff --git a/kdeui/ksconfig.cpp b/kdeui/ksconfig.cpp index 807917ca5..bb1deab52 100644 --- a/kdeui/ksconfig.cpp +++ b/kdeui/ksconfig.cpp @@ -266,7 +266,7 @@ KSpellConfig::interpret( TQString &fname, TQString &lname, TQString extension; - int i = dname.tqfind('-'); + int i = dname.find('-'); if ( i != -1 ) { extension = dname.mid(i+1); @@ -406,7 +406,7 @@ KSpellConfig::fillInDialog () int whichelement=-1; if ( dictFromList() ) - whichelement = langfnames.tqfindIndex(dictionary()); + whichelement = langfnames.findIndex(dictionary()); dictcombo->setMinimumWidth (dictcombo->tqsizeHint().width()); @@ -742,7 +742,7 @@ KSpellConfig::fillDicts( TQComboBox* box, TQStringList* dictionaries ) } } } - int whichelement = langfnames.tqfindIndex(qsdict); + int whichelement = langfnames.findIndex(qsdict); if ( whichelement >= 0 ) { box->setCurrentItem( whichelement ); } @@ -788,7 +788,7 @@ KSpellConfig::setDictionary (const TQString s) qsdict=s; //.copy(); if (qsdict.length()>5) - if ((signed)qsdict.tqfind(".hash")==(signed)qsdict.length()-5) + if ((signed)qsdict.find(".hash")==(signed)qsdict.length()-5) qsdict.remove (qsdict.length()-5,5); @@ -797,7 +797,7 @@ KSpellConfig::setDictionary (const TQString s) int whichelement=-1; if (dictFromList()) { - whichelement = langfnames.tqfindIndex(s); + whichelement = langfnames.findIndex(s); if(whichelement >= 0) { diff --git a/kdeui/kspell.cpp b/kdeui/kspell.cpp index 7285e9c2a..3a13e6e3d 100644 --- a/kdeui/kspell.cpp +++ b/kdeui/kspell.cpp @@ -393,7 +393,7 @@ bool KSpell::addPersonal( const TQString & word ) TQString qs = word.simplifyWhiteSpace(); //we'll let ispell do the work here b/c we can - if ( qs.tqfind(' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ + if ( qs.find(' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ return false; qs.prepend( "*" ); @@ -412,7 +412,7 @@ bool KSpell::ignore( const TQString & word ) TQString qs = word.simplifyWhiteSpace(); //we'll let ispell do the work here b/c we can - if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ + if ( qs.find (' ') != -1 || qs.isEmpty() ) // make sure it's a _word_ return false; qs.prepend( "@" ); @@ -483,7 +483,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) d->checking = true; TQString qs = buffer.simplifyWhiteSpace(); - if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ + if ( qs.find (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ d->checkNextTimer->start( 0, true ); return false; } @@ -525,7 +525,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) d->checking = true; TQString qs = buffer.simplifyWhiteSpace(); - if ( qs.tqfind (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ + if ( qs.find (' ') != -1 || qs.isEmpty() ) { // make sure it's a _word_ d->checkNextTimer->start( 0, true ); return false; } @@ -660,7 +660,7 @@ TQString KSpell::funnyWord( const TQString & word ) i = j-1; - if ( !( k = qs.tqfindRev(shorty) ) || k != -1 ) + if ( !( k = qs.findRev(shorty) ) || k != -1 ) qs.remove( k, shorty.length() ); else { @@ -699,7 +699,7 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi int i,j; - word = buffer.mid( 2, buffer.tqfind( ' ', 3 ) -2 ); + word = buffer.mid( 2, buffer.find( ' ', 3 ) -2 ); //check() needs this orig=word; @@ -717,18 +717,18 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi //We don't take advantage of ispell's ignore function because //we can't interrupt ispell's output (when checking a large //buffer) to add a word to _it's_ ignore-list. - if ( ignorelist.tqfindIndex( word.lower() ) != -1 ) + if ( ignorelist.findIndex( word.lower() ) != -1 ) return IGNORE; //// Position in line /// TQString qs2; - if ( buffer.tqfind( ':' ) != -1 ) - qs2 = buffer.left( buffer.tqfind(':') ); + if ( buffer.find( ':' ) != -1 ) + qs2 = buffer.left( buffer.find(':') ); else qs2 = buffer; - posinline = qs2.right( qs2.length()-qs2.tqfindRev(' ') ).toInt()-1; + posinline = qs2.right( qs2.length()-qs2.findRev(' ') ).toInt()-1; ///// Replace-list stuff //// TQStringList::Iterator it = replacelist.begin(); @@ -745,14 +745,14 @@ int KSpell::parseOneResponse( const TQString &buffer, TQString &word, TQStringLi /////// Suggestions ////// if ( buffer[0] != '#' ) { - TQString qs = buffer.mid( buffer.tqfind(':')+2, buffer.length() ); + TQString qs = buffer.mid( buffer.find(':')+2, buffer.length() ); qs += ','; sugg.clear(); i = j = 0; while( (unsigned int)i < qs.length() ) { - TQString temp = qs.mid( i, (j=qs.tqfind (',',i)) - i ); + TQString temp = qs.mid( i, (j=qs.find (',',i)) - i ); sugg.append( funnyWord(temp) ); i=j+2; @@ -1016,7 +1016,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog ) emitProgress(); // send first buffer line - int i = origbuffer.tqfind( '\n', 0 ) + 1; + int i = origbuffer.find( '\n', 0 ) + 1; qs = origbuffer.mid( 0, i ); cleanFputs( qs, false ); @@ -1130,7 +1130,7 @@ void KSpell::check2( KProcIO * ) //kdDebug(750) << "[EOL](" << tempe << ")[" << temp << "]" << endl; lastpos = (lastlastline=lastline) + offset; //do we really want this? - i = origbuffer.tqfind('\n', lastline) + 1; + i = origbuffer.find('\n', lastline) + 1; qs = origbuffer.mid( lastline, i-lastline ); cleanFputs( qs, false ); lastline = i; diff --git a/kdeui/kstringvalidator.cpp b/kdeui/kstringvalidator.cpp index 2e0d3b167..4c2f33890 100644 --- a/kdeui/kstringvalidator.cpp +++ b/kdeui/kstringvalidator.cpp @@ -30,12 +30,12 @@ TQValidator::State KStringListValidator::validate( TQString & input, int& ) cons if ( input.isEmpty() ) return Intermediate; if ( isRejecting() ) // anything not in mStringList is acceptable: - if ( mStringList.tqfind( input ) == mStringList.end() ) + if ( mStringList.find( input ) == mStringList.end() ) return Acceptable; else return Intermediate; else // only what is in mStringList is acceptable: - if ( mStringList.tqfind( input ) != mStringList.end() ) + if ( mStringList.find( input ) != mStringList.end() ) return Acceptable; else for ( TQStringList::ConstIterator it = mStringList.begin() ; @@ -84,7 +84,7 @@ TQValidator::State KMimeTypeValidator::validate( TQString & input, int& ) const void KMimeTypeValidator::fixup( TQString & input ) const { TQRegExp invalidChars("[^/" ALLOWED_CHARS "]+"); - input.tqreplace( invalidChars, TQString()); + input.replace( invalidChars, TQString()); } #include "kstringvalidator.moc" diff --git a/kdeui/kswitchlanguagedialog.cpp b/kdeui/kswitchlanguagedialog.cpp index ee7a26e83..fa43dcaf2 100644 --- a/kdeui/kswitchlanguagedialog.cpp +++ b/kdeui/kswitchlanguagedialog.cpp @@ -158,7 +158,7 @@ void KSwitchLanguageDialog::removeButtonClicked() return; } - TQMap::iterator it = d->languageRows.tqfind(removeButton); + TQMap::iterator it = d->languageRows.find(removeButton); if (it == d->languageRows.end()) { diff --git a/kdeui/ksyntaxhighlighter.cpp b/kdeui/ksyntaxhighlighter.cpp index bd01ad2a9..5e334ac11 100644 --- a/kdeui/ksyntaxhighlighter.cpp +++ b/kdeui/ksyntaxhighlighter.cpp @@ -148,7 +148,7 @@ int KSyntaxHighlighter::highlightParagraph( const TQString &text, int ) } TQString simplified = text; - simplified = TQString(simplified.tqreplace( TQRegExp( "\\s" ), TQString() )).tqreplace( '|', TQString::tqfromLatin1(">") ); + simplified = TQString(simplified.replace( TQRegExp( "\\s" ), TQString() )).replace( '|', TQString::tqfromLatin1(">") ); while ( simplified.startsWith( TQString::tqfromLatin1(">>>>") ) ) simplified = simplified.mid(3); if ( simplified.startsWith( TQString::tqfromLatin1(">>>") ) || simplified.startsWith( TQString::tqfromLatin1("> > >") ) ) @@ -189,7 +189,7 @@ int KSpellingHighlighter::highlightParagraph( const TQString &text, // leave #includes, diffs, and quoted replies alone TQString diffAndCo( ">|" ); - bool isCode = diffAndCo.tqfind(text[0]) != -1; + bool isCode = diffAndCo.find(text[0]) != -1; if ( !text.endsWith(" ") ) d->alwaysEndsWithSpace = false; @@ -375,7 +375,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word ) // get tricky... // For auto detection ignore signature and reply prefix if ( !d->autoReady ) - d->autoIgnoreDict.tqreplace( word, Ignore ); + d->autoIgnoreDict.replace( word, Ignore ); // "dict" is used as a cache to store the results of KSpell TQDict* dict = ( d->globalConfig ? d->sDict() : d->mDict ); @@ -383,14 +383,14 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word ) if ( d->autoReady && ( d->autoDict[word] != NotOkay )) { if ( !d->autoIgnoreDict[word] ) ++d->errorCount; - d->autoDict.tqreplace( word, NotOkay ); + d->autoDict.replace( word, NotOkay ); } return d->active; } if ( !dict->isEmpty() && (*dict)[word] == Okay ) { if ( d->autoReady && !d->autoDict[word] ) { - d->autoDict.tqreplace( word, Okay ); + d->autoDict.replace( word, Okay ); } return false; } @@ -399,7 +399,7 @@ bool KDictSpellingHighlighter::isMisspelled( const TQString &word ) int para, index; textEdit()->getCursorPosition( ¶, &index ); ++d->wordCount; - dict->tqreplace( word, Unknown ); + dict->replace( word, Unknown ); ++d->checksRequested; if (currentParagraph() != para) d->completeRehighlightRequired = true; @@ -425,9 +425,9 @@ void KDictSpellingHighlighter::slotMisspelling (const TQString &originalWord, co Q_UNUSED( suggestions ); // kdDebug() << suggestions.join( " " ).latin1() << endl; if ( d->globalConfig ) - d->sDict()->tqreplace( originalWord, NotOkay ); + d->sDict()->replace( originalWord, NotOkay ); else - d->mDict->tqreplace( originalWord, NotOkay ); + d->mDict->replace( originalWord, NotOkay ); //Emit this baby so that apps that want to have suggestions in a popup over //the misspelled word can catch them. @@ -441,7 +441,7 @@ void KDictSpellingHighlighter::slotCorrected(const TQString &word, { TQDict* dict = ( d->globalConfig ? d->sDict() : d->mDict ); if ( !dict->isEmpty() && (*dict)[word] == Unknown ) { - dict->tqreplace( word, Okay ); + dict->replace( word, Okay ); } ++d->checksDone; if (d->checksDone == d->checksRequested) { diff --git a/kdeui/ktabbar.cpp b/kdeui/ktabbar.cpp index 8e2477e5f..eed23ebfe 100644 --- a/kdeui/ktabbar.cpp +++ b/kdeui/ktabbar.cpp @@ -76,7 +76,7 @@ void KTabBar::setTabEnabled( int id, bool enabled ) if ( t->isEnabled() ) { r = r.unite( t->rect() ); - tablist->append( tablist->take( tablist->tqfindRef( t ) ) ); + tablist->append( tablist->take( tablist->findRef( t ) ) ); emit selected( t->identifier() ); } } @@ -181,7 +181,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } rect.moveLeft( t->rect().left() + 2 + xoff ); rect.moveTop( t->rect().center().y()-pixmap.height()/2 + yoff ); - if ( rect.tqcontains( e->pos() ) ) { + if ( rect.contains( e->pos() ) ) { if ( mHoverCloseButton ) { if ( mHoverCloseButtonTab == t ) return; @@ -300,7 +300,7 @@ void KTabBar::setTabColor( int id, const TQColor& color ) const TQColor &KTabBar::tabColor( int id ) const { - if ( mTabColors.tqcontains( id ) ) + if ( mTabColors.contains( id ) ) return mTabColors[id]; return tqcolorGroup().foreground(); @@ -312,7 +312,7 @@ int KTabBar::insertTab( TQTab *t, int index ) if ( mTabCloseActivatePrevious && count() > 2 ) { TQPtrList *tablist = tabList(); - tablist->insert( count()-2, tablist->take( tablist->tqfindRef( t ) ) ); + tablist->insert( count()-2, tablist->take( tablist->findRef( t ) ) ); } return res; @@ -359,7 +359,7 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br, flags |= TQStyle::Style_HasFocus; TQColorGroup cg( tqcolorGroup() ); - if ( mTabColors.tqcontains( t->identifier() ) ) + if ( mTabColors.contains( t->identifier() ) ) cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] ); tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r, diff --git a/kdeui/ktextbrowser.cpp b/kdeui/ktextbrowser.cpp index dfd283455..6b3685a81 100644 --- a/kdeui/ktextbrowser.cpp +++ b/kdeui/ktextbrowser.cpp @@ -60,7 +60,7 @@ void KTextBrowser::setSource( const TQString& name ) return; } - if( name.tqfind('@') > -1 ) + if( name.find('@') > -1 ) { if( !mNotifyClick ) { diff --git a/kdeui/ktip.cpp b/kdeui/ktip.cpp index 269a7c472..f8e30fcd1 100644 --- a/kdeui/ktip.cpp +++ b/kdeui/ktip.cpp @@ -115,12 +115,12 @@ void KTipDatabase::addTips(const TQString& tipFile ) const TQRegExp rx("\\n+"); int pos = -1; - while ((pos = content.tqfind("", pos + 1, false)) != -1) + while ((pos = content.find("", pos + 1, false)) != -1) { // to make translations work, tip extraction here must exactly // match what is done by the preparetips script TQString tip = content - .mid(pos + 6, content.tqfind("", pos, false) - pos - 6) + .mid(pos + 6, content.find("", pos, false) - pos - 6) .replace(rx, "\n"); if (!tip.endsWith("\n")) tip += "\n"; diff --git a/kdeui/ktoolbar.cpp b/kdeui/ktoolbar.cpp index 6a5995b69..a3d266efa 100644 --- a/kdeui/ktoolbar.cpp +++ b/kdeui/ktoolbar.cpp @@ -427,7 +427,7 @@ int KToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slot, KAnimWidget *KToolBar::animatedWidget( int id ) { - Id2WidgetMap::Iterator it = id2widget.tqfind( id ); + Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) return 0; KAnimWidget *aw = tqt_dynamic_cast(*it); @@ -610,7 +610,7 @@ TQString KToolBar::getComboItem (int id, int index) const KComboBox * KToolBar::getCombo(int id) { - Id2WidgetMap::Iterator it = id2widget.tqfind( id ); + Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) return 0; return tqt_dynamic_cast( *it ); @@ -619,7 +619,7 @@ KComboBox * KToolBar::getCombo(int id) KLineEdit * KToolBar::getLined (int id) { - Id2WidgetMap::Iterator it = id2widget.tqfind( id ); + Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) return 0; return tqt_dynamic_cast( *it ); @@ -628,7 +628,7 @@ KLineEdit * KToolBar::getLined (int id) KToolBarButton * KToolBar::getButton (int id) { - Id2WidgetMap::Iterator it = id2widget.tqfind( id ); + Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) return 0; return tqt_dynamic_cast( *it ); @@ -637,7 +637,7 @@ KToolBarButton * KToolBar::getButton (int id) void KToolBar::alignItemRight (int id, bool right ) { - Id2WidgetMap::Iterator it = id2widget.tqfind( id ); + Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) return; if ( rightAligned && !right && (*it) == rightAligned ) @@ -649,7 +649,7 @@ void KToolBar::alignItemRight (int id, bool right ) TQWidget *KToolBar::getWidget (int id) { - Id2WidgetMap::Iterator it = id2widget.tqfind( id ); + Id2WidgetMap::Iterator it = id2widget.find( id ); return ( it == id2widget.end() ) ? 0 : (*it); } @@ -677,7 +677,7 @@ void KToolBar::clear () void KToolBar::removeItem(int id) { - Id2WidgetMap::Iterator it = id2widget.tqfind( id ); + Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) { kdDebug(220) << name() << " KToolBar::removeItem item " << id << " not found" << endl; @@ -693,7 +693,7 @@ void KToolBar::removeItem(int id) void KToolBar::removeItemDelayed(int id) { - Id2WidgetMap::Iterator it = id2widget.tqfind( id ); + Id2WidgetMap::Iterator it = id2widget.find( id ); if ( it == id2widget.end() ) { kdDebug(220) << name() << " KToolBar::removeItem item " << id << " not found" << endl; @@ -729,7 +729,7 @@ void KToolBar::showItem (int id) int KToolBar::itemIndex (int id) { TQWidget *w = getWidget(id); - return w ? widgets.tqfindRef(w) : -1; + return w ? widgets.findRef(w) : -1; } int KToolBar::idAt (int index) @@ -1006,7 +1006,7 @@ void KToolBar::saveState() if ( curname == barname ) { just_append = false; - local.documentElement().tqreplaceChild( current, elem ); + local.documentElement().replaceChild( current, elem ); break; } } @@ -1280,7 +1280,7 @@ void KToolBar::childEvent( TQChildEvent *e ) if ( !tqt_dynamic_cast(w)) { // e->child() is not a QPopupMenu // prevent items that have been explicitly inserted by insert*() from // being inserted again - if ( !widget2id.tqcontains( w ) ) + if ( !widget2id.contains( w ) ) { int dummy = -1; insertWidgetInternal( w, dummy, -1 ); @@ -2250,7 +2250,7 @@ void KToolBar::widgetDestroyed() void KToolBar::removeWidgetInternal( TQWidget * w ) { widgets.removeRef( w ); - TQMap< TQWidget*, int >::Iterator it = widget2id.tqfind( w ); + TQMap< TQWidget*, int >::Iterator it = widget2id.find( w ); if ( it == widget2id.end() ) return; id2widget.remove( *it ); diff --git a/kdeui/ktoolbarhandler.cpp b/kdeui/ktoolbarhandler.cpp index 45c1962db..34bfe7046 100644 --- a/kdeui/ktoolbarhandler.cpp +++ b/kdeui/ktoolbarhandler.cpp @@ -55,7 +55,7 @@ namespace if ( !toolBar ) continue; - if ( oldToolBarList.tqfindRef( toolBar ) == -1 ) + if ( oldToolBarList.findRef( toolBar ) == -1 ) m_needsRebuild = true; m_toolBars.append( toolBar ); diff --git a/kdeui/ktoolbarradiogroup.cpp b/kdeui/ktoolbarradiogroup.cpp index 190b1e395..ab8e50e08 100644 --- a/kdeui/ktoolbarradiogroup.cpp +++ b/kdeui/ktoolbarradiogroup.cpp @@ -53,15 +53,15 @@ void KToolBarRadioGroup::addButton (int id) void KToolBarRadioGroup::removeButton (int id) { - if (!buttons->tqfind(id)) + if (!buttons->find(id)) return; - buttons->tqfind(id)->setRadio(false); + buttons->find(id)->setRadio(false); buttons->remove(id); } void KToolBarRadioGroup::slotToggled(int id) { - if (buttons->tqfind(id) && buttons->tqfind(id)->isOn()) + if (buttons->find(id) && buttons->find(id)->isOn()) { TQIntDictIterator it(*buttons); while (it.current()) diff --git a/kdeui/kxmlguiclient.cpp b/kdeui/kxmlguiclient.cpp index a20be86d6..dd7458ede 100644 --- a/kdeui/kxmlguiclient.cpp +++ b/kdeui/kxmlguiclient.cpp @@ -269,7 +269,7 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, // tag, in any event and just replace the old with the new if ( additive.attribute(attrNoMerge) == attrOne ) // ### use toInt() instead? (Simon) { - base.parentNode().tqreplaceChild(additive, base); + base.parentNode().replaceChild(additive, base); return true; } @@ -572,7 +572,7 @@ void KXMLGUIClient::insertChildClient( KXMLGUIClient *child ) void KXMLGUIClient::removeChildClient( KXMLGUIClient *child ) { - assert( d->m_children.tqcontainsRef( child ) ); + assert( d->m_children.containsRef( child ) ); d->m_children.removeRef( child ); child->d->m_parent = 0; } @@ -734,7 +734,7 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml ) case ST_AFTER_OPEN: { //Jump to gui.. - int guipos = xml.tqfind("gui", pos, false /*case-insensitive*/); + int guipos = xml.find("gui", pos, false /*case-insensitive*/); if (guipos == -1) return TQString::null; //Reject @@ -747,7 +747,7 @@ TQString KXMLGUIClient::findVersionNumber( const TQString &xml ) break; case ST_EXPECT_VERSION: { - int verpos = xml.tqfind("version=\"", pos, false /*case-insensitive*/); + int verpos = xml.find("version=\"", pos, false /*case-insensitive*/); if (verpos == -1) return TQString::null; //Reject @@ -810,7 +810,7 @@ KXMLGUIClient::ActionPropertiesMap KXMLGUIClient::extractActionProperties( const if ( actionName.isEmpty() ) continue; - TQMap >::Iterator propIt = properties.tqfind( actionName ); + TQMap >::Iterator propIt = properties.find( actionName ); if ( propIt == properties.end() ) propIt = properties.insert( actionName, TQMap() ); @@ -874,7 +874,7 @@ void KXMLGUIClient::addStateActionEnabled(const TQString& state, stateChange.actionsToEnable.append( action ); //kdDebug() << "KXMLGUIClient::addStateActionEnabled( " << state << ", " << action << ")" << endl; - m_actionsStateMap.tqreplace( state, stateChange ); + m_actionsStateMap.replace( state, stateChange ); } @@ -886,7 +886,7 @@ void KXMLGUIClient::addStateActionDisabled(const TQString& state, stateChange.actionsToDisable.append( action ); //kdDebug() << "KXMLGUIClient::addStateActionDisabled( " << state << ", " << action << ")" << endl; - m_actionsStateMap.tqreplace( state, stateChange ); + m_actionsStateMap.replace( state, stateChange ); } diff --git a/kdeui/kxmlguifactory.cpp b/kdeui/kxmlguifactory.cpp index 169511c49..2714b1207 100644 --- a/kdeui/kxmlguifactory.cpp +++ b/kdeui/kxmlguifactory.cpp @@ -240,7 +240,7 @@ void KXMLGUIFactory::addClient( KXMLGUIClient *client ) d->guiClient = client; // add this client to our client list - if ( !d->m_clients.tqcontainsRef( client ) ) + if ( !d->m_clients.containsRef( client ) ) d->m_clients.append( client ); else kdDebug(1002) << "XMLGUI client already added " << client << endl; diff --git a/kdeui/kxmlguifactory_p.cpp b/kdeui/kxmlguifactory_p.cpp index a5ce2b4ef..279753277 100644 --- a/kdeui/kxmlguifactory_p.cpp +++ b/kdeui/kxmlguifactory_p.cpp @@ -136,7 +136,7 @@ ContainerNode *ContainerNode::findContainer( const TQString &name, const TQStrin { for (; nIt.current(); ++nIt ) if ( nIt.current()->name == name && - !excludeList->tqcontainsRef( nIt.current()->container ) ) + !excludeList->containsRef( nIt.current()->container ) ) { res = nIt.current(); break; @@ -149,7 +149,7 @@ ContainerNode *ContainerNode::findContainer( const TQString &name, const TQStrin for (; nIt.current(); ++nIt ) { if ( nIt.current()->tagName == tagName && - !excludeList->tqcontainsRef( nIt.current()->container ) + !excludeList->containsRef( nIt.current()->container ) /* * It is a bad idea to also compare the client, because * we don't want to do so in situations like these: @@ -226,7 +226,7 @@ void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::I TQString k( mergingIdx.mergingName ); - if ( k.tqfind( tagActionList ) == -1 ) + if ( k.find( tagActionList ) == -1 ) return; k = k.mid( tagActionList.length() ); @@ -268,7 +268,7 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList: TQString k = mergingIdx.mergingName; - if ( k.tqfind( tagActionList ) == -1 ) + if ( k.find( tagActionList ) == -1 ) return; k = k.mid( tagActionList.length() ); @@ -283,7 +283,7 @@ void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList: TQString(), mergingIndices.end() ); - ActionListMap::Iterator lIt( client->actionLists.tqfind( k ) ); + ActionListMap::Iterator lIt( client->actionLists.find( k ) ); if ( lIt == client->actionLists.end() ) return; @@ -568,9 +568,9 @@ void BuildHelper::processElement( const TQDomElement &e ) bool isActionTag = ( tag == tagAction ); - if ( isActionTag || customTags.tqfindIndex( tag ) != -1 ) + if ( isActionTag || customTags.findIndex( tag ) != -1 ) processActionOrCustomElement( e, isActionTag ); - else if ( containerTags.tqfindIndex( tag ) != -1 ) + else if ( containerTags.findIndex( tag ) != -1 ) processContainerElement( e, tag, currName ); else if ( tag == tagMerge || tag == tagDefineGroup || tag == tagActionList ) processMergeElement( tag, currName, e ); diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp index 794579cdb..6288fea57 100644 --- a/kdeui/qxembed.cpp +++ b/kdeui/qxembed.cpp @@ -489,7 +489,7 @@ static int qxembed_x11_event_filter( XEvent* e) { // L0681: Search saved focus widget. TQWidget* focusCurrent = 0; - TQGuardedPtr* fw = focusMap->tqfind( w->tqtopLevelWidget() ); + TQGuardedPtr* fw = focusMap->find( w->tqtopLevelWidget() ); if ( fw ) { focusCurrent = *fw; // L0682: Remove it from the map -- cgit v1.2.1