summaryrefslogtreecommitdiffstats
path: root/konqueror/keditbookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'konqueror/keditbookmarks')
-rw-r--r--konqueror/keditbookmarks/kbookmarkmerger.cpp2
-rw-r--r--konqueror/keditbookmarks/listview.cpp10
-rw-r--r--konqueror/keditbookmarks/testlink.cpp10
3 files changed, 11 insertions, 11 deletions
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;
}