summaryrefslogtreecommitdiffstats
path: root/libkonq
diff options
context:
space:
mode:
Diffstat (limited to 'libkonq')
-rw-r--r--libkonq/favicons/favicons.cpp4
-rw-r--r--libkonq/kivdirectoryoverlay.cc2
-rw-r--r--libkonq/knewmenu.cc6
-rw-r--r--libkonq/konq_historymgr.cc6
-rw-r--r--libkonq/konq_iconviewwidget.cc20
-rw-r--r--libkonq/konq_pixmapprovider.cc4
-rw-r--r--libkonq/konq_popupmenu.cc30
-rw-r--r--libkonq/konq_propsview.cc18
-rw-r--r--libkonq/konq_propsview.h2
-rw-r--r--libkonq/konq_settings.cc4
-rw-r--r--libkonq/konq_sound.cc2
-rw-r--r--libkonq/konq_undo.cc8
12 files changed, 53 insertions, 53 deletions
diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp
index 7e34eeb12..d0b761ae3 100644
--- a/libkonq/favicons/favicons.cpp
+++ b/libkonq/favicons/favicons.cpp
@@ -97,7 +97,7 @@ TQString FaviconsModule::iconForURL(const KURL &url)
TQString icon;
TQString simplifiedURL = simplifyURL(url);
- TQString *iconURL = d->faviconsCache.tqfind( removeSlash(simplifiedURL) );
+ TQString *iconURL = d->faviconsCache.find( removeSlash(simplifiedURL) );
if (iconURL)
icon = *iconURL;
else
@@ -181,7 +181,7 @@ void FaviconsModule::downloadHostIcon(const KURL &url)
void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const KURL &iconURL)
{
- if (d->failedDownloads.tqcontains(iconURL.url()))
+ if (d->failedDownloads.contains(iconURL.url()))
return;
KIO::Job *job = KIO::get(iconURL, false, false);
diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc
index a139141ac..2b32129c2 100644
--- a/libkonq/kivdirectoryoverlay.cc
+++ b/libkonq/kivdirectoryoverlay.cc
@@ -123,7 +123,7 @@ void KIVDirectoryOverlay::slotNewItems( const KFileItemList& items )
TQString iconName = file -> iconName();
if (!iconName) continue;
- int* iconCount = m_popularIcons -> tqfind( file -> iconName() );
+ int* iconCount = m_popularIcons -> find( file -> iconName() );
if (!iconCount) {
iconCount = new int(0);
Q_ASSERT(file);
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc
index e307b0ddf..6b318c988 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cc
@@ -162,7 +162,7 @@ void KNewMenu::parseFiles()
else
{
// A relative path, then (that's the default in the files we ship)
- TQString linkDir = filePath.left( filePath.tqfindRev( '/' ) + 1 /*keep / */ );
+ TQString linkDir = filePath.left( filePath.findRev( '/' ) + 1 /*keep / */ );
//kdDebug(1203) << "linkDir=" << linkDir << endl;
templatePath = linkDir + templatePath;
}
@@ -419,7 +419,7 @@ void KNewMenu::slotNewFile()
//kdDebug(1203) << "second arg=" << (*it).url() << endl;
//kdDebug(1203) << "third arg=" << entry.text << endl;
TQString text = entry.text;
- text.tqreplace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename
+ text.replace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename
KURL defaultFile( *it );
defaultFile.addPath( KIO::encodeFileName( text ) );
@@ -439,7 +439,7 @@ void KNewMenu::slotNewFile()
// Show the small dialog for getting the destination filename
bool ok;
TQString text = entry.text;
- text.tqreplace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename
+ text.replace( "...", TQString() ); // the ... is fine for the menu item but not for the default filename
KURL defaultFile( *(popupFiles.begin()) );
defaultFile.addPath( KIO::encodeFileName( text ) );
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc
index bff8d7328..9ac069cc5 100644
--- a/libkonq/konq_historymgr.cc
+++ b/libkonq/konq_historymgr.cc
@@ -300,7 +300,7 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url,
// always remove from pending if available, otherwise the else branch leaks
// if the map already contains an entry for this key.
- TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.tqfind( u );
+ TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.find( u );
if ( it != m_pending.end() ) {
delete it.data();
m_pending.remove( it );
@@ -368,7 +368,7 @@ void KonqHistoryManager::removePending( const KURL& url )
if ( url.isLocalFile() )
return;
- TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.tqfind( url.prettyURL() );
+ TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.find( url.prettyURL() );
if ( it != m_pending.end() ) {
KonqHistoryEntry *oldEntry = it.data(); // the old entry, may be 0L
emitRemoveFromHistory( url ); // remove the current pending entry
@@ -627,7 +627,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item)
uint weight = 1;
// find out the weighting of this item (appended to the string as ":num")
- int index = item.tqfindRev(':');
+ int index = item.findRev(':');
if ( index > 0 ) {
bool ok;
weight = item.mid( index + 1 ).toUInt( &ok );
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index 07cf1cfb7..a75a9ccb7 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -346,7 +346,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
// ## shouldn't this be disabled during rectangular selection too ?
if (d->bSoundPreviews && d->pSoundPlayer &&
- d->pSoundPlayer->mimeTypes().tqcontains(
+ d->pSoundPlayer->mimeTypes().contains(
item->item()->mimetype())
&& KGlobalSettings::showFilePreview(item->item()->url())
&& tqtopLevelWidget() == kapp->activeWindow())
@@ -692,7 +692,7 @@ bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQString
return true;
// Support for *mt == "image/*"
TQString tmp( mimeType );
- if ( (*mt).endsWith("*") && tmp.tqreplace(TQRegExp("/.*"), "/*") == (*mt) )
+ if ( (*mt).endsWith("*") && tmp.replace(TQRegExp("/.*"), "/*") == (*mt) )
return true;
if ( (*mt) == "text/plain" )
{
@@ -830,7 +830,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force )
return;
}
- if ((d->bSoundPreviews = d->previewSettings.tqcontains( "audio/" )) &&
+ if ((d->bSoundPreviews = d->previewSettings.contains( "audio/" )) &&
!d->pSoundPlayer)
{
KLibFactory *factory = KLibLoader::self()->factory("konq_sound");
@@ -1030,7 +1030,7 @@ void KonqIconViewWidget::contentsDragMoveEvent( TQDragMoveEvent *e )
return;
}
- TQIconViewItem *item = tqfindItem( e->pos() );
+ TQIconViewItem *item = findItem( e->pos() );
if ( e->source() != viewport() &&
!item && m_rootItem && !m_rootItem->isWritable() ) {
emit dragMove( false );
@@ -1236,7 +1236,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev )
{
- TQIconViewItem *i = tqfindItem( ev->pos() );
+ TQIconViewItem *i = findItem( ev->pos() );
if ( ev->source() != viewport() &&
!i && m_rootItem && !m_rootItem->isWritable() ) {
@@ -1281,7 +1281,7 @@ void KonqIconViewWidget::doubleClickTimeout()
if ( d->releaseMouseEvent )
{
TQMouseEvent e( TQEvent::MouseButtonPress,d->mousePos , 1, d->mouseState);
- TQIconViewItem* item = tqfindItem( e.pos() );
+ TQIconViewItem* item = findItem( e.pos() );
KURL url;
if ( item )
{
@@ -1290,7 +1290,7 @@ void KonqIconViewWidget::doubleClickTimeout()
if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath())))
brenameTrash = true;
- if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == Qt::LeftButton && item->textRect( false ).tqcontains(e.pos()))
+ if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == Qt::LeftButton && item->textRect( false ).contains(e.pos()))
{
if( d->pActivateDoubleClick->isActive () )
d->pActivateDoubleClick->stop();
@@ -1359,7 +1359,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
{
if(d->pActivateDoubleClick && d->pActivateDoubleClick->isActive ())
d->pActivateDoubleClick->stop();
- TQIconViewItem* item = tqfindItem( e->pos() );
+ TQIconViewItem* item = findItem( e->pos() );
m_mousePos = e->pos();
KURL url;
if ( item )
@@ -1368,7 +1368,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e )
bool brenameTrash =false;
if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath())))
brenameTrash = true;
- if ( !brenameTrash && !KGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).tqcontains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().tqfind("device", 0, false)==0))
+ if ( !brenameTrash && !KGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == Qt::LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().find("device", 0, false)==0))
{
d->firstClick = true;
d->mousePos = e->pos();
@@ -1916,7 +1916,7 @@ void KonqIconViewWidget::updatePreviewMimeTypes()
KTrader::OfferList::ConstIterator it;
for ( it = plugins.begin(); it != plugins.end(); ++it ) {
- if ( d->previewSettings.tqcontains((*it)->desktopEntryName()) ) {
+ if ( d->previewSettings.contains((*it)->desktopEntryName()) ) {
TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList();
for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt)
d->pPreviewMimeTypes->append(*mt);
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc
index cb42ae481..11d0e7af4 100644
--- a/libkonq/konq_pixmapprovider.cc
+++ b/libkonq/konq_pixmapprovider.cc
@@ -54,7 +54,7 @@ KonqPixmapProvider::~KonqPixmapProvider()
// finally, inserts the url/icon pair into the cache
TQString KonqPixmapProvider::iconNameFor( const TQString& url )
{
- TQMapIterator<TQString,TQString> it = iconMap.tqfind( url );
+ TQMapIterator<TQString,TQString> it = iconMap.find( url );
TQString icon;
if ( it != iconMap.end() ) {
icon = it.data();
@@ -120,7 +120,7 @@ void KonqPixmapProvider::save( KConfig *kc, const TQString& key,
TQStringList::ConstIterator it = items.begin();
TQMapConstIterator<TQString,TQString> mit;
while ( it != items.end() ) {
- mit = iconMap.tqfind( *it );
+ mit = iconMap.find( *it );
if ( mit != iconMap.end() ) {
list.append( mit.key() );
list.append( mit.data() );
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index c828c4aa8..8d14132ef 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -281,7 +281,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
TQCString name;
name.setNum( id );
name.prepend( isBuiltin ? "builtinservice_" : "userservice_" );
- KAction * act = new KAction( TQString((*it).m_strName).tqreplace('&',"&&"), 0,
+ KAction * act = new KAction( TQString((*it).m_strName).replace('&',"&&"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ),
&m_ownActions, name );
@@ -339,7 +339,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
bool sMoving = sDeleting;
bool sWriting = sDeleting && m_lstItems.first()->isWritable();
m_sMimeType = m_lstItems.first()->mimetype();
- TQString mimeGroup = m_sMimeType.left(m_sMimeType.tqfind('/'));
+ TQString mimeGroup = m_sMimeType.left(m_sMimeType.find('/'));
mode_t mode = m_lstItems.first()->mode();
bool isDirectory = S_ISDIR(mode);
bool bTrashIncluded = false;
@@ -381,11 +381,11 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
{
m_sMimeType = TQString::null; // mimetypes are different => null
- if ( mimeGroup != (*it)->mimetype().left((*it)->mimetype().tqfind('/')))
+ if ( mimeGroup != (*it)->mimetype().left((*it)->mimetype().find('/')))
mimeGroup = TQString::null; // mimetype groups are different as well!
}
- if ( mimeTypeList.tqfindIndex( (*it)->mimetype() ) == -1 )
+ if ( mimeTypeList.findIndex( (*it)->mimetype() ) == -1 )
mimeTypeList << (*it)->mimetype();
if ( isReallyLocal && !url.isLocalFile() )
@@ -603,7 +603,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
TQString caption;
if (currentDir)
{
- bool httpPage = (m_sViewURL.protocol().tqfind("http", 0, false) == 0);
+ bool httpPage = (m_sViewURL.protocol().find("http", 0, false) == 0);
if (httpPage)
caption = i18n("&Bookmark This Page");
else
@@ -742,7 +742,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
else if ( cfg.hasKey( "X-KDE-Protocols" ) )
{
TQStringList protocols = TQStringList::split( "," , cfg.readEntry( "X-KDE-Protocols" ) );
- if ( !protocols.tqcontains( urlForServiceMenu.protocol() ) )
+ if ( !protocols.contains( urlForServiceMenu.protocol() ) )
continue;
}
else if ( urlForServiceMenu.protocol() == "trash" || urlForServiceMenu.url().startsWith( "system:/trash" ) )
@@ -756,7 +756,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
if ( cfg.hasKey( "X-KDE-Require" ) )
{
const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" );
- if ( capabilities.tqcontains( "Write" ) && !sWriting )
+ if ( capabilities.contains( "Write" ) && !sWriting )
continue;
}
if ( (cfg.hasKey( "Actions" ) || cfg.hasKey( "X-KDE-GetActionMenu") ) && cfg.hasKey( "ServiceTypes" ) )
@@ -792,7 +792,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
*it == m_sMimeType) ||
(!mimeGroup.isEmpty() &&
((*it).right(1) == "*" &&
- (*it).left((*it).tqfind('/')) == mimeGroup)))
+ (*it).left((*it).find('/')) == mimeGroup)))
{
checkTheMimetypes = true;
}
@@ -802,7 +802,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
ok = true;
for (TQStringList::ConstIterator itex = excludeTypes.begin(); itex != excludeTypes.end(); ++itex)
{
- if( ((*itex).right(1) == "*" && (*itex).left((*itex).tqfind('/')) == mimeGroup) ||
+ if( ((*itex).right(1) == "*" && (*itex).left((*itex).find('/')) == mimeGroup) ||
((*itex) == m_sMimeType) )
{
ok = false;
@@ -883,20 +883,20 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
const TQString onlyShowIn = service->property("OnlyShowIn", TQVariant::String).toString();
if ( !onlyShowIn.isEmpty() ) {
const TQStringList aList = TQStringList::split(';', onlyShowIn);
- if (!aList.tqcontains("KDE"))
+ if (!aList.contains("KDE"))
continue;
}
const TQString notShowIn = service->property("NotShowIn", TQVariant::String).toString();
if ( !notShowIn.isEmpty() ) {
const TQStringList aList = TQStringList::split(';', notShowIn);
- if (aList.tqcontains("KDE"))
+ if (aList.contains("KDE"))
continue;
}
TQCString nam;
nam.setNum( id );
- TQString actionName( (*it)->name().tqreplace("&", "&&") );
+ TQString actionName( (*it)->name().replace("&", "&&") );
if ( menu == m_menuElement ) // no submenu -> prefix single offer
actionName = i18n( "Open with %1" ).arg( actionName );
@@ -1074,10 +1074,10 @@ void KonqPopupMenu::slotPopupAddToBookmark()
void KonqPopupMenu::slotRunService()
{
TQCString senderName = TQT_TQOBJECT_CONST(sender())->name();
- int id = senderName.mid( senderName.tqfind( '_' ) + 1 ).toInt();
+ int id = senderName.mid( senderName.find( '_' ) + 1 ).toInt();
// Is it a usual service (application)
- TQMap<int,KService::Ptr>::Iterator it = m_mapPopup.tqfind( id );
+ TQMap<int,KService::Ptr>::Iterator it = m_mapPopup.find( id );
if ( it != m_mapPopup.end() )
{
KRun::run( **it, m_lstPopupURLs );
@@ -1085,7 +1085,7 @@ void KonqPopupMenu::slotRunService()
}
// Is it a service specific to desktop entry files ?
- TQMap<int,KDEDesktopMimeType::Service>::Iterator it2 = m_mapPopupServices.tqfind( id );
+ TQMap<int,KDEDesktopMimeType::Service>::Iterator it2 = m_mapPopupServices.find( id );
if ( it2 != m_mapPopupServices.end() )
{
KDEDesktopMimeType::executeService( m_lstPopupURLs, it2.data() );
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc
index eb9c68bbc..b860183c6 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cc
@@ -40,7 +40,7 @@ static TQPixmap wallpaperPixmap( const TQString & _wallpaper )
key += _wallpaper;
KPixmap pix;
- if ( TQPixmapCache::tqfind( key, pix ) )
+ if ( TQPixmapCache::find( key, pix ) )
return pix;
TQString path = locate("tiles", _wallpaper);
@@ -103,7 +103,7 @@ KonqPropsView::KonqPropsView( KInstance * instance, KonqPropsView * defaultProps
//the default-to-off bias to propagate up.
if (!config->readBoolEntry("EnableSoundPreviews", false))
{
- if (!m_dontPreview.tqcontains("audio/"))
+ if (!m_dontPreview.contains("audio/"))
m_dontPreview.append("audio/");
}
@@ -234,13 +234,13 @@ bool KonqPropsView::enterDir( const KURL & dir )
{
if (!config->readBoolEntry("EnableSoundPreviews", false))
- if (!m_dontPreview.tqcontains("audio/"))
+ if (!m_dontPreview.contains("audio/"))
m_dontPreview.append("audio/");
}
else
{
- if (m_defaultProps->m_dontPreview.tqcontains("audio/"))
- if (!m_dontPreview.tqcontains("audio/"))
+ if (m_defaultProps->m_dontPreview.contains("audio/"))
+ if (!m_dontPreview.contains("audio/"))
m_dontPreview.append("audio/");
}
}
@@ -395,7 +395,7 @@ void KonqPropsView::setShowingDirectoryOverlays( bool show )
void KonqPropsView::setShowingPreview( const TQString &preview, bool show )
{
- if ( m_dontPreview.tqcontains( preview ) != show )
+ if ( m_dontPreview.contains( preview ) != show )
return;
else if ( show )
m_dontPreview.remove( preview );
@@ -409,7 +409,7 @@ void KonqPropsView::setShowingPreview( const TQString &preview, bool show )
//Audio is special-cased, as we use a binary setting
//for it to get it to follow the defaults right.
- bool audioEnabled = !m_dontPreview.tqcontains("audio/");
+ bool audioEnabled = !m_dontPreview.contains("audio/");
//Don't write it out into the DontPreview line
if (!audioEnabled)
@@ -567,10 +567,10 @@ const TQStringList& KonqPropsView::previewSettings()
for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
{
TQString name = (*it)->desktopEntryName();
- if ( ! m_dontPreview.tqcontains(name) )
+ if ( ! m_dontPreview.contains(name) )
d->previewsToShow->append( name );
}
- if ( ! m_dontPreview.tqcontains( "audio/" ) )
+ if ( ! m_dontPreview.contains( "audio/" ) )
d->previewsToShow->append( "audio/" );
}
}
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index a1d397d18..c17f58a68 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -107,7 +107,7 @@ public:
void setShowingPreview( const TQString &preview, bool show );
void setShowingPreview( bool show );
- bool isShowingPreview( const TQString &preview ) const { return ! m_dontPreview.tqcontains(preview); }
+ bool isShowingPreview( const TQString &preview ) const { return ! m_dontPreview.contains(preview); }
bool isShowingPreview();
const TQStringList &previewSettings();
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc
index 51eb595a5..b9cf41503 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cc
@@ -142,11 +142,11 @@ bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const
kdDebug(1203) << "No X-KDE-AutoEmbed, looking for group" << endl;
}
// 2 - in the configuration for the group if nothing was found in the mimetype
- TQString serviceTypeGroup = serviceType.left(serviceType.tqfind("/"));
+ TQString serviceTypeGroup = serviceType.left(serviceType.find("/"));
kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl;
if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" )
return true; //always embed mimetype inode/*, Browser/* and Konqueror/*
- TQMap<TQString, TQString>::ConstIterator it = m_embedMap.tqfind( TQString::tqfromLatin1("embed-")+serviceTypeGroup );
+ TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::tqfromLatin1("embed-")+serviceTypeGroup );
if ( it != m_embedMap.end() ) {
kdDebug(1203) << "KonqFMSettings::shouldEmbed: " << it.data() << endl;
return it.data() == TQString::tqfromLatin1("true");
diff --git a/libkonq/konq_sound.cc b/libkonq/konq_sound.cc
index 1a31daed8..9e1ca66fb 100644
--- a/libkonq/konq_sound.cc
+++ b/libkonq/konq_sound.cc
@@ -71,7 +71,7 @@ const TQStringList &KonqSoundPlayerImpl::mimeTypes()
vector<string> *prop = (*it).getProperty("MimeType");
for (vector<string>::iterator mt = prop->begin();
mt != prop->end(); ++mt)
- if ((*mt).length()) // && (*mt).tqfind("video/") == string::npos)
+ if ((*mt).length()) // && (*mt).find("video/") == string::npos)
m_mimeTypes << (*mt).c_str();
delete prop;
}
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc
index 962c26741..6c170050a 100644
--- a/libkonq/konq_undo.cc
+++ b/libkonq/konq_undo.cc
@@ -135,7 +135,7 @@ void KonqCommandRecorder::slotCopyingDone( KIO::Job *job, const KURL &from, cons
Q_ASSERT( from.isLocalFile() );
Q_ASSERT( to.protocol() == "trash" );
TQMap<TQString, TQString> metaData = job->metaData();
- TQMap<TQString, TQString>::ConstIterator it = metaData.tqfind( "trashURL-" + from.path() );
+ TQMap<TQString, TQString>::ConstIterator it = metaData.find( "trashURL-" + from.path() );
if ( it != metaData.end() ) {
// Update URL
op.m_dst = it.data();
@@ -317,7 +317,7 @@ void KonqUndoManager::undo()
}
else if ( (*it).m_link )
{
- if ( !d->m_fileCleanupStack.tqcontains( (*it).m_dst ) )
+ if ( !d->m_fileCleanupStack.contains( (*it).m_dst ) )
d->m_fileCleanupStack.prepend( (*it).m_dst );
if ( d->m_current.m_type != KonqCommand::MOVE )
@@ -339,7 +339,7 @@ void KonqUndoManager::undo()
KURL::List::ConstIterator it = d->m_current.m_src.begin();
KURL::List::ConstIterator end = d->m_current.m_src.end();
for (; it != end; ++it )
- if ( !d->m_dirStack.tqcontains( *it) )
+ if ( !d->m_dirStack.contains( *it) )
d->m_dirStack.push( *it );
}
*/
@@ -390,7 +390,7 @@ void KonqUndoManager::slotResult( KIO::Job *job )
void KonqUndoManager::addDirToUpdate( const KURL& url )
{
- if ( d->m_dirsToUpdate.tqfind( url ) == d->m_dirsToUpdate.end() )
+ if ( d->m_dirsToUpdate.find( url ) == d->m_dirsToUpdate.end() )
d->m_dirsToUpdate.prepend( url );
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 18:04:37 +0000