diff options
Diffstat (limited to 'konqueror')
31 files changed, 122 insertions, 122 deletions
diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc index a512f5686..2f87bae8e 100644 --- a/konqueror/KonquerorIface.cc +++ b/konqueror/KonquerorIface.cc @@ -280,7 +280,7 @@ bool KonquerorIface::processCanBeReused( int screen ) ++it2 ) { kdDebug(1202) << "processCanBeReused: part=" << (*it2)->service()->desktopEntryPath() << ", URL=" << (*it2)->url().prettyURL() << endl; - if( !allowed_parts.tqcontains( (*it2)->service()->desktopEntryPath())) + if( !allowed_parts.contains( (*it2)->service()->desktopEntryPath())) return false; } } diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 78722b1a4..188971bd9 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -78,11 +78,11 @@ TQString KonqAboutPageFactory::loadFile( const TQString& file ) // otherwise all embedded objects are referenced as about:/... TQString basehref = TQString::tqfromLatin1("<BASE HREF=\"file:") + - file.left( file.tqfindRev( '/' )) + + file.left( file.findRev( '/' )) + TQString::tqfromLatin1("/\">\n"); TQRegExp reg("<head>"); reg.setCaseSensitive(FALSE); - res.tqreplace(reg, "<head>\n\t" + basehref); + res.replace(reg, "<head>\n\t" + basehref); return res; } diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index b318a205b..1569b0dbc 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -227,7 +227,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& KService::Ptr serv; if( offers.count() > 0 ) serv = offers.first(); - return serv == NULL || !allowed_parts.tqcontains( serv->desktopEntryName() + TQString::tqfromLatin1(".desktop") ); + return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + TQString::tqfromLatin1(".desktop") ); } static int currentScreen() diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index c6761ddcc..975376cb6 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -962,7 +962,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries ) KFileItem* fileItem = item->item(); if ( !m_itemsToSelect.isEmpty() ) { - TQStringList::Iterator tsit = m_itemsToSelect.tqfind( fileItem->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( fileItem->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); m_pIconView->setSelected( item, true, true ); diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index 222b0c89b..d34794fdc 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -108,7 +108,7 @@ int main( int argc, char**argv ) for ( unsigned int i = 0; i < extraBookmarksDir.count(); ++i ) { const TQString fileName = extraBookmarksDir[ i ]; - if ( mergedFiles.tqfind( fileName ) != mergedFiles.end() ) { + if ( mergedFiles.find( fileName ) != mergedFiles.end() ) { continue; } diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 3f2be1e36..7f2d785ae 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -118,8 +118,8 @@ bool lessAddress(TQString a, TQString b) if(bLast +1 == bEnd) return false; - uint aNext = a.tqfind("/", aLast + 1); - uint bNext = b.tqfind("/", bLast + 1); + uint aNext = a.find("/", aLast + 1); + uint bNext = b.find("/", bLast + 1); bool okay; uint aNum = a.mid(aLast + 1, aNext - aLast - 1).toUInt(&okay); @@ -218,7 +218,7 @@ void ListView::selected(KEBListViewItem * item, bool s) if(s) mSelectedItems[item] = item; else - if((it = mSelectedItems.tqfind(item)) != mSelectedItems.end()) + if((it = mSelectedItems.find(item)) != mSelectedItems.end()) mSelectedItems.remove(it); KEBApp::self()->updateActions(); @@ -483,7 +483,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI KEBListViewItem *tree = new KEBListViewItem(lv, group); fillWithGroup(lv, group, tree); tree->TQListViewItem::setOpen(true); - if (s_selected_addresses.tqcontains(tree->bookmark().address())) + if (s_selected_addresses.contains(tree->bookmark().address())) lv->setSelected(tree, true); if(!s_current_address.isNull() && s_current_address == tree->bookmark().address()) lv->setCurrentItem(tree); @@ -515,7 +515,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI : new KEBListViewItem(lv, bk)); lastItem = item; } - if (s_selected_addresses.tqcontains(bk.address())) + if (s_selected_addresses.contains(bk.address())) lv->setSelected(item, true); if(!s_current_address.isNull() && s_current_address == bk.address()) lv->setCurrentItem(item); diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index dd2429ab1..0d7d0ddf8 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -107,10 +107,10 @@ void TestLinkItr::slotJobData(KIO::Job *job, const TQByteArray &data) { if (transfer->isErrorPage()) { TQStringList lines = TQStringList::split('\n', data); for (TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it) { - int open_pos = (*it).tqfind("<title>", 0, false); + int open_pos = (*it).find("<title>", 0, false); if (open_pos >= 0) { TQString leftover = (*it).mid(open_pos + 7); - int close_pos = leftover.tqfindRev("</title>", -1, false); + int close_pos = leftover.findRev("</title>", -1, false); if (close_pos >= 0) { // if no end tag found then just // print the first line of the <title> @@ -144,7 +144,7 @@ void TestLinkItr::slotJobResult(KIO::Job *job) { // can we assume that errorString will contain no entities? TQString jerr = job->errorString(); if (!jerr.isEmpty()) { - jerr.tqreplace("\n", " "); + jerr.replace("\n", " "); curItem()->nsPut(jerr); chkErr = false; } @@ -166,13 +166,13 @@ void TestLinkItr::slotJobResult(KIO::Job *job) { /* -------------------------- */ const TQString TestLinkItrHolder::getMod(const TQString &url) const { - return m_modify.tqcontains(url) + return m_modify.contains(url) ? m_modify[url] : TQString::null; } const TQString TestLinkItrHolder::getOldVisit(const TQString &url) const { - return self()->m_oldModify.tqcontains(url) + return self()->m_oldModify.contains(url) ? self()->m_oldModify[url] : TQString::null; } diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc index c67d27c8f..e60761b9c 100644 --- a/konqueror/konq_actions.cc +++ b/konqueror/konq_actions.cc @@ -63,7 +63,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &his { TQString text = it.current()->title; text = KStringHandler::cEmSqueeze(text, popup->fontMetrics(), 30); //CT: squeeze - text.tqreplace( "&", "&&" ); + text.replace( "&", "&&" ); if ( checkCurrentItem && it.current() == current ) { int id = popup->insertItem( text ); // no pixmap if checked diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 0f13236e5..8febd505b 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -459,7 +459,7 @@ void KonqCombo::selectWord(TQKeyEvent *e) count++; if( allow_space_break && text[pos].isSpace() && count > 1 ) break; - } while( pos >= 0 && (chars.tqfindIndex(text[pos]) == -1 || count <= 1) ); + } while( pos >= 0 && (chars.findIndex(text[pos]) == -1 || count <= 1) ); if( e->state() & ShiftButton ) { edit->cursorForward(true, 1-count); @@ -482,7 +482,7 @@ void KonqCombo::selectWord(TQKeyEvent *e) count++; if( allow_space_break && text[pos].isSpace() ) break; - } while( pos < (int) text.length() && chars.tqfindIndex(text[pos]) == -1 ); + } while( pos < (int) text.length() && chars.findIndex(text[pos]) == -1 ); if( e->state() & ShiftButton ) { edit->cursorForward(true, count+1); @@ -701,7 +701,7 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) title = titleOfURL( text() ); if ( !title.isEmpty() ) pm = KonqPixmapProvider::self()->pixmapFor( text(), KIcon::SizeSmall ); - else if ( text().tqfind( "://" ) == -1 ) { + else if ( text().find( "://" ) == -1 ) { title = titleOfURL( "http://"+text() ); if ( !title.isEmpty() ) pm = KonqPixmapProvider::self()->pixmapFor( "http://"+text(), KIcon::SizeSmall ); @@ -803,7 +803,7 @@ void KonqComboLineEdit::setCompletedItems( const TQStringList& items ) bool wasSelected = completionbox->isSelected( completionbox->currentItem() ); const TQString currentSelection = completionbox->currentText(); completionbox->setItems( items ); - TQListBoxItem* item = completionbox->tqfindItem( currentSelection, TQt::ExactMatch ); + TQListBoxItem* item = completionbox->findItem( currentSelection, TQt::ExactMatch ); if( !item || !wasSelected ) { wasSelected = false; @@ -824,7 +824,7 @@ void KonqComboLineEdit::setCompletedItems( const TQStringList& items ) } if ( 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/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index b7a3868af..e918f1ac3 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -189,7 +189,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType, args = TQStringList::split( " ", argStr ); } - return KonqViewFactory( factory, args, service->serviceTypes().tqcontains( "Browser/View" ) ); + return KonqViewFactory( factory, args, service->serviceTypes().contains( "Browser/View" ) ); } void KonqFactory::getOffers( const TQString & serviceType, diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index d3d3e1bcc..c9556f824 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -305,7 +305,7 @@ void ToggleViewGUIClient::saveConfig( bool add, const TQString &serviceName ) TQStringList toggableViewsShown = KonqSettings::toggableViewsShown(); if (add) { - if ( !toggableViewsShown.tqcontains( serviceName ) ) + if ( !toggableViewsShown.contains( serviceName ) ) toggableViewsShown.append(serviceName); } else diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 67e815522..17888e8c8 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -93,7 +93,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) it != profiles.end(); ++it) { TQString file = *it; - file = file.mid(file.tqfindRev('/')+1); + file = file.mid(file.findRev('/')+1); printf("%s\n", TQFile::encodeName(file).data()); } diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index aa237261f..26422cf1b 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -418,7 +418,7 @@ static TQString detectNameFilter( KURL & url ) // Look for wildcard selection TQString nameFilter; TQString path = url.path(); - int lastSlash = path.tqfindRev( '/' ); + int lastSlash = path.findRev( '/' ); if ( lastSlash > -1 ) { if ( !url.query().isEmpty() && lastSlash == (int)path.length()-1 ) { // In /tmp/?foo, foo isn't a query @@ -426,7 +426,7 @@ static TQString detectNameFilter( KURL & url ) url.setQuery( TQString::null ); } const TQString fileName = path.mid( lastSlash + 1 ); - if ( fileName.tqfind( '*' ) != -1 || fileName.tqfind( '[' ) != -1 || fileName.tqfind( '?' ) != -1 ) + if ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 ) { // Check that a file or dir with all the special chars in the filename doesn't exist if ( url.isLocalFile() ? !TQFile::exists( path ) : !KIO::NetAccess::exists( url, false, 0 ) ) @@ -489,7 +489,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, if (url.url().startsWith("$(")) { // check for environment variables and make necessary translations TQString aValue = url.url(); - int nDollarPos = aValue.tqfind( '$' ); + int nDollarPos = aValue.find( '$' ); while( nDollarPos != -1 && nDollarPos+1 < static_cast<int>(aValue.length())) { // there is at least one $ @@ -511,7 +511,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, } pclose(fs); } - aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, result ); + aValue.replace( nDollarPos, nEndPos-nDollarPos, result ); } else if( (aValue)[nDollarPos+1] != '$' ) { uint nEndPos = nDollarPos+1; // the next character is no $ @@ -537,7 +537,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, // !!! Sergey A. Sukiyazov <corwin@micom.don.ru> !!! // A environment variables may contain values in 8bit // locale cpecified encoding or in UTF8 encoding. - aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) ); + aValue.replace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) ); } else aValue.remove( nDollarPos, nEndPos-nDollarPos ); } else { @@ -545,7 +545,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, aValue.remove( nDollarPos, 1 ); nDollarPos++; } - nDollarPos = aValue.tqfind( '$', nDollarPos ); + nDollarPos = aValue.find( '$', nDollarPos ); } url = KURL(aValue); } @@ -1548,7 +1548,7 @@ void KonqMainWindow::slotFindOpen( KonqDirPart * dirPart ) void KonqMainWindow::slotFindClosed( KonqDirPart * dirPart ) { kdDebug(1202) << "KonqMainWindow::slotFindClosed " << dirPart << endl; - KonqView * dirView = m_mapViews.tqfind( dirPart ).data(); + KonqView * dirView = m_mapViews.find( dirPart ).data(); Q_ASSERT(dirView); kdDebug(1202) << "dirView=" << dirView << endl; if ( dirView && dirView == m_currentView ) @@ -1815,7 +1815,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView ) if ( !reloadView || reloadView->url().isEmpty() ) return; - if ( reloadView->part() && (reloadView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { + if ( reloadView->part() && (reloadView->part()->tqmetaObject()->findProperty("modified") != -1) ) { TQVariant prop = reloadView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2048,7 +2048,7 @@ void KonqMainWindow::slotUndoAvailable( bool avail ) if ( avail && m_currentView && m_currentView->part() ) { // Avoid qWarning from TQObject::property if it doesn't exist - if ( m_currentView->part()->tqmetaObject()->tqfindProperty( "supportsUndo" ) != -1 ) + if ( m_currentView->part()->tqmetaObject()->findProperty( "supportsUndo" ) != -1 ) { TQVariant prop = m_currentView->part()->property( "supportsUndo" ); if ( prop.isValid() && prop.toBool() ) @@ -2183,7 +2183,7 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) if ( part ) { - newView = m_mapViews.tqfind( static_cast<KParts::ReadOnlyPart *>( part ) ).data(); + newView = m_mapViews.find( static_cast<KParts::ReadOnlyPart *>( part ) ).data(); if ( newView->isPassiveMode() ) { @@ -2414,7 +2414,7 @@ void KonqMainWindow::viewsChanged() KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *view ) { - MapViews::ConstIterator it = m_mapViews.tqfind( view ); + MapViews::ConstIterator it = m_mapViews.find( view ); if ( it != m_mapViews.end() ) return it.data(); else @@ -2665,7 +2665,7 @@ void KonqMainWindow::slotDuplicateTabPopup() void KonqMainWindow::slotBreakOffTab() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { + (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2682,7 +2682,7 @@ void KonqMainWindow::slotBreakOffTabPopup() { KonqView* originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2787,7 +2787,7 @@ void KonqMainWindow::openMultiURL( KURL::List url ) void KonqMainWindow::slotRemoveView() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { + (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2803,7 +2803,7 @@ void KonqMainWindow::slotRemoveView() void KonqMainWindow::slotRemoveTab() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { + (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2819,7 +2819,7 @@ void KonqMainWindow::slotRemoveTabPopup() { KonqView *originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2856,7 +2856,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup() MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if ( view != originalView && view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { + if ( view != originalView && view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2889,7 +2889,7 @@ void KonqMainWindow::slotReloadAllTabs() MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -3480,13 +3480,13 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( false ); - if (slotNames.tqcontains("cut()")) + if (slotNames.contains("cut()")) disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); - if (slotNames.tqcontains("copy()")) + if (slotNames.contains("copy()")) disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); - if (slotNames.tqcontains("paste()")) + if (slotNames.contains("paste()")) disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); - if (slotNames.tqcontains("del()")) + if (slotNames.contains("del()")) disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); disconnect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); @@ -3521,13 +3521,13 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() ); - if (slotNames.tqcontains("cut()")) + if (slotNames.contains("cut()")) connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); - if (slotNames.tqcontains("copy()")) + if (slotNames.contains("copy()")) connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); - if (slotNames.tqcontains("paste()")) + if (slotNames.contains("paste()")) connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); - if (slotNames.tqcontains("del()")) + if (slotNames.contains("del()")) connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ), this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) ); @@ -4167,9 +4167,9 @@ void KonqMainWindow::updateToolBarActions( bool pendingAction /*=false*/) if ( m_currentView && m_currentView->url().isLocalFile() && !m_currentView->isLockedViewMode() ) { - if ( m_currentView->serviceTypes().tqcontains( "inode/directory" ) ) + if ( m_currentView->serviceTypes().contains( "inode/directory" ) ) m_ptaUseHTML->setEnabled( true ); - else if ( m_currentView->serviceTypes().tqcontains( "text/html" ) ) { + else if ( m_currentView->serviceTypes().contains( "text/html" ) ) { // Currently viewing an index.html file via this feature (i.e. url points to a dir) TQString locPath = KURL( m_currentView->locationBarURL() ).path(); m_ptaUseHTML->setEnabled( TQFileInfo( locPath ).isDir() ); @@ -4336,7 +4336,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) if ( act ) { // Does the extension have a slot with the name of this action ? - if ( slotNames.tqcontains( it.key()+"()" ) ) + if ( slotNames.contains( it.key()+"()" ) ) { if ( it.key() != "trash" ) connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ ); @@ -4367,7 +4367,7 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext ) { KAction * act = actionCollection()->action( static_cast<const char *>(it.key()) ); //kdDebug(1202) << it.key() << endl; - if ( act && slotNames.tqcontains( it.key()+"()" ) ) + if ( act && slotNames.contains( it.key()+"()" ) ) { //kdDebug(1202) << "disconnectExtension: " << act << " " << act->name() << endl; act->disconnect( ext ); @@ -4443,7 +4443,7 @@ void KonqMainWindow::enableAllActions( bool enable ) { KAction *act = *it; if ( !TQString(act->name()).startsWith("options_configure") /* do not touch the configureblah actions */ - && ( !enable || !actionSlotMap->tqcontains( act->name() ) ) ) /* don't enable BE actions */ + && ( !enable || !actionSlotMap->contains( act->name() ) ) ) /* don't enable BE actions */ act->setEnabled( enable ); } // This method is called with enable=false on startup, and @@ -4748,7 +4748,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa //firstURL.cleanPath(); openedForViewURL = firstURL.equals( viewURL, true ); } - devicesFile = firstURL.protocol().tqfind("device", 0, false) == 0; + devicesFile = firstURL.protocol().find("device", 0, false) == 0; //dirsSelected = S_ISDIR( _items.getFirst()->mode() ); } //check if current url is trash @@ -4900,7 +4900,7 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items ) TQPtrListIterator<KFileItem> it( items ); for ( ; it.current(); ++it ) { - if ( popupItems.tqcontains( it.current() ) ) + if ( popupItems.contains( it.current() ) ) { emit popupItemsDisturbed(); return; @@ -5067,7 +5067,7 @@ void KonqMainWindow::updateViewModeActions() // make sure to also clear our [libiconview,liblistview]->service-for-viewmode // map if ( m_viewModeToolBarServices.count() > 0 && - !m_viewModeToolBarServices.begin().data()->serviceTypes().tqcontains( m_currentView->serviceType() ) ) + !m_viewModeToolBarServices.begin().data()->serviceTypes().contains( m_currentView->serviceType() ) ) { // Save the current map to the config file, for later reuse saveToolBarServicesMap(); @@ -5129,7 +5129,7 @@ void KonqMainWindow::updateViewModeActions() // look if we already have a KonqViewModeAction (in the toolbar) // for this component - TQMap<TQString,KonqViewModeAction*>::Iterator mapIt = groupedServiceMap.tqfind( library ); + TQMap<TQString,KonqViewModeAction*>::Iterator mapIt = groupedServiceMap.find( library ); // if we don't have -> create one if ( mapIt == groupedServiceMap.end() ) @@ -5143,7 +5143,7 @@ void KonqMainWindow::updateViewModeActions() // if we previously changed the viewmode (see slotViewModeToggle!) // then we will want to use the previously used settings (previous as // in before the actions got deleted) - TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.tqfind( library ); + TQMap<TQString,KService::Ptr>::ConstIterator serviceIt = m_viewModeToolBarServices.find( library ); if ( serviceIt != m_viewModeToolBarServices.end() ) { kdDebug(1202) << " Setting action for " << library << " to " << (*serviceIt)->name() << endl; @@ -5192,7 +5192,7 @@ void KonqMainWindow::updateViewModeActions() // Set the contents of the button from the current service, either if it's the current view // or if it's our preferred service for this button (library) if ( bIsCurrentView - || ( preferredServiceMap.tqcontains( library ) && (*it)->desktopEntryName() == preferredServiceMap[ library ] ) ) + || ( preferredServiceMap.contains( library ) && (*it)->desktopEntryName() == preferredServiceMap[ library ] ) ) { //kdDebug(1202) << " Changing action for " << library << " into service " << (*it)->name() << endl; @@ -5320,7 +5320,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -5338,7 +5338,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) // m_pViewManager->showTab( originalView ); } else if ( m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->tqfindProperty("modified") != -1) ) + (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) @@ -5570,7 +5570,7 @@ static void hp_removeDuplicates( KCompletionMatches& l ) ++it ) { TQString str = (*it).value(); if( str.startsWith( http )) { - if( str.tqfind( '/', 7 ) < 0 ) { // http://something<noslash> + if( str.find( '/', 7 ) < 0 ) { // http://something<noslash> hp_removeDupe( l, str + '/', it ); hp_removeDupe( l, str.mid( 7 ) + '/', it ); } else if( str[ str.length() - 1 ] == '/' ) { @@ -5683,7 +5683,7 @@ TQStringList KonqMainWindow::historyPopupCompletionItems( const TQString& s) hp_removeDuplicates( matches ); TQStringList items = matches.list(); if( items.count() == 0 - && !s.tqcontains( ':' ) && s[ 0 ] != '/' ) + && !s.contains( ':' ) && s[ 0 ] != '/' ) { TQString pre = hp_tryPrepend( s ); if( !pre.isNull()) diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc index 33f36945f..eca415ba5 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cc @@ -141,7 +141,7 @@ void KonqProfileDlg::loadAllProfiles(const TQString & preselectProfile) for (; eIt != eEnd; ++eIt ) { TQListViewItem *item = new KonqProfileItem( m_pListView, eIt.key() ); - TQString filename = eIt.data().mid( eIt.data().tqfindRev( '/' ) + 1 ); + TQString filename = eIt.data().mid( eIt.data().findRev( '/' ) + 1 ); kdDebug(1202) << filename << endl; if ( filename == preselectProfile ) { @@ -161,7 +161,7 @@ void KonqProfileDlg::slotUser3() // Save button // Reuse filename of existing item, if any if ( m_pListView->selectedItem() ) { - KonqProfileMap::Iterator it = m_mapEntries.tqfind( m_pListView->selectedItem()->text(0) ); + KonqProfileMap::Iterator it = m_mapEntries.find( m_pListView->selectedItem()->text(0) ); if ( it != m_mapEntries.end() ) { TQFileInfo info( it.data() ); @@ -180,7 +180,7 @@ void KonqProfileDlg::slotUser2() // Delete button { if(!m_pListView->selectedItem()) return; - KonqProfileMap::Iterator it = m_mapEntries.tqfind( m_pListView->selectedItem()->text(0) ); + KonqProfileMap::Iterator it = m_mapEntries.find( m_pListView->selectedItem()->text(0) ); if ( it != m_mapEntries.end() && TQFile::remove( it.data() ) ) loadAllProfiles(); @@ -206,7 +206,7 @@ void KonqProfileDlg::slotItemRenamed( TQListViewItem * item ) if (!newName.isEmpty()) { - KonqProfileMap::ConstIterator it = m_mapEntries.tqfind( oldName ); + KonqProfileMap::ConstIterator it = m_mapEntries.find( oldName ); if ( it != m_mapEntries.end() ) { diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index a064e3116..4f02022d4 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -1056,7 +1056,7 @@ KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *par if ( !ext ) return 0; - if ( ext->frameNames().tqcontains( name ) ) + if ( ext->frameNames().contains( name ) ) return ext; const TQPtrList<KParts::ReadOnlyPart> children = ext->frames(); @@ -1077,7 +1077,7 @@ bool KonqView::callExtensionMethod( const char *methodName ) if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->tqfindSlot( methodName ); + int id = obj->tqmetaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 1 ]; @@ -1092,7 +1092,7 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value ) if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->tqfindSlot( methodName ); + int id = obj->tqmetaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 2 ]; @@ -1109,7 +1109,7 @@ bool KonqView::callExtensionStringMethod( const char *methodName, TQString value if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->tqfindSlot( methodName ); + int id = obj->tqmetaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 2 ]; @@ -1126,7 +1126,7 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->tqfindSlot( methodName ); + int id = obj->tqmetaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 2 ]; @@ -1268,10 +1268,10 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) TQObjectList *children = m_pPart->widget()->queryList( TQWIDGET_OBJECT_NAME_STRING ); if ( ok && - !lstDragURLs.first().url().tqcontains( "javascript:", false ) && // ### this looks like a hack to me + !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me ev->source() != m_pPart->widget() && children && - children->tqfindRef( TQT_TQOBJECT(ev->source()) ) == -1 ) + children->findRef( TQT_TQOBJECT(ev->source()) ) == -1 ) ev->acceptAction(); delete children; diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index d2600adf1..423929f39 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -1156,7 +1156,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, for ( it.toFirst(); it != 0L; ++it ) { KonqView *view = it.current()->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1)) { + if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1)) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { showTab( view ); @@ -1175,7 +1175,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, else { KonqView *view = m_pMainWindow->currentView(); - if (view && view->part() && (view->part()->tqmetaObject()->tqfindProperty("modified") != -1)) { + if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1)) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( 0, @@ -1413,7 +1413,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) TQRect geom = KGlobalSettings::desktopGeometry(widget); - if ( widthStr.tqcontains( '%' ) == 1 ) + if ( widthStr.contains( '%' ) == 1 ) { widthStr.truncate( widthStr.length() - 1 ); int relativeWidth = widthStr.toInt( &ok ); @@ -1428,7 +1428,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) width = -1; } - if ( heightStr.tqcontains( '%' ) == 1 ) + if ( heightStr.contains( '%' ) == 1 ) { heightStr.truncate( heightStr.length() - 1 ); int relativeHeight = heightStr.toInt( &ok ); diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index 30aa69f8d..6adf36feb 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -201,7 +201,7 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) } if ( !m_itemsToSelect.isEmpty() ) { - TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); @@ -375,7 +375,7 @@ void KonqInfoListViewWidget::determineCounts(const KFileItemList& list) if (m_favorite.mimetype) { - m_mtSelector->setCurrentItem(mtlist.tqfindIndex(m_favorite.mimetype->comment())); + m_mtSelector->setCurrentItem(mtlist.findIndex(m_favorite.mimetype->comment())); kdDebug(1203) << "favorite mimetype is " << m_favorite.mimetype->name() << endl; } createFavoriteColumns(); diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index 3cbbae992..61e30d269 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -169,11 +169,11 @@ void ListViewBrowserExtension::rename() const TQString txt = le->text(); TQString pattern; KMimeType::diagnoseFileName( txt, pattern ); - if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.tqfind('*',1)==-1) + if (!pattern.isEmpty() && pattern.tqat(0)=='*' && pattern.find('*',1)==-1) le->setSelection(0, txt.length()-pattern.stripWhiteSpace().length()+1); else { - int lastDot = txt.tqfindRev('.'); + int lastDot = txt.findRev('.'); if (lastDot > 0) le->setSelection(0, lastDot); } diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 290557945..e0e1d778d 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -228,7 +228,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) for ( int num = 1; extraFieldsIt != extraFields.end(); ++extraFieldsIt, ++num ) { const TQString column = (*extraFieldsIt).name; - if ( lstColumns.tqfind(column) == lstColumns.end() ) + if ( lstColumns.find(column) == lstColumns.end() ) lstColumns << column; const TQString type = (*extraFieldsIt).type; // ## TODO use when sorting TQVariant::Type t = TQVariant::Invalid; @@ -325,7 +325,7 @@ void KonqBaseListViewWidget::readProtocolConfig( const KURL & url ) continue; } - TQStringList::Iterator listIt = listingList.tqfind( confColumns[i].desktopFileName ); + TQStringList::Iterator listIt = listingList.find( confColumns[i].desktopFileName ); if ( listIt == listingList.end() ) // not found -> hide { //move all columns behind one to the front @@ -634,7 +634,7 @@ void KonqBaseListViewWidget::slotAutoScroll() rr = rr.unite( tqitemRect( cur ) ); } - if ( !m_selected || !m_selected->tqcontains( (KonqBaseListViewItem*)cur ) ) + if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) { setSelected( cur, false ); } @@ -670,7 +670,7 @@ void KonqBaseListViewWidget::slotAutoScroll() rr = rr.unite( tqitemRect( cur ) ); } - if ( !m_selected || !m_selected->tqcontains( (KonqBaseListViewItem*)cur ) ) + if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) { setSelected( cur, false ); } @@ -718,7 +718,7 @@ void KonqBaseListViewWidget::slotAutoScroll() if ( !TQRect( scroll_margin, scroll_margin, viewport()->width() - 2*scroll_margin, - viewport()->height() - 2*scroll_margin ).tqcontains( pos ) ) + viewport()->height() - 2*scroll_margin ).contains( pos ) ) { if ( !m_scrollTimer ) { @@ -762,7 +762,7 @@ void KonqBaseListViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev ) // Unselect previous drag-over-item if ( m_dragOverItem && m_dragOverItem != item ) - if ( !m_selected || !m_selected->tqcontains( m_dragOverItem ) ) + if ( !m_selected || !m_selected->contains( m_dragOverItem ) ) setSelected( m_dragOverItem, false ); if ( !item ) @@ -1255,7 +1255,7 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries ) m_itemFound = true; } if ( !m_itemsToSelect.isEmpty() ) { - TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc index 744e06d85..3076aa7ac 100644 --- a/konqueror/listview/konq_textviewwidget.cc +++ b/konqueror/listview/konq_textviewwidget.cc @@ -88,7 +88,7 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries ) m_itemFound = true; } if ( !m_itemsToSelect.isEmpty() ) { - TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( tmp, true ); diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc index 592ba9e09..624e74eaf 100644 --- a/konqueror/listview/konq_treeviewwidget.cc +++ b/konqueror/listview/konq_treeviewwidget.cc @@ -246,7 +246,7 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) } if ( !m_itemsToSelect.isEmpty() ) { - TQStringList::Iterator tsit = m_itemsToSelect.tqfind( (*kit)->name() ); + TQStringList::Iterator tsit = m_itemsToSelect.find( (*kit)->name() ); if ( tsit != m_itemsToSelect.end() ) { m_itemsToSelect.remove( tsit ); setSelected( fileItem ? fileItem : dirItem, true ); diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 596408d88..45287eb67 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -142,7 +142,7 @@ KRemoteEncodingPlugin::updateMenu() int id = 1; TQStringList::Iterator it; for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it, ++id) - if ((*it).tqfind(charset) != -1) + if ((*it).find(charset) != -1) break; kdDebug() << k_funcinfo << "URL=" << m_currentURL << " charset=" << charset << endl; diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index c3e381cd9..271150338 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -102,7 +102,7 @@ KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, cons const char * /*classname*/, const TQStringList &args ) { // Create an instance of our Part - KonqSidebar* obj = new KonqSidebar( parentWidget, widgetName, parent, name, args.tqcontains("universal") ); + KonqSidebar* obj = new KonqSidebar( parentWidget, widgetName, parent, name, args.contains("universal") ); // See if we are to be read-write or not // if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index d9fa0986a..04358ddc4 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -463,8 +463,8 @@ void Sidebar_Widget::initialCopy() { //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl; if ( *eIt != "." && *eIt != ".." && - !entries.tqcontains( *eIt ) && - !dirEntries.tqcontains( *eIt ) ) + !entries.contains( *eIt ) && + !dirEntries.contains( *eIt ) ) { // we don't have that one yet -> copy it. TQString cp("cp -R -- "); cp += KProcess::quote(dirtree_dir + *eIt); @@ -675,7 +675,7 @@ void Sidebar_Widget::stdAction(const char *handlestd) kdDebug() << "Try calling >active< module's (" << mod->module->className() << ") slot " << handlestd << endl; - int id = mod->module->tqmetaObject()->tqfindSlot( handlestd ); + int id = mod->module->tqmetaObject()->findSlot( handlestd ); if ( id == -1 ) return; kdDebug() << "Action slot was found, it will be called now" << endl; @@ -743,7 +743,7 @@ void Sidebar_Widget::createButtons() for (uint i = 0; i < m_buttons.count(); i++) { ButtonInfo *button = m_buttons.tqat(i); - if (m_openViews.tqcontains(button->file)) + if (m_openViews.contains(button->file)) { m_buttonBar->setTab(i,true); m_noUpdate = true; @@ -1195,50 +1195,50 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client, void Sidebar_Widget::connectModule(TQObject *mod) { - if (mod->tqmetaObject()->tqfindSignal("started(KIO::Job*)") != -1) { + if (mod->tqmetaObject()->findSignal("started(KIO::Job*)") != -1) { connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*))); } - if (mod->tqmetaObject()->tqfindSignal("completed()") != -1) { + if (mod->tqmetaObject()->findSignal("completed()") != -1) { connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); } - if (mod->tqmetaObject()->tqfindSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { + if (mod->tqmetaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const TQPoint &, const KURL&, const TQString &, mode_t))); } - if (mod->tqmetaObject()->tqfindSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { + if (mod->tqmetaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t)),this, TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t))); } - if (mod->tqmetaObject()->tqfindSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) { + if (mod->tqmetaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } - if (mod->tqmetaObject()->tqfindSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { + if (mod->tqmetaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } - if (mod->tqmetaObject()->tqfindSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) { + if (mod->tqmetaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) { connect(mod, TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); } - if (mod->tqmetaObject()->tqfindSignal("enableAction(const char*,bool)") != -1) { + if (mod->tqmetaObject()->findSignal("enableAction(const char*,bool)") != -1) { connect(mod,TQT_SIGNAL(enableAction( const char *, bool)), this,TQT_SLOT(enableAction(const char *, bool))); } - if (mod->tqmetaObject()->tqfindSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { + if (mod->tqmetaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); } diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index b0d818c62..1437d7f83 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -484,7 +484,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo fillGroup( item, grp ); TQString address(grp.address()); - if (m_folderOpenState.tqcontains(address)) + if (m_folderOpenState.contains(address)) item->setOpen(m_folderOpenState[address]); else item->setOpen(false); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 16c1bfb78..989ef2a70 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -134,7 +134,7 @@ TQString KonqSidebarDirTreeItem::externalMimeType() const bool KonqSidebarDirTreeItem::acceptsDrops( const TQStrList & formats ) { - if ( formats.tqcontains("text/uri-list") ) + if ( formats.contains("text/uri-list") ) return m_fileItem->acceptsDrops(); return false; } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index 401c4985a..b83926e21 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -549,7 +549,7 @@ void KonqSidebarDirTreeModule::slotRedirection( const KURL & oldUrl, const KURL do { - if (item->alias.tqcontains(newUrlStr)) continue; + if (item->alias.contains(newUrlStr)) continue; kdDebug()<<"Redirectiong element"<<endl; // We need to update the URL in m_dictSubDirs m_dictSubDirs.insert( newUrlStr, item ); diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 2c8cd5728..a29a2fe0c 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -149,7 +149,7 @@ void KonqSidebarHistoryModule::slotCreateItems() TQStringList::Iterator it2 = openGroups.begin(); KonqSidebarHistoryGroupItem *group; while ( it2 != openGroups.end() ) { - group = m_dict.tqfind( *it2 ); + group = m_dict.find( *it2 ); if ( group ) group->setOpen( true ); @@ -195,7 +195,7 @@ void KonqSidebarHistoryModule::slotEntryRemoved( const KonqHistoryEntry *entry ) return; TQString groupKey = groupForURL( entry->url ); - KonqSidebarHistoryGroupItem *group = m_dict.tqfind( groupKey ); + KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey ); if ( !group ) return; @@ -324,7 +324,7 @@ void KonqSidebarHistoryModule::groupOpened( KonqSidebarHistoryGroupItem *item, b KonqSidebarHistoryGroupItem * KonqSidebarHistoryModule::getGroupItem( const KURL& url ) { const TQString& groupKey = groupForURL( url ); - KonqSidebarHistoryGroupItem *group = m_dict.tqfind( groupKey ); + KonqSidebarHistoryGroupItem *group = m_dict.find( groupKey ); if ( !group ) { group = new KonqSidebarHistoryGroupItem( url, m_topLevelItem ); diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index c17907e7d..99c22e148 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -55,7 +55,7 @@ static const int autoOpenTimeout = 750; getModule KonqSidebarTree::getPluginFactory(TQString name) { - if (!pluginFactories.tqcontains(name)) + if (!pluginFactories.contains(name)) { KLibLoader *loader = KLibLoader::self(); TQString libName = pluginInfo[name]; @@ -272,7 +272,7 @@ void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e ) TQListViewItem *item = itemAt( contentsToViewport( e->pos() ) ); // Accept drops on the background, if URLs - if ( !item && m_lstDropFormats.tqcontains("text/uri-list") ) + if ( !item && m_lstDropFormats.contains("text/uri-list") ) { m_dropItem = 0; e->acceptAction(); @@ -417,7 +417,7 @@ bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const { // for KListViewMode... for( int i = 0; e->format( i ); i++ ) - if ( d->m_dropFormats.tqcontains(e->format( i ) ) ) + if ( d->m_dropFormats.contains(e->format( i ) ) ) return true; return false; } @@ -652,7 +652,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path { //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl; if ( *eIt != "." && *eIt != ".." - && !entries.tqcontains( *eIt ) && !dirEntries.tqcontains( *eIt ) ) + && !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) ) { // we don't have that one yet -> copy it. TQString cp("cp -R -- "); cp += KProcess::quote(dirtree_dir + *eIt); @@ -836,7 +836,7 @@ void KonqSidebarTree::startAnimation( KonqSidebarTreeItem * item, const char * i void KonqSidebarTree::stopAnimation( KonqSidebarTreeItem * item ) { - MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.tqfind(item); + MapCurrentOpeningFolders::Iterator it = m_mapCurrentOpeningFolders.find(item); if ( it != m_mapCurrentOpeningFolders.end() ) { item->setPixmap( 0, it.data().originalPixmap ); diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp index 91d4d1eb5..70e3d0df0 100644 --- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp +++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp @@ -57,7 +57,7 @@ void KonqSidebarTreeTopLevelItem::itemSelected() bool KonqSidebarTreeTopLevelItem::acceptsDrops( const TQStrList & formats ) { - return formats.tqcontains("text/uri-list") && + return formats.contains("text/uri-list") && ( m_bTopLevelGroup || !externalURL().isEmpty() ); } diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index fc53039b6..3e18366ab 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -148,7 +148,7 @@ extern "C" i18n( "Select type:" ), names ); if (!item.isEmpty()) { - int id=names.tqfindIndex( item ); + int id=names.findIndex( item ); if (id==-1) return false; KSimpleConfig ksc2(*list.tqat(id)); ksc2.setGroup("Desktop Entry"); |