Browse Source

rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 8 years ago
parent
commit
4c6f8d69e2
100 changed files with 302 additions and 302 deletions
  1. 1
    1
      NewsLog.txt
  2. 1
    1
      README.Kolab
  3. 2
    2
      akregator/COPYING
  4. 2
    2
      akregator/src/actionmanagerimpl.cpp
  5. 1
    1
      akregator/src/addfeeddialog.cpp
  6. 1
    1
      akregator/src/akregator_part.cpp
  7. 4
    4
      akregator/src/akregator_view.cpp
  8. 4
    4
      akregator/src/article.cpp
  9. 1
    1
      akregator/src/articlefilter.cpp
  10. 3
    3
      akregator/src/articlelistview.cpp
  11. 3
    3
      akregator/src/articleviewer.cpp
  12. 1
    1
      akregator/src/articleviewer.rc
  13. 5
    5
      akregator/src/feed.cpp
  14. 4
    4
      akregator/src/feediconmanager.cpp
  15. 2
    2
      akregator/src/feedlist.cpp
  16. 2
    2
      akregator/src/feedlistview.cpp
  17. 1
    1
      akregator/src/feedstorage.h
  18. 38
    38
      akregator/src/feedstoragedummyimpl.cpp
  19. 1
    1
      akregator/src/feedstoragedummyimpl.h
  20. 1
    1
      akregator/src/fetchqueue.cpp
  21. 3
    3
      akregator/src/folder.cpp
  22. 1
    1
      akregator/src/frame.cpp
  23. 13
    13
      akregator/src/librss/tools_p.cpp
  24. 5
    5
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  25. 1
    1
      akregator/src/mk4storage/feedstoragemk4impl.h
  26. 1
    1
      akregator/src/mk4storage/metakit/CHANGES
  27. 3
    3
      akregator/src/mk4storage/metakit/include/mk4str.inl
  28. 1
    1
      akregator/src/mk4storage/metakit/src/store.cpp
  29. 1
    1
      akregator/src/mk4storage/storagemk4impl.cpp
  30. 3
    3
      akregator/src/nodelist.cpp
  31. 1
    1
      akregator/src/pageviewer.cpp
  32. 1
    1
      akregator/src/pageviewer.rc
  33. 2
    2
      akregator/src/plugin.cpp
  34. 1
    1
      akregator/src/progressmanager.cpp
  35. 1
    1
      akregator/src/simplenodeselector.cpp
  36. 1
    1
      akregator/src/speechclient.cpp
  37. 7
    7
      akregator/src/storagedummyimpl.cpp
  38. 1
    1
      akregator/src/storagefactoryregistry.cpp
  39. 6
    6
      akregator/src/tabwidget.cpp
  40. 3
    3
      akregator/src/tagnode.cpp
  41. 1
    1
      akregator/src/tagnode.h
  42. 1
    1
      akregator/src/tagnodelist.cpp
  43. 6
    6
      akregator/src/tagset.cpp
  44. 2
    2
      akregator/src/tagset.h
  45. 2
    2
      akregator/src/treenode.cpp
  46. 1
    1
      akregator/src/treenode.h
  47. 2
    2
      akregator/src/utils.cpp
  48. 2
    2
      akregator/src/viewer.cpp
  49. 1
    1
      certmanager/certificateinfowidgetimpl.cpp
  50. 1
    1
      certmanager/certificatewizardimpl.cpp
  51. 3
    3
      certmanager/certmanager.cpp
  52. 1
    1
      certmanager/conf/dirservconfigpage.cpp
  53. 1
    1
      certmanager/kleopatraui.rc
  54. 2
    2
      certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
  55. 6
    6
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  56. 6
    6
      certmanager/lib/cryptplugwrapper.cpp
  57. 1
    1
      certmanager/lib/cryptplugwrapperlist.cpp
  58. 1
    1
      certmanager/lib/kleo/dn.cpp
  59. 1
    1
      certmanager/lib/kleo/downloadjob.h
  60. 2
    2
      certmanager/lib/tests/test.data
  61. 1
    1
      certmanager/lib/tests/test_gnupgprocessbase.cpp
  62. 1
    1
      certmanager/lib/ui/cryptoconfigmodule.cpp
  63. 1
    1
      certmanager/lib/ui/dnattributeorderconfigwidget.cpp
  64. 1
    1
      doc/api/Doxyfile.pim
  65. 2
    2
      indexlib/GPL_V2
  66. 2
    2
      indexlib/boost-compat/config/suffix.hpp
  67. 1
    1
      indexlib/stringset.h
  68. 6
    6
      kabc/frontend/mainWindow.ui.h
  69. 7
    7
      kabc/kabc2mutt/kabc2mutt.cpp
  70. 2
    2
      kaddressbook/addresseditwidget.cpp
  71. 1
    1
      kaddressbook/addresseeeditorwidget.cpp
  72. 1
    1
      kaddressbook/addviewdialog.cpp
  73. 10
    10
      kaddressbook/common/locationmap.cpp
  74. 3
    3
      kaddressbook/customfieldswidget.cpp
  75. 2
    2
      kaddressbook/distributionlistpicker.cpp
  76. 1
    1
      kaddressbook/editors/imaddresswidget.cpp
  77. 8
    8
      kaddressbook/editors/imeditorwidget.cpp
  78. 7
    7
      kaddressbook/extensionmanager.cpp
  79. 2
    2
      kaddressbook/features/distributionlistwidget.cpp
  80. 2
    2
      kaddressbook/features/resourceselection.cpp
  81. 2
    2
      kaddressbook/filtereditdialog.cpp
  82. 3
    3
      kaddressbook/geowidget.cpp
  83. 1
    1
      kaddressbook/jumpbuttonbar.cpp
  84. 7
    7
      kaddressbook/kabcore.cpp
  85. 2
    2
      kaddressbook/kablock.cpp
  86. 8
    8
      kaddressbook/kabtools.cpp
  87. 1
    1
      kaddressbook/kcmconfigs/kabldapconfig.desktop
  88. 2
    2
      kaddressbook/keywidget.cpp
  89. 5
    5
      kaddressbook/phoneeditwidget.cpp
  90. 2
    2
      kaddressbook/printing/kabentrypainter.cpp
  91. 2
    2
      kaddressbook/printing/mikesstyle.cpp
  92. 1
    1
      kaddressbook/printing/printingwizard.cpp
  93. 1
    1
      kaddressbook/printing/printstyle.cpp
  94. 3
    3
      kaddressbook/searchmanager.cpp
  95. 2
    2
      kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
  96. 1
    1
      kaddressbook/typecombo.h
  97. 5
    5
      kaddressbook/viewmanager.cpp
  98. 15
    15
      kaddressbook/views/cardview.cpp
  99. 1
    1
      kaddressbook/xxport/csv_xxport.cpp
  100. 0
    0
      kaddressbook/xxport/csvimportdialog.cpp

+ 1
- 1
NewsLog.txt View File

@@ -593,7 +593,7 @@ Friday, October 2th 2009
Problems addressed
------------------

* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog tqcontains ???? at the bottom
* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog contains ???? at the bottom
* kolab/issue3823: mimetreeviewer doesn't show structure of forward-as-attachment message #n where #n > 1
* kolab/issue3889: Kontact crahes if opening/changing calendar view (rt#5868)
* kolab/issue3867: Save S/MIME encrypted mails unencrypted after reading them

+ 1
- 1
README.Kolab View File

@@ -39,7 +39,7 @@ KAddressBook:
The scheme for the base DN is to take the parts of the fully
qualified hostname of the kolab server and put ",dc=" between
the parts and "dc=" in front of it. Or in Qt code:
baseDN = "dc=" + hostname.tqreplace( '.', ",dc=" );
baseDN = "dc=" + hostname.replace( '.', ",dc=" );
Finally check the checkbox to activate the LDAP server. Now
you can search the Kolab LDAP server and get all users on the
system.

+ 2
- 2
akregator/COPYING View File

@@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which tqcontains
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:

The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it tqcontains, plus any
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include

+ 2
- 2
akregator/src/actionmanagerimpl.cpp View File

@@ -148,7 +148,7 @@ void ActionManagerImpl::slotUpdateTagActions(bool enabled, const TQStringList& t

for (TQValueList<TagAction*>::ConstIterator it = actions.begin(); it != actions.end(); ++it)
{
(*it)->setChecked(tagIds.tqcontains((*it)->tag().id()));
(*it)->setChecked(tagIds.contains((*it)->tag().id()));
}
}
}
@@ -197,7 +197,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag)
if (!Settings::showTaggingGUI())
return;

if (!d->tagActions.tqcontains(tag.id()))
if (!d->tagActions.contains(tag.id()))
{
d->tagActions[tag.id()] = new TagAction(tag, TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
d->tagMenu->insert(d->tagActions[tag.id()]);

+ 1
- 1
akregator/src/addfeeddialog.cpp View File

@@ -79,7 +79,7 @@ void AddFeedDialog::slotOk( )
if (feedURL.startsWith("feed:"))
feedURL = feedURL.right( feedURL.length() - 5 );

if (feedURL.tqfind(":/") == -1)
if (feedURL.find(":/") == -1)
feedURL.prepend("http://");
f->setXmlUrl(feedURL);


+ 1
- 1
akregator/src/akregator_part.cpp View File

@@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part)
{
if (m_mergedPart) {
factory()->removeClient(m_mergedPart);
if (childClients()->tqcontainsRef(m_mergedPart))
if (childClients()->containsRef(m_mergedPart))
removeChildClient(m_mergedPart);
}
if (part)

+ 4
- 4
akregator/src/akregator_view.cpp View File

@@ -411,10 +411,10 @@ void View::slotOnShutdown()
void View::saveSettings()
{
const TQValueList<int> spl1 = m_horizontalSplitter->sizes();
if ( spl1.tqcontains( 0 ) == 0 )
if ( spl1.contains( 0 ) == 0 )
Settings::setSplitter1Sizes( spl1 );
const TQValueList<int> spl2 = m_articleSplitter->sizes();
if ( spl2.tqcontains( 0 ) == 0 )
if ( spl2.contains( 0 ) == 0 )
Settings::setSplitter2Sizes( spl2 );
Settings::setViewMode( m_viewMode );
Settings::writeConfig();
@@ -1329,7 +1329,7 @@ void View::slotArticleDelete()
for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
{
Feed* feed = (*it).feed();
if (!feeds.tqcontains(feed))
if (!feeds.contains(feed))
feeds.append(feed);
feed->setNotificationMode(false);
(*it).setDeleted();
@@ -1529,7 +1529,7 @@ void View::updateTagActions()
TQStringList atags = (*it).tags();
for (TQStringList::ConstIterator it2 = atags.begin(); it2 != atags.end(); ++it2)
{
if (!tags.tqcontains(*it2))
if (!tags.contains(*it2))
tags += *it2;
}
}

+ 4
- 4
akregator/src/article.cpp View File

@@ -102,7 +102,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)

d->guid = article.guid();
if (!d->archive->tqcontains(d->guid))
if (!d->archive->contains(d->guid))
{
d->archive->addEntry(d->guid);

@@ -425,7 +425,7 @@ void Article::removeTag(const TQString& tag)

bool Article::hasTag(const TQString& tag) const
{
return d->archive->tags(d->guid).tqcontains(tag);
return d->archive->tags(d->guid).contains(tag);
}

TQStringList Article::tags() const
@@ -453,7 +453,7 @@ TQString Article::buildTitle(const TQString& description)
if (description.stripWhiteSpace().isEmpty())
return "";
int i = s.tqfind('>',500); /*avoid processing too much */
int i = s.find('>',500); /*avoid processing too much */
if (i != -1)
s = s.left(i+1);
TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false);
@@ -470,7 +470,7 @@ TQString Article::buildTitle(const TQString& description)
}
else
toReplace=rx.cap(1); // strip just tag
s=s.tqreplace(s.tqfind(toReplace),toReplace.length(),replaceWith); // do the deed
s=s.replace(s.find(toReplace),toReplace.length(),replaceWith); // do the deed
}
if (s.length()> 90)
s=s.left(90)+"...";

+ 1
- 1
akregator/src/articlefilter.cpp View File

@@ -179,7 +179,7 @@ bool Criterion::satisfiedBy( const Article &article ) const

switch ( predicateType ) {
case Contains:
satisfied = concreteSubject.toString().tqfind( m_object.toString(), 0, false ) != -1;
satisfied = concreteSubject.toString().find( m_object.toString(), 0, false ) != -1;
break;
case Equals:
if (subjectType=="int")

+ 3
- 3
akregator/src/articlelistview.cpp View File

@@ -354,7 +354,7 @@ void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const TQValueList<Ar
for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if (!d->articleMap.tqcontains(*it))
if (!d->articleMap.contains(*it))
{
if (!(*it).isNull() && !(*it).isDeleted())
{
@@ -385,7 +385,7 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList<
for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if (!(*it).isNull() && d->articleMap.tqcontains(*it))
if (!(*it).isNull() && d->articleMap.contains(*it))
{
ArticleItem* ali = d->articleMap[*it];

@@ -447,7 +447,7 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList<
for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if (d->articleMap.tqcontains(*it))
if (d->articleMap.contains(*it))
{
ArticleItem* ali = d->articleMap[*it];
d->articleMap.remove(*it);

+ 3
- 3
akregator/src/articleviewer.cpp View File

@@ -87,7 +87,7 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
{
text += TQString("<div class=\"body\">");
TQString url=node->xmlUrl();
TQString file = url.tqreplace("/", "_").tqreplace(":", "_");
TQString file = url.replace("/", "_").replace(":", "_");
KURL u(m_view->m_imageDir);
u.setFileName(file);
text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(u.url());
@@ -410,7 +410,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
if (article.link().isValid())
text += "<a href=\""+article.link().url()+"\">";
text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
if (article.link().isValid())
text += "</a>";
text += "</div>\n";
@@ -505,7 +505,7 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
if (link.isValid())
text += "<a href=\""+link.url()+"\">";
text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
if (link.isValid())
text += "</a>";
text += "</div>\n";

+ 1
- 1
akregator/src/articleviewer.rc View File

@@ -11,7 +11,7 @@
<Action name="viewer_copy"/>
<Action name="selectAll"/>
<Separator/>
<Action name="tqfind"/>
<Action name="find"/>
<Action name="findNext"/>
</Menu>
<Menu noMerge="1" name="view">

+ 5
- 5
akregator/src/feed.cpp View File

@@ -87,7 +87,7 @@ class Feed::FeedPrivate
/** caches guids of tagged articles. key: tag, value: list of guids */
TQMap<TQString, TQStringList> taggedArticles;

/** list of deleted articles. This tqcontains **/
/** list of deleted articles. This contains **/
TQValueList<Article> deletedArticles;
/** caches guids of deleted articles for notification */
@@ -450,7 +450,7 @@ void Feed::appendArticles(const RSS::Document &doc)

for (it = d_articles.begin(); it != en; ++it)
{
if ( !d->articles.tqcontains((*it).guid()) ) // article not in list
if ( !d->articles.contains((*it).guid()) ) // article not in list
{
Article mya(*it, this);
mya.offsetPubDate(nudge);
@@ -535,7 +535,7 @@ void Feed::appendArticle(const Article& a)
{
if ( (a.keep() && Settings::doNotExpireImportantArticles()) || ( !usesExpiryByAge() || !isExpired(a) ) ) // if not expired
{
if (!d->articles.tqcontains(a.guid()))
if (!d->articles.contains(a.guid()))
{
d->articles[a.guid()] = a;
if (!a.isDeleted() && a.status() != Article::Read)
@@ -726,10 +726,10 @@ void Feed::setUnread(int unread)

void Feed::setArticleDeleted(Article& a)
{
if (!d->deletedArticles.tqcontains(a))
if (!d->deletedArticles.contains(a))
d->deletedArticles.append(a);

if (!d->removedArticlesNotify.tqcontains(a))
if (!d->removedArticlesNotify.contains(a))
d->removedArticlesNotify.append(a);

articlesModified();

+ 4
- 4
akregator/src/feediconmanager.cpp View File

@@ -59,7 +59,7 @@ FeedIconManager* FeedIconManager::self()

void FeedIconManager::fetchIcon(Feed* feed)
{
if (!d->registeredFeeds.tqcontains(feed))
if (!d->registeredFeeds.contains(feed))
{
d->registeredFeeds.append(feed);
connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*)));
@@ -133,8 +133,8 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node)
{
Feed* feed = dynamic_cast<Feed*>(node);
if (feed)
while (d->registeredFeeds.tqcontains(feed))
d->registeredFeeds.remove(d->registeredFeeds.tqfind(feed));
while (d->registeredFeeds.contains(feed))
d->registeredFeeds.remove(d->registeredFeeds.find(feed));
}

void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL,
@@ -147,7 +147,7 @@ void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL
if (!p.isNull()) // we don't set null pixmaps, as feed checks pixmap.isNull() to find out whether the icon was already loaded or not. It would request the icon another time, resulting an infinite loop (until stack overflow that is
{
while (( f = d->urlDict.take(hostOrURL) ))
if (d->registeredFeeds.tqcontains(f))
if (d->registeredFeeds.contains(f))
f->setFavicon(p);
}
emit signalIconChanged(hostOrURL, iconFile);

+ 2
- 2
akregator/src/feedlist.cpp View File

@@ -117,7 +117,7 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent)
Feed* feed = Feed::fromOPML(e);
if (feed)
{
if (!d->urlMap[feed->xmlUrl()].tqcontains(feed))
if (!d->urlMap[feed->xmlUrl()].contains(feed))
d->urlMap[feed->xmlUrl()].append(feed);
tqparent->appendChild(feed);
}
@@ -219,7 +219,7 @@ void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after)
if ( list == this )
return;

if ( !flatList()->tqcontains(tqparent) )
if ( !flatList()->contains(tqparent) )
tqparent = rootNode();

TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren();

+ 2
- 2
akregator/src/feedlistview.cpp View File

@@ -457,12 +457,12 @@ TreeNode* NodeListView::findNodeByTitle(const TQString& title)

TreeNodeItem* NodeListView::findNodeItem(TreeNode* node)
{
return d->itemDict.tqfind(node);
return d->itemDict.find(node);
}

TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const
{
return dynamic_cast<TreeNodeItem*> (KListView::tqfindItem(text, column, compare));
return dynamic_cast<TreeNodeItem*> (KListView::findItem(text, column, compare));
}

void NodeListView::ensureNodeVisible(TreeNode* node)

+ 1
- 1
akregator/src/feedstorage.h View File

@@ -92,7 +92,7 @@ class AKREGATOR_EXPORT FeedStorage : public TQObject
virtual void clear() = 0;

virtual bool tqcontains(const TQString& guid) = 0;
virtual bool contains(const TQString& guid) = 0;
virtual void addEntry(const TQString& guid) = 0;
virtual void deleteArticle(const TQString& guid) = 0;
virtual int comments(const TQString& guid) = 0;

+ 38
- 38
akregator/src/feedstoragedummyimpl.cpp View File

@@ -147,21 +147,21 @@ TQStringList FeedStorageDummyImpl::articles(const Category& cat)

void FeedStorageDummyImpl::addEntry(const TQString& guid)
{
if (!d->entries.tqcontains(guid))
if (!d->entries.contains(guid))
{
d->entries[guid] = FeedStorageDummyImplPrivate::Entry();
setTotalCount(totalCount()+1);
}
}

bool FeedStorageDummyImpl::tqcontains(const TQString& guid)
bool FeedStorageDummyImpl::contains(const TQString& guid)
{
return d->entries.tqcontains(guid);
return d->entries.contains(guid);
}

void FeedStorageDummyImpl::deleteArticle(const TQString& guid)
{
if (!d->entries.tqcontains(guid))
if (!d->entries.contains(guid))
return;

setDeleted(guid);
@@ -172,33 +172,33 @@ void FeedStorageDummyImpl::deleteArticle(const TQString& guid)
int FeedStorageDummyImpl::comments(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].comments : 0;
return contains(guid) ? d->entries[guid].comments : 0;
}

TQString FeedStorageDummyImpl::commentsLink(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].commentsLink : "";
return contains(guid) ? d->entries[guid].commentsLink : "";
}

bool FeedStorageDummyImpl::guidIsHash(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].guidIsHash : false;
return contains(guid) ? d->entries[guid].guidIsHash : false;
}

bool FeedStorageDummyImpl::guidIsPermaLink(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].guidIsPermaLink : false;
return contains(guid) ? d->entries[guid].guidIsPermaLink : false;
}

uint FeedStorageDummyImpl::hash(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].hash : 0;
return contains(guid) ? d->entries[guid].hash : 0;
}


void FeedStorageDummyImpl::setDeleted(const TQString& guid)
{
if (!tqcontains(guid))
if (!contains(guid))
return;

FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
@@ -233,99 +233,99 @@ void FeedStorageDummyImpl::setDeleted(const TQString& guid)

TQString FeedStorageDummyImpl::link(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].link : "";
return contains(guid) ? d->entries[guid].link : "";
}

uint FeedStorageDummyImpl::pubDate(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].pubDate : 0;
return contains(guid) ? d->entries[guid].pubDate : 0;
}

int FeedStorageDummyImpl::status(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].status : 0;
return contains(guid) ? d->entries[guid].status : 0;
}

void FeedStorageDummyImpl::setqStatus(const TQString& guid, int status)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].status = status;
}

TQString FeedStorageDummyImpl::title(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].title : "";
return contains(guid) ? d->entries[guid].title : "";
}

TQString FeedStorageDummyImpl::description(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].description : "";
return contains(guid) ? d->entries[guid].description : "";
}


void FeedStorageDummyImpl::setPubDate(const TQString& guid, uint pubdate)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].pubDate = pubdate;
}

void FeedStorageDummyImpl::setGuidIsHash(const TQString& guid, bool isHash)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].guidIsHash = isHash;
}

void FeedStorageDummyImpl::setLink(const TQString& guid, const TQString& link)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].link = link;
}

void FeedStorageDummyImpl::setHash(const TQString& guid, uint hash)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].hash = hash;
}

void FeedStorageDummyImpl::setTitle(const TQString& guid, const TQString& title)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].title = title;
}

void FeedStorageDummyImpl::setDescription(const TQString& guid, const TQString& description)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].description = description;
}

void FeedStorageDummyImpl::setCommentsLink(const TQString& guid, const TQString& commentsLink)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].commentsLink = commentsLink;
}

void FeedStorageDummyImpl::setComments(const TQString& guid, int comments)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].comments = comments;
}


void FeedStorageDummyImpl::setGuidIsPermaLink(const TQString& guid, bool isPermaLink)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].guidIsPermaLink = isPermaLink;
}

void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag)
{
if (tqcontains(guid))
if (contains(guid))
{
d->entries[guid].tags.append(tag);
if (!d->taggedArticles[tag].tqcontains(guid))
if (!d->taggedArticles[tag].contains(guid))
d->taggedArticles[tag].append(guid);
if (!d->tags.tqcontains(tag))
if (!d->tags.contains(tag))
d->tags.append(tag);
}

@@ -333,7 +333,7 @@ void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag)

void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat)
{
if (!tqcontains(guid))
if (!contains(guid))
return;

d->entries[guid].categories.append(cat);
@@ -345,19 +345,19 @@ void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat

void FeedStorageDummyImpl::setAuthor(const TQString& guid, const TQString& author)
{
if (tqcontains(guid))
if (contains(guid))
d->entries[guid].author = author;
}

TQString FeedStorageDummyImpl::author(const TQString& guid)
{
return tqcontains(guid) ? d->entries[guid].author : TQString();
return contains(guid) ? d->entries[guid].author : TQString();
}

TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid)
{
if (!guid.isNull())
return tqcontains(guid) ? d->entries[guid].categories : TQValueList<Category>();
return contains(guid) ? d->entries[guid].categories : TQValueList<Category>();
else
return d->categories;
}
@@ -365,7 +365,7 @@ TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid)

void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag)
{
if (tqcontains(guid))
if (contains(guid))
{
d->entries[guid].tags.remove(tag);
d->taggedArticles[tag].remove(guid);
@@ -377,7 +377,7 @@ void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag)
TQStringList FeedStorageDummyImpl::tags(const TQString& guid)
{
if (!guid.isNull())
return tqcontains(guid) ? d->entries[guid].tags : TQStringList();
return contains(guid) ? d->entries[guid].tags : TQStringList();
else
{
return d->tags;
@@ -396,7 +396,7 @@ void FeedStorageDummyImpl::add(FeedStorage* source)

void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source)
{
if (!tqcontains(guid))
if (!contains(guid))
addEntry(guid);

setComments(guid, source->comments(guid));
@@ -424,7 +424,7 @@ void FeedStorageDummyImpl::clear()

void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length)
{
if (tqcontains(guid))
if (contains(guid))
{
FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
entry.hasEnclosure = true;
@@ -436,7 +436,7 @@ void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& ur

void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)
{
if (tqcontains(guid))
if (contains(guid))
{
FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
entry.hasEnclosure = false;
@@ -448,7 +448,7 @@ void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)

void FeedStorageDummyImpl::enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length)
{
if (tqcontains(guid))
if (contains(guid))
{
FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
hasEnclosure = entry.hasEnclosure;

+ 1
- 1
akregator/src/feedstoragedummyimpl.h View File

@@ -50,7 +50,7 @@ class FeedStorageDummyImpl : public FeedStorage
virtual TQStringList articles(const Category& cat);


virtual bool tqcontains(const TQString& guid);
virtual bool contains(const TQString& guid);
virtual void addEntry(const TQString& guid);
virtual void deleteArticle(const TQString& guid);
virtual int comments(const TQString& guid);

+ 1
- 1
akregator/src/fetchqueue.cpp View File

@@ -72,7 +72,7 @@ void FetchQueue::slotAbort()

void FetchQueue::addFeed(Feed *f)
{
if (!d->queuedFeeds.tqcontains(f) && !d->fetchingFeeds.tqcontains(f))
if (!d->queuedFeeds.contains(f) && !d->fetchingFeeds.contains(f))
{
connectToFeed(f);
d->queuedFeeds.append(f);

+ 3
- 3
akregator/src/folder.cpp View File

@@ -99,7 +99,7 @@ TQStringList Folder::tags() const
// intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now.
TQStringList t2 = (*it)->tags();
for (TQStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2)
if (!t.tqcontains(*it2))
if (!t.contains(*it2))
t.append(*it2);
}
return t;
@@ -137,7 +137,7 @@ TQValueList<TreeNode*> Folder::tqchildren() const

void Folder::insertChild(TreeNode* node, TreeNode* after)
{
int pos = d->tqchildren.tqfindIndex(after);
int pos = d->tqchildren.findIndex(after);
if (pos < 0)
prependChild(node);
@@ -202,7 +202,7 @@ void Folder::prependChild(TreeNode* node)
void Folder::removeChild(TreeNode* node)
{
// kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl;
if (node && d->tqchildren.tqcontains(node))
if (node && d->tqchildren.contains(node))
{
node->setParent(0);
d->tqchildren.remove(node);

+ 1
- 1
akregator/src/frame.cpp View File

@@ -123,7 +123,7 @@ void Frame::setCaption(const TQString &s)
void Frame::seStatusText(const TQString &s)
{
m_statusText=s;
m_statusText.tqreplace(TQRegExp("<[^>]*>"), "");
m_statusText.replace(TQRegExp("<[^>]*>"), "");
emit statusText(m_statusText);
}


+ 13
- 13
akregator/src/librss/tools_p.cpp View File

@@ -24,7 +24,7 @@ time_t parseISO8601Date(const TQString &s)
return 0; // error

// FIXME: imho this is done in KRFCDate::parseDateISO8601() automatically, so we could omit it? -fo
if (s.tqfind('T') != -1)
if (s.find('T') != -1)
return KRFCDate::parseDateISO8601(s);
else
return KRFCDate::parseDateISO8601(s + "T12:00:00");
@@ -43,11 +43,11 @@ TQString childNodesAsXML(const TQDomNode& tqparent)
static TQString plainTextToHtml(const TQString& plainText)
{
TQString str(plainText);
str.tqreplace("&", "&amp;");
str.tqreplace("\"", "&quot;");
str.tqreplace("<", "&lt;");
//str.tqreplace(">", "&gt;");
str.tqreplace("\n", "<br/>");
str.replace("&", "&amp;");
str.replace("\"", "&quot;");
str.replace("<", "&lt;");
//str.replace(">", "&gt;");
str.replace("\n", "<br/>");
return str;
}

@@ -84,7 +84,7 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
xmltypes.append(TQString::fromUtf8("application/xml-dtd"));
if (xmltypes.tqcontains(type)
if (xmltypes.contains(type)
|| type.tqendsWith(TQString::fromUtf8("+xml"), false)
|| type.tqendsWith(TQString::fromUtf8("/xml"), false))
return XML;
@@ -102,7 +102,7 @@ static TQString extractAtomContent(const TQDomElement& e)
{
case HTML:
{
const bool hasPre = e.text().tqcontains( "<pre>", false ) || e.text().tqcontains( "<pre ", false );
const bool hasPre = e.text().contains( "<pre>", false ) || e.text().contains( "<pre ", false );
return KCharsets::resolveEntities( hasPre ? e.text() : e.text().simplifyWhiteSpace() );
}
case Text:
@@ -132,10 +132,10 @@ TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool i
}
else // check for HTML; not necessary for Atom:content
{
bool hasPre = result.tqcontains("<pre>", false) || result.tqcontains("<pre ", false);
bool hasHtml = hasPre || result.tqcontains("<"); // FIXME: test if we have html, should be more clever -> regexp
bool hasPre = result.contains("<pre>", false) || result.contains("<pre ", false);
bool hasHtml = hasPre || result.contains("<"); // FIXME: test if we have html, should be more clever -> regexp
if(!isInlined && !hasHtml) // perform nl2br if not a inline elt and it has no html elts
result = result = result.tqreplace(TQChar('\n'), "<br />");
result = result = result.replace(TQChar('\n'), "<br />");
if(!hasPre) // strip white spaces if no <pre>
result = result.simplifyWhiteSpace();
}
@@ -151,7 +151,7 @@ TQString extractTitle(const TQDomNode & tqparent)

TQString result = node.toElement().text();

result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).tqreplace(TQRegExp("<[^>]*>"), "").remove("\\"));
result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).replace(TQRegExp("<[^>]*>"), "").remove("\\"));
result = result.simplifyWhiteSpace();

if (result.isEmpty())
@@ -177,7 +177,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema
{
TQString all = remail.cap(0);
email = remail.cap(1);
str.tqreplace(all, ""); // remove mail address
str.replace(all, ""); // remove mail address
}
// simplify the rest and use it as name

+ 5
- 5
akregator/src/mk4storage/feedstoragemk4impl.cpp View File

@@ -147,8 +147,8 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main
kdDebug() << url2 << endl;
TQString t = url2;
TQString t2 = url2;
TQString filePath = main->archivePath() +"/"+ t.tqreplace("/", "_").tqreplace(":", "_");
d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.tqreplace("/", "_").tqreplace(":", "_") + ".xml";
TQString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_");
d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml";

d->convert = !TQFile::exists(filePath + ".mk4") && TQFile::exists(d->oldArchivePath);
d->storage = new c4_Storage((filePath + ".mk4").local8Bit(), true);
@@ -297,7 +297,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
{
c4_Row row;
d->pguid(row) = guid.ascii();
if (!tqcontains(guid))
if (!contains(guid))
{
d->archiveView.Add(row);
markDirty();
@@ -305,7 +305,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
}
}

bool FeedStorageMK4Impl::tqcontains(const TQString& guid)
bool FeedStorageMK4Impl::contains(const TQString& guid)
{
return findArticle(guid) != -1;
}
@@ -789,7 +789,7 @@ void FeedStorageMK4Impl::add(FeedStorage* source)

void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
{
if (!tqcontains(guid))
if (!contains(guid))
addEntry(guid);
setComments(guid, source->comments(guid));
setCommentsLink(guid, source->commentsLink(guid));

+ 1
- 1
akregator/src/mk4storage/feedstoragemk4impl.h View File

@@ -50,7 +50,7 @@ class FeedStorageMK4Impl : public FeedStorage

virtual TQStringList articles(const Category& cat);

virtual bool tqcontains(const TQString& guid);
virtual bool contains(const TQString& guid);
virtual void addEntry(const TQString& guid);
virtual void deleteArticle(const TQString& guid);
virtual int comments(const TQString& guid);

+ 1
- 1
akregator/src/mk4storage/metakit/CHANGES View File

@@ -1198,7 +1198,7 @@

Moved C++ member documentation out of "mk4.h" header. Added
examples/ directory, with a find.py timing example. Fixed bugs in
new Mk4tcl: "$vw tqfind" and "$vw delete end". Added tests for new
new Mk4tcl: "$vw find" and "$vw delete end". Added tests for new
Mk4tcl OO interface: ":mk5object.test".

2000-06-16 Improved modifiable custom viewers

+ 3
- 3
akregator/src/mk4storage/metakit/include/mk4str.inl View File

@@ -131,12 +131,12 @@ d4_inline bool c4_String::operator< (const c4_String& str_) const

d4_inline int c4_String::Find(char ch_) const
{
return tqfind(ch_);
return find(ch_);
}

d4_inline int c4_String::ReverseFind(char ch_) const
{
return rtqfind(ch_);
return rfind(ch_);
}

d4_inline int c4_String::FindOneOf(const char* set_) const
@@ -146,7 +146,7 @@ d4_inline int c4_String::FindOneOf(const char* set_) const

d4_inline int c4_String::Find(const char* sub_) const
{
return tqfind(sub_);
return find(sub_);
}

d4_inline c4_String c4_String::SpanIncluding(const char* set_) const

+ 1
- 1
akregator/src/mk4storage/metakit/src/store.cpp View File

@@ -161,7 +161,7 @@ void c4_Notifier::Notify()
* Manager for persistent storage of view structures.
*
* The storage class uses a view, with additional functionality to be able
* to store and reload the data it tqcontains (including nested subviews).
* to store and reload the data it contains (including nested subviews).
*
* By default, data is loaded on demand, i.e. whenever data which has
* not yet been referenced is used for the first time. Loading is limited

+ 1
- 1
akregator/src/mk4storage/storagemk4impl.cpp View File

@@ -276,7 +276,7 @@ void StorageMK4Impl::slotCommit()

FeedStorage* StorageMK4Impl::archiveFor(const TQString& url)
{
if (!d->feeds.tqcontains(url))
if (!d->feeds.contains(url))
{
FeedStorage* fs = new FeedStorageMK4Impl(url, this);
d->feeds[url] = fs;

+ 3
- 3
akregator/src/nodelist.cpp View File

@@ -216,7 +216,7 @@ int NodeList::generateID()
void NodeList::slotNodeAdded(TreeNode* node)
{
Folder* tqparent = node->tqparent();
if ( !node || !d->flatList.tqcontains(tqparent) || d->flatList.tqcontains(node) )
if ( !node || !d->flatList.contains(tqparent) || d->flatList.contains(node) )
return;

addNode(node, false);
@@ -224,7 +224,7 @@ void NodeList::slotNodeAdded(TreeNode* node)

void NodeList::slotNodeDestroyed(TreeNode* node)
{
if ( !node || !d->flatList.tqcontains(node) )
if ( !node || !d->flatList.contains(node) )
return;

removeNode(node);
@@ -232,7 +232,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node)

void NodeList::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node)
{
if ( !node || !d->flatList.tqcontains(node) )
if ( !node || !d->flatList.contains(node) )
return;

removeNode(node);

+ 1
- 1
akregator/src/pageviewer.cpp View File

@@ -390,7 +390,7 @@ void PageViewer::slotPaletteOrFontChanged()
if ( !obj ) // not all views have a browser extension !
return;
int id = obj->tqmetaObject()->tqfindSlot("reparseConfiguration()");
int id = obj->tqmetaObject()->findSlot("reparseConfiguration()");
if (id == -1)
return;
TQUObject o[1];

+ 1
- 1
akregator/src/pageviewer.rc View File

@@ -17,7 +17,7 @@
<Action name="viewer_copy"/>
<Action name="selectAll"/>
<Separator/>
<Action name="tqfind"/>
<Action name="find"/>
<Action name="findNext"/>
<Merge/>
</Menu>

+ 2
- 2
akregator/src/plugin.cpp View File

@@ -25,7 +25,7 @@ Plugin::addPluginProperty( const TQString& key, const TQString& value )
TQString
Plugin::pluginProperty( const TQString& key )
{
if ( m_properties.tqfind( key.lower() ) == m_properties.end() )
if ( m_properties.find( key.lower() ) == m_properties.end() )
return "false";

return m_properties[key.lower()];
@@ -35,7 +35,7 @@ Plugin::pluginProperty( const TQString& key )
bool
Plugin::hasPluginProperty( const TQString& key )
{
return m_properties.tqfind( key.lower() ) != m_properties.end();
return m_properties.find( key.lower() ) != m_properties.end();
}

}

+ 1
- 1
akregator/src/progressmanager.cpp View File

@@ -102,7 +102,7 @@ void ProgressManager::slotNodeAdded(TreeNode* node)
Feed* feed = dynamic_cast<Feed*>(node);
if (feed)
{
if (!d->handlers.tqcontains(feed))
if (!d->handlers.contains(feed))
d->handlers[feed] = new ProgressItemHandler(feed);
connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*)));
}

+ 1
- 1
akregator/src/simplenodeselector.cpp View File

@@ -185,7 +185,7 @@ void SimpleNodeSelector::slotItemSelected(TQListViewItem* item)

void SimpleNodeSelector::slotNodeDestroyed(TreeNode* node)
{
if (d->nodeToItem.tqcontains(node))
if (d->nodeToItem.contains(node))
{
TQListViewItem* item = d->nodeToItem[node];
d->nodeToItem.remove(node);

+ 1
- 1
akregator/src/speechclient.cpp View File

@@ -135,7 +135,7 @@ void SpeechClient::slotAbortJobs()
ASYNC SpeechClient::textRemoved(const TQCString& /*appId*/, uint jobNum)
{
kdDebug() << "SpeechClient::textRemoved() called" << endl;
if (d->pendingJobs.tqcontains(jobNum))
if (d->pendingJobs.contains(jobNum))
{
d->pendingJobs.remove(jobNum);
if (d->pendingJobs.isEmpty())

+ 7
- 7
akregator/src/storagedummyimpl.cpp View File

@@ -100,12 +100,12 @@ bool StorageDummyImpl::rollback()

int StorageDummyImpl::unreadFor(const TQString &url)
{
return d->feeds.tqcontains(url) ? d->feeds[url].unread : 0;
return d->feeds.contains(url) ? d->feeds[url].unread : 0;
}

void StorageDummyImpl::setUnreadFor(const TQString &url, int unread)
{
if (!d->feeds.tqcontains(url))
if (!d->feeds.contains(url))
d->addEntry(url, unread, unread, 0);
else
d->feeds[url].unread = unread;
@@ -113,12 +113,12 @@ void StorageDummyImpl::setUnreadFor(const TQString &url, int unread)

int StorageDummyImpl::totalCountFor(const TQString &url)
{
return d->feeds.tqcontains(url) ? d->feeds[url].totalCount : 0;
return d->feeds.contains(url) ? d->feeds[url].totalCount : 0;
}

void StorageDummyImpl::setTotalCountFor(const TQString &url, int total)
{
if (!d->feeds.tqcontains(url))
if (!d->feeds.contains(url))
d->addEntry(url, 0, total, 0);
else
d->feeds[url].totalCount = total;
@@ -126,12 +126,12 @@ void StorageDummyImpl::setTotalCountFor(const TQString &url, int total)

int StorageDummyImpl::lastFetchFor(const TQString& url)
{
return d->feeds.tqcontains(url) ? d->feeds[url].lastFetch : 0;
return d->feeds.contains(url) ? d->feeds[url].lastFetch : 0;
}

void StorageDummyImpl::setLastFetchFor(const TQString& url, int lastFetch)
{
if (!d->feeds.tqcontains(url))
if (!d->feeds.contains(url))
d->addEntry(url, 0, 0, lastFetch);
else
d->feeds[url].lastFetch = lastFetch;
@@ -143,7 +143,7 @@ void StorageDummyImpl::slotCommit()

FeedStorage* StorageDummyImpl::archiveFor(const TQString& url)
{
if (!d->feeds.tqcontains(url))
if (!d->feeds.contains(url))
d->feeds[url].feedStorage = new FeedStorageDummyImpl(url, this);

return d->feeds[url].feedStorage;

+ 1
- 1
akregator/src/storagefactoryregistry.cpp View File

@@ -70,7 +70,7 @@ StorageFactory* StorageFactoryRegistry::getFactory(const TQString& typestr)

bool StorageFactoryRegistry::containsFactory(const TQString& typestr) const
{
return d->map.tqcontains(typestr);
return d->map.contains(typestr);
}

TQStringList StorageFactoryRegistry::list() const

+ 6
- 6
akregator/src/tabwidget.cpp View File

@@ -218,7 +218,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
newTitle = newTitle.left( newMaxLength-3 ) + "...";
}

newTitle.tqreplace( '&', "&&" );
newTitle.replace( '&', "&&" );
if ( tabLabel( sender ) != newTitle )
changeTab( sender, newTitle );

@@ -235,7 +235,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
newTitle = newTitle.left( newMaxLength-3 ) + "...";
}

newTitle.tqreplace( '&', "&&" );
newTitle.replace( '&', "&&" );
if ( newTitle != tabLabel( page( i ) ) )
changeTab( page( i ), newTitle );
}
@@ -298,8 +298,8 @@ void TabWidget::slotCloseTab()
d->currentItem = currentPage();
if (indexOf(d->currentItem) == 0)
return;
if (d->frames.tqfind(d->currentItem) != NULL)
removeFrame(d->frames.tqfind(d->currentItem));
if (d->frames.find(d->currentItem) != NULL)
removeFrame(d->frames.find(d->currentItem));
delete d->currentItem;
d->currentItem = 0;
}
@@ -323,8 +323,8 @@ void TabWidget::initiateDrag(int tab)

void TabWidget::slotCloseRequest(TQWidget* widget)
{
if (d->frames.tqfind(widget) != NULL)
removeFrame(d->frames.tqfind(widget));
if (d->frames.find(widget) != NULL)
removeFrame(d->frames.find(widget));
}
} // namespace Akregator


+ 3
- 3
akregator/src/tagnode.cpp View File

@@ -196,7 +196,7 @@ void TagNode::slotArticlesAdded(TreeNode* node, const TQValueList<Article>& list
bool added = false;
for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if (!d->articles.tqcontains(*it) && d->filter.matches(*it))
if (!d->articles.contains(*it) && d->filter.matches(*it))
{
d->articles.append(*it);
d->addedArticlesNotify.append(*it);
@@ -216,7 +216,7 @@ void TagNode::slotArticlesUpdated(TreeNode* node, const TQValueList<Article>& li
bool updated = false;
for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if (d->articles.tqcontains(*it))
if (d->articles.contains(*it))
{
if (!d->filter.matches(*it)) // articles is in list, but doesn't match our criteria anymore -> remove it
{
@@ -252,7 +252,7 @@ void TagNode::slotArticlesRemoved(TreeNode* node, const TQValueList<Article>& li
bool removed = false;
for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
{
if (d->articles.tqcontains(*it))
if (d->articles.contains(*it))
{
d->articles.remove(*it);
d->removedArticlesNotify.append(*it);

+ 1
- 1
akregator/src/tagnode.h View File

@@ -76,7 +76,7 @@ public:
virtual int totalCount() const;

/** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree.
/** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree.
If @c tag is not null, only articles tagged with @c tag are returned
@return sequence of articles */

+ 1
- 1
akregator/src/tagnodelist.cpp View File

@@ -158,7 +158,7 @@ void TagNodeList::slotNodeRemoved(Folder* tqparent, TreeNode* node)

bool TagNodeList::containsTagId(const TQString& tagId)
{
return d->tagIdToNodeMap.tqcontains(tagId);
return d->tagIdToNodeMap.contains(tagId);
}

TQValueList<TagNode*> TagNodeList::toList() const

+ 6
- 6
akregator/src/tagset.cpp View File

@@ -54,7 +54,7 @@ TagSet::~TagSet()

void TagSet::insert(const Tag& tag)
{
if (!d->map.tqcontains(tag.id()))
if (!d->map.contains(tag.id()))
{
d->map.insert(tag.id(), tag);
tag.addedToTagSet(this);
@@ -64,7 +64,7 @@ void TagSet::insert(const Tag& tag)

void TagSet::remove(const Tag& tag)
{
if (d->map.tqcontains(tag.id()))
if (d->map.contains(tag.id()))
{
d->map.remove(tag.id());
tag.removedFromTagSet(this);
@@ -74,17 +74,17 @@ void TagSet::remove(const Tag& tag)

bool TagSet::containsID(const TQString& id) const
{
return d->map.tqcontains(id);
return d->map.contains(id);
}

bool TagSet::tqcontains(const Tag& tag) const
bool TagSet::contains(const Tag& tag) const
{
return d->map.tqcontains(tag.id());
return d->map.contains(tag.id());
}

Tag TagSet::findByID(const TQString& id) const
{
return d->map.tqcontains(id) ? d->map[id] : Tag();
return d->map.contains(id) ? d->map[id] : Tag();
}

TQMap<TQString,Tag> TagSet::toMap() const

+ 2
- 2
akregator/src/tagset.h View File

@@ -63,8 +63,8 @@ class TagSet : public TQObject
/** returns the tag set as map ((id, Tag) pairs) */
TQMap<TQString,Tag> toMap() const;

/** returns @c true if this set tqcontains @c tag */
bool tqcontains(const Tag& tag) const;
/** returns @c true if this set contains @c tag */
bool contains(const Tag& tag) const;

/** returns @c true if this set contains a tag with a given ID */
bool containsID(const TQString& id) const;

+ 2
- 2
akregator/src/treenode.cpp View File

@@ -96,7 +96,7 @@ TreeNode* TreeNode::nextSibling() const
TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren();
TreeNode* me = (TreeNode*)this;
int idx = tqchildren.tqfindIndex(me);
int idx = tqchildren.findIndex(me);
return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L;
}
@@ -108,7 +108,7 @@ TreeNode* TreeNode::prevSibling() const
TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren();
TreeNode* me = (TreeNode*)this;
int idx = tqchildren.tqfindIndex(me);
int idx = tqchildren.findIndex(me);
return idx > 0 ? *(d->tqparent->tqchildren().at(idx-1)) : 0L;
}


+ 1
- 1
akregator/src/treenode.h View File

@@ -112,7 +112,7 @@ public:
virtual void setParent(Folder* tqparent);
/** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree.
/** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree.
If @c tag is not null, only articles tagged with @c tag are returned
@return sequence of articles */

+ 2
- 2
akregator/src/utils.cpp View File

@@ -30,7 +30,7 @@ namespace Akregator {

TQString Utils::stripTags(const TQString& str)
{
return TQString(str).tqreplace(TQRegExp("<[^>]*>"), "");
return TQString(str).replace(TQRegExp("<[^>]*>"), "");
}

uint Utils::calcHash(const TQString& str)
@@ -48,7 +48,7 @@ TQString Utils::fileNameForUrl(const TQString& url_p)
{
TQString url2(url_p);
url2 = url2.tqreplace("/", "_").tqreplace(":", "_");
url2 = url2.replace("/", "_").replace(":", "_");
if (url2.length() > 255)
url2 = url2.left(200) + TQString::number(Akregator::Utils::calcHash(url2), 16);

+ 2
- 2
akregator/src/viewer.cpp View File

@@ -112,7 +112,7 @@ void Viewer::displayInExternalBrowser(const KURL &url, const TQString &mimetype)
{
TQString cmd = Settings::externalBrowserCustomCommand();
TQString urlStr = url.url();
cmd.tqreplace(TQRegExp("%u"), urlStr);
cmd.replace(TQRegExp("%u"), urlStr);
KProcess *proc = new KProcess;
TQStringList cmdAndArgs = KShell::splitArgs(cmd);
*proc << cmdAndArgs;
@@ -202,7 +202,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c
void Viewer::slotCopy()
{
TQString text = selectedText();
text.tqreplace( TQChar( 0xa0 ), ' ' );
text.replace( TQChar( 0xa0 ), ' ' );
TQClipboard *cb = TQApplication::tqclipboard();
disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
cb->setText(text);

+ 1
- 1
certmanager/certificateinfowidgetimpl.cpp View File

@@ -155,7 +155,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key ) {

for ( Kleo::DN::const_iterator dnit = dn.begin() ; dnit != dn.end() ; ++dnit ) {
TQString displayName = (*dnit).name();
if( dnComponentNames.tqcontains(displayName) ) displayName = dnComponentNames[displayName];
if( dnComponentNames.contains(displayName) ) displayName = dnComponentNames[displayName];
item = new TQListViewItem( listView, item, displayName, (*dnit).value() );
}


+ 1
- 1
certmanager/certificatewizardimpl.cpp View File

@@ -391,7 +391,7 @@ void CertificateWizardImpl::slotURLSelected( const TQString& _url )
// The application/pkcs10 mimetype didn't have a native extension,
// so the filedialog didn't have the checkbox for auto-adding it.
TQString fileName = url.fileName();
int pos = fileName.tqfindRev( '.' );
int pos = fileName.findRev( '.' );
if ( pos < 0 ) // no extension
url.setFileName( fileName + ".p10" );
#endif

+ 3
- 3
certmanager/certmanager.cpp View File

@@ -363,8 +363,8 @@ void CertManager::createActions() {
mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ),
"location_combo_action", mNextFindRemote? 1 : 0 );

mFindAction = new KAction( i18n("Find"), "tqfind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
actionCollection(), "tqfind" );
mFindAction = new KAction( i18n("Find"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
actionCollection(), "find" );

KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() );
KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
@@ -745,7 +745,7 @@ void CertManager::slotStartCertificateDownload( const TQString& fingerprint, con

TQString CertManager::displayNameForJob( const Kleo::Job *job )
{
JobsDisplayNameMap::iterator it = mJobsDisplayNameMap.tqfind( job );
JobsDisplayNameMap::iterator it = mJobsDisplayNameMap.find( job );
TQString displayName;
if ( it != mJobsDisplayNameMap.end() ) {
displayName = *it;

+ 1
- 1
certmanager/conf/dirservconfigpage.cpp View File

@@ -235,7 +235,7 @@ void DirectoryServicesConfigurationPage::save()
KURL::List::const_iterator end = toAdd.end();
for( ; it != end; ++it ) {
// check if the URL is already in currentList
if ( currentList.tqfind( *it ) == currentList.end() )
if ( currentList.find( *it ) == currentList.end() )
// if not, add it
currentList.append( *it );
}

+ 1
- 1
certmanager/kleopatraui.rc View File

@@ -52,7 +52,7 @@
<Action name="label_action" />
<Action name="query_lineedit_action" />
<Action name="location_combo_action" />
<Action name="tqfind" />
<Action name="find" />
</ToolBar>

<Menu name="listview_popup">

+ 2
- 2
certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp View File

@@ -158,7 +158,7 @@ void Kleo::GnuPGProcessBase::parseStatusOutput() {
static const int startTokenLen = sizeof startToken / sizeof *startToken - 1;

int lineStart = 0;
for ( int lineEnd = d->statusBuffer.tqfind( '\n' ) ; lineEnd >= 0 ; lineEnd = d->statusBuffer.tqfind( '\n', lineStart = lineEnd+1 ) ) {
for ( int lineEnd = d->statusBuffer.find( '\n' ) ; lineEnd >= 0 ; lineEnd = d->statusBuffer.find( '\n', lineStart = lineEnd+1 ) ) {
// get next line:
const TQCString line = d->statusBuffer.mid( lineStart, lineEnd - lineStart ).stripWhiteSpace();
if ( line.isEmpty() )
@@ -179,7 +179,7 @@ void Kleo::GnuPGProcessBase::parseStatusOutput() {
TQString cmd;
TQStringList args;
int tagStart = 0;
for ( int tagEnd = command.tqfind( ' ' ) ; tagEnd >= 0 ; tagEnd = command.tqfind( ' ', tagStart = tagEnd+1 ) ) {
for ( int tagEnd = command.find( ' ' ) ; tagEnd >= 0 ; tagEnd = command.find( ' ', tagStart = tagEnd+1 ) ) {
const TQCString tag = command.mid( tagStart, tagEnd - tagStart );
if ( cmd.isNull() )
cmd = fromHexEscapedUtf8( tag );

+ 6
- 6
certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp View File

@@ -131,7 +131,7 @@ Kleo::CryptoConfigComponent* QGpgMECryptoConfig::component( const TQString& name
{
if ( !mParsed )
const_cast<QGpgMECryptoConfig*>( this )->runGpgConf( false );
return mComponents.tqfind( name );
return mComponents.find( name );
}

void QGpgMECryptoConfig::sync( bool runtime )
@@ -240,7 +240,7 @@ TQStringList QGpgMECryptoConfigComponent::groupList() const

Kleo::CryptoConfigGroup* QGpgMECryptoConfigComponent::group(const TQString& name ) const
{
return mGroups.tqfind( name );
return mGroups.find( name );
}

void QGpgMECryptoConfigComponent::sync( bool runtime )
@@ -341,7 +341,7 @@ TQStringList QGpgMECryptoConfigGroup::entryList() const

Kleo::CryptoConfigEntry* QGpgMECryptoConfigGroup::entry( const TQString& name ) const
{
return mEntries.tqfind( name );
return mEntries.find( name );
}

////
@@ -357,15 +357,15 @@ static TQString gpgconf_escape( const TQString& str )
// Escape special chars (including ':' and '%')
TQString enc = KURL::encode_string( str, 106 ); // and convert to utf8 first (to get %12%34 for one special char)
// Also encode commas, for lists.
enc.tqreplace( ',', "%2c" );
enc.replace( ',', "%2c" );
return enc;
}

static TQString urlpart_encode( const TQString& str )
{
TQString enc( str );
enc.tqreplace( '%', "%25" ); // first!
enc.tqreplace( ':', "%3a" );
enc.replace( '%', "%25" ); // first!
enc.replace( ':', "%3a" );
//kdDebug() << " urlpart_encode: " << str << " -> " << enc << endl;
return enc;
}

+ 6
- 6
certmanager/lib/cryptplugwrapper.cpp View File

@@ -468,9 +468,9 @@ TQString CryptPlugWrapper::libName() const

TQString CryptPlugWrapper::protocol() const
{
if ( _libName.tqcontains( "smime" ) )
if ( _libName.contains( "smime" ) )
return "SMIME";
if ( _libName.tqcontains( "openpgp" ) )
if ( _libName.contains( "openpgp" ) )
return "OpenPGP";
return TQString();
}
@@ -485,9 +485,9 @@ TQString CryptPlugWrapper::displayName() const
{
if ( !_name.isEmpty() )
return _name;
if ( _libName.tqcontains( "smime" ) )
if ( _libName.contains( "smime" ) )
return "gpgsm";
if ( _libName.tqcontains( "openpgp" ) )
if ( _libName.contains( "openpgp" ) )
return "gpg";
return i18n("(Unknown Protocol)");
}
@@ -503,10 +503,10 @@ bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg
_initqStatus = IniStatus_NoLibName;
kdDebug(5150) << "No library name was given.\n" << endl;
} else {
if ( _libName.tqcontains( "smime" ) ) {
if ( _libName.contains( "smime" ) ) {
_cp = new SMIMECryptPlug();
_config = new Config( GPGME_PROTOCOL_CMS );
} else if ( _libName.tqcontains( "openpgp" ) ) {
} else if ( _libName.contains( "openpgp" ) ) {
_cp = new OpenPGPCryptPlug();
_config = new Config( GPGME_PROTOCOL_OpenPGP );
} else {

+ 1
- 1
certmanager/lib/cryptplugwrapperlist.cpp View File

@@ -28,7 +28,7 @@
CryptPlugWrapper * CryptPlugWrapperList::findForLibName( const TQString & libName ) const
{
for ( TQPtrListIterator<CryptPlugWrapper> it( *this ) ; it.current() ; ++it )
if ( (*it)->libName().tqfind( libName, 0, false ) >= 0 )
if ( (*it)->libName().find( libName, 0, false ) >= 0 )
return *it;
return 0;
}

+ 1
- 1
certmanager/lib/kleo/dn.cpp View File

@@ -309,7 +309,7 @@ reorder_dn( const Kleo::DN::Attribute::List & dn ) {

// find all unknown entries in their order of appearance
for ( Kleo::DN::const_iterator it = dn.begin(); it != dn.end(); ++it )
if ( attrOrder.tqfind( (*it).name() ) == attrOrder.end() )
if ( attrOrder.find( (*it).name() ) == attrOrder.end() )
unknownEntries.push_back( *it );

// process the known attrs in the desired order

+ 1
- 1
certmanager/lib/kleo/downloadjob.h View File

@@ -69,7 +69,7 @@ namespace Kleo {
/**
Starts the download operation. \a fingerprints is a list of
fingerprints used to specify the list of keys downloaded. Empty
patterns are ignored. If \a fingerprints is empty, tqcontains
patterns are ignored. If \a fingerprints is empty, contains
only empty strings or anything other than fingerprints, the
result is undefined.
*/

+ 2
- 2
certmanager/lib/tests/test.data View File

@@ -116,7 +116,7 @@ static int status( void * void_ctx, const char * line ) {
static int inquire( void * void_ctx, const char * keyword ) {
assuan_context_t ctx = (assuan_context_t)void_ctx;
assert( ctx );
const std::map<std::string,std::string>::const_iterator it = inquireData.tqfind( keyword );
const std::map<std::string,std::string>::const_iterator it = inquireData.find( keyword );
if ( it == inquireData.end() )
return gpg_error( GPG_ERR_UNKNOWN_COMMAND );

@@ -179,7 +179,7 @@ int main( int argc, char * argv[] ) {
options.push_back( argv[++optind] );
} else if ( qstrcmp( arg, "--inquire" ) == 0 ) {
const std::string inqval = argv[++optind];
const size_t pos = inqval.tqfind( '=' );
const size_t pos = inqval.find( '=' );
// ### implement indirection with "@file"...
inquireData[inqval.substr( 0, pos )] = inqval.substr( pos+1 );
} else {

+ 1
- 1
certmanager/lib/tests/test_gnupgprocessbase.cpp View File

@@ -88,7 +88,7 @@ static TQStringList split( char * buffer, int buflen, TQString & old ) {
}

static TQString escape( TQString str ) {
return str.tqreplace( '&', "&amp" ).tqreplace( '<', "&lt;" ).tqreplace( '>', "&gt;" );
return str.replace( '&', "&amp" ).replace( '<', "&lt;" ).replace( '>', "&gt;" );
}

void GnuPGViewer::slotStdout( KProcess *, char * buffer, int buflen ) {

+ 1
- 1
certmanager/lib/ui/cryptoconfigmodule.cpp View File

@@ -59,7 +59,7 @@ using namespace Kleo;

static inline TQPixmap loadIcon( TQString s ) {
return KGlobal::instance()->iconLoader()
->loadIcon( s.tqreplace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium );
->loadIcon( s.replace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium );
}

static unsigned int num_components_with_options( const Kleo::CryptoConfig * config ) {

+ 1
- 1
certmanager/lib/ui/dnattributeorderconfigwidget.cpp View File

@@ -173,7 +173,7 @@ void Kleo::DNAttributeOrderConfigWidget::load() {

const TQStringList all = Kleo::DNAttributeMapper::instance()->names();
for ( TQStringList::const_iterator it = all.begin() ; it != all.end() ; ++it )
if ( order.tqfind( *it ) == order.end() )
if ( order.find( *it ) == order.end() )
(void)new TQListViewItem( d->availableLV, *it, d->mapper->name2label( *it ) );

if ( !d->placeHolderItem->listView() )

+ 1
- 1
doc/api/Doxyfile.pim View File

@@ -74,7 +74,7 @@ REPEAT_BRIEF = YES
# as the annotated text. Otherwise, the brief description is used as-is. If left
# blank, the following values are used ("$name" is automatically replaced with the
# name of the entity): "The $name class" "The $name widget" "The $name file"
# "is" "provides" "specifies" "tqcontains" "represents" "a" "an" "the"
# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"

ABBREVIATE_BRIEF =


+ 2
- 2
indexlib/GPL_V2 View File

@@ -59,7 +59,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which tqcontains
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:

The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it tqcontains, plus any
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include

+ 2
- 2
indexlib/boost-compat/config/suffix.hpp View File

@@ -332,7 +332,7 @@ namespace std {
// The same problem occurs with has_facet.
// These macros provide a consistent way to access a locale's facets.
// Usage:
// tqreplace
// replace
// std::use_facet<Type>(loc);
// with
// BOOST_USE_FACET(Type, loc);
@@ -357,7 +357,7 @@ namespace std {

// BOOST_NESTED_TEMPLATE workaround ------------------------------------------//
// Member templates are supported by some compilers even though they can't use
// the A::template member<U> syntax, as a workaround tqreplace:
// the A::template member<U> syntax, as a workaround replace:
//
// typedef typename A::template rebind<U> binder;
//

+ 1
- 1
indexlib/stringset.h View File

@@ -129,7 +129,7 @@ struct stringset {
void clear();

/**
* Returns std::make_pair( tqfind( word ), tqfind( word + 'Z' ) ) which makes it easy
* Returns std::make_pair( find( word ), find( word + 'Z' ) ) which makes it easy
* to implement word* searches
*/
std::pair<const_iterator, const_iterator> upper_lower( const char* ) const;

+ 6
- 6
kabc/frontend/mainWindow.ui.h View File

@@ -139,8 +139,8 @@ void MainWindow::readAddressee( const KABC::Addressee &a )
TQStringList customs = a.customs();
TQStringList::ConstIterator it5;
for( it5 = customs.begin(); it5 != customs.end(); ++it5 ) {
int posDash = (*it5).tqfind( "-" );
int posColon = (*it5).tqfind( ":" );
int posDash = (*it5).find( "-" );
int posColon = (*it5).find( ":" );
TQString app = (*it5).left( posDash );
TQString cname = (*it5).mid( posDash + 1, posColon - posDash - 1 );
@@ -583,8 +583,8 @@ void MainWindow::editCustom()
this );
if ( !ok || name.isEmpty() ) return;

int posDash = name.tqfind( "-" );
int posColon = name.tqfind( ":" );
int posDash = name.find( "-" );
int posColon = name.find( ":" );
TQString app = name.left( posDash );
TQString cname = name.mid( posDash + 1, posColon - posDash - 1 );
@@ -610,8 +610,8 @@ void MainWindow::newCustom()
this );
if ( !ok || name.isEmpty() ) return;
int posDash = name.tqfind( "-" );
int posColon = name.tqfind( ":" );
int posDash = name.find( "-" );
int posColon = name.find( ":" );
TQString app = name.left( posDash );
TQString cname = name.mid( posDash + 1, posColon - posDash - 1 );

+ 7
- 7
kabc/kabc2mutt/kabc2mutt.cpp View File

@@ -53,8 +53,8 @@ void KABC2Mutt::loadingFinished()
for ( iaddr = mAddressBook->begin(); iaddr != mAddressBook->end(); ++iaddr ) {
const TQString name = (*iaddr).givenName() + ' ' + (*iaddr).familyName();
if ( !mQuery.isEmpty() ) {
bool match = (name.tqfind(mQuery, 0, mIgnoreCase) > -1) ||
((*iaddr).preferredEmail().tqfind( mQuery, 0, mIgnoreCase ) > -1 );
bool match = (name.find(mQuery, 0, mIgnoreCase) > -1) ||
((*iaddr).preferredEmail().find( mQuery, 0, mIgnoreCase ) > -1 );
if ( !match )
continue;
}
@@ -86,9 +86,9 @@ void KABC2Mutt::loadingFinished()
else
if ( !(*iaddr).familyName().isEmpty() )
key = (*iaddr).givenName().left( 1 ).lower() +
(*iaddr).familyName().lower().tqreplace( space, underscore );
(*iaddr).familyName().lower().replace( space, underscore );
else
key = (*iaddr).givenName().lower().tqreplace( space, underscore );
key = (*iaddr).givenName().lower().replace( space, underscore );

while ( from != to ) {
std::cout << "alias " << key;
@@ -101,7 +101,7 @@ void KABC2Mutt::loadingFinished()

if ( !(*iaddr).nickName().isEmpty() ) {
std::cout << "alias "
<< (*iaddr).nickName().lower().tqreplace( space, underscore )
<< (*iaddr).nickName().lower().replace( space, underscore )
<< '\t' << name << " <"
<< (*iaddr).preferredEmail() << '>' << std::endl;
}
@@ -130,7 +130,7 @@ void KABC2Mutt::loadingFinished()
KABC::DistributionList *list = manager.list( *iaddr );
if ( list ) {
if ( !mQuery.isEmpty() ) {
bool match = ((*iaddr).tqfind(mQuery) > -1);
bool match = ((*iaddr).find(mQuery) > -1);
if ( !match )
continue;
}
@@ -140,7 +140,7 @@ void KABC2Mutt::loadingFinished()
continue;

if ( mFormat == Aliases ) {
std::cout << "alias " << (*iaddr).tqreplace( TQRegExp( " " ), "_" )
std::cout << "alias " << (*iaddr).replace( TQRegExp( " " ), "_" )
<< '\t' << emails.join( "," ) << std::endl;
} else {
std::cout << emails.join( "," ) << '\t' << (*iaddr) << '\t' << std::endl;

+ 2
- 2
kaddressbook/addresseditwidget.cpp View File

@@ -617,7 +617,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *tqparent )
new TQCheckBox( KABC::Address::typeLabel( *it ), mGroup );

for ( int i = 0; i < mGroup->count(); ++i ) {
TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
box->setChecked( type & mTypeList[ i ] );
}
}
@@ -630,7 +630,7 @@ int AddressTypeDialog::type() const
{
int type = 0;
for ( int i = 0; i < mGroup->count(); ++i ) {
TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
if ( box->isChecked() )
type += mTypeList[ i ];
}

+ 1
- 1
kaddressbook/addresseeeditorwidget.cpp View File

@@ -486,7 +486,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs()

const TQStringList list = KGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true );
for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
if ( activePages.tqfind( (*it).mid( (*it).tqfindRev('/') + 1 ) ) == activePages.end() )
if ( activePages.find( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() )
continue;

ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget );

+ 1
- 1
kaddressbook/addviewdialog.cpp View File

@@ -94,7 +94,7 @@ TQString AddViewDialog::viewName()const
TQString AddViewDialog::viewType()const
{
// we missuse the name property for storing the type
return mTypeGroup->tqfind( mTypeId )->name();
return mTypeGroup->find( mTypeId )->name();
}

void AddViewDialog::clicked( int id )

+ 10
- 10
kaddressbook/common/locationmap.cpp View File

@@ -79,17 +79,17 @@ TQString LocationMap::createUrl( const KABC::Address &addr )
}

#if KDE_VERSION >= 319
return urlTemplate.tqreplace( "%s", addr.street() ).
tqreplace( "%r", addr.region() ).
tqreplace( "%l", addr.locality() ).
tqreplace( "%z", addr.postalCode() ).
tqreplace( "%c", addr.countryToISO( addr.country() ) );
return urlTemplate.replace( "%s", addr.street() ).
replace( "%r", addr.region() ).
replace( "%l", addr.locality() ).
replace( "%z", addr.postalCode() ).
replace( "%c", addr.countryToISO( addr.country() ) );
#else
return urlTemplate.tqreplace( "%s", addr.street() ).
tqreplace( "%r", addr.region() ).
tqreplace( "%l", addr.locality() ).
tqreplace( "%z", addr.postalCode() ).
tqreplace( "%c", "" );
return urlTemplate.replace( "%s", addr.street() ).
replace( "%r", addr.region() ).
replace( "%l", addr.locality() ).
replace( "%z", addr.postalCode() ).
replace( "%c", "" );
#endif
}


+ 3
- 3
kaddressbook/customfieldswidget.cpp View File

@@ -103,7 +103,7 @@ TQString AddFieldDialog::title() const
TQString AddFieldDialog::identifier() const
{
TQString id = mTitle->text().lower();
return id.tqreplace( ",", "_" ).tqreplace( " ", "_" );
return id.replace( ",", "_" ).replace( " ", "_" );
}

TQString AddFieldDialog::type() const
@@ -547,12 +547,12 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const

void splitField( const TQString &str, TQString &app, TQString &name, TQString &value )
{
int colon = str.tqfind( ':' );
int colon = str.find( ':' );
if ( colon != -1 ) {
TQString tmp = str.left( colon );
value = str.mid( colon + 1 );

int dash = tmp.tqfind( '-' );
int dash = tmp.find( '-' );
if ( dash != -1 ) {
app = tmp.left( dash );
name = tmp.mid( dash + 1 );

+ 2
- 2
kaddressbook/distributionlistpicker.cpp View File

@@ -97,7 +97,7 @@ void KPIM::DistributionListPickerDialog::slotUser1()
if ( name.isEmpty() )
return;

validName = !listNames.tqcontains( name );
validName = !listNames.contains( name );

if ( validName )
{
@@ -107,7 +107,7 @@ void KPIM::DistributionListPickerDialog::slotUser1()
m_book->insertAddressee( list );

m_listBox->insertItem( name );
TQListBoxItem* item = m_listBox->tqfindItem( name );
TQListBoxItem* item = m_listBox->findItem( name );
m_listBox->setSelected( item, true );
}
else

+ 1
- 1
kaddressbook/editors/imaddresswidget.cpp View File

@@ -50,7 +50,7 @@ IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *>

mProtocols = protocols;
populateProtocols();
cmbProtocol->setCurrentItem( mProtocols.tqfindIndex( protocol ) );
cmbProtocol->setCurrentItem( mProtocols.findIndex( protocol ) );

edtAddress->setText( address.section( TQChar( 0xE120 ), 0, 0 ) );
edtNetwork->setText( address.section( TQChar( 0xE120 ), 1 ) );

+ 8
- 8
kaddressbook/editors/imeditorwidget.cpp View File

@@ -166,7 +166,7 @@ IMEditorWidget::IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM,
//mWidget->btnUp->setEnabled( false );
//mWidget->btnDown->setEnabled( false );
mPreferred = preferredIM;
mPreferred = mPreferred.tqreplace( " on ", TQString( TQChar( 0xE120 ) ), true );
mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true );
mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) );

// order the protocols by putting them in a qmap, then sorting the set of keys and recreating the list
@@ -351,7 +351,7 @@ void IMEditorWidget::slotAdd()
mPreferred = addressWid->address();
}

if ( mChangedProtocols.tqfind( addressWid->protocol() ) == mChangedProtocols.end() )
if ( mChangedProtocols.find( addressWid->protocol() ) == mChangedProtocols.end() )
mChangedProtocols.append( addressWid->protocol() );

mWidget->lvAddresses->sort();
@@ -388,7 +388,7 @@ void IMEditorWidget::slotEdit()
}

// the entry for the protocol of the current address has changed
if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() ) {
if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() ) {
mChangedProtocols.append( current->protocol() );
}
// update protocol - has another protocol gained an address?
@@ -396,7 +396,7 @@ void IMEditorWidget::slotEdit()
modified = true;
// this proto is losing an entry
current->setProtocol( addressWid->protocol() );
if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() )
if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() )
mChangedProtocols.append( current->protocol() );
}

@@ -431,7 +431,7 @@ void IMEditorWidget::slotDelete()
while( it.current() ) {
if ( it.current()->isSelected() ) {
IMAddressLVI * current = static_cast<IMAddressLVI*>( *it );
if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() )
if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() )
mChangedProtocols.append( current->protocol() );

if ( current->preferred() )
@@ -457,7 +457,7 @@ void IMEditorWidget::slotDelete()
TQString IMEditorWidget::preferred() const
{
TQString retval( mPreferred );
return retval.tqreplace( TQChar( 0xE120 ), " on " );
return retval.replace( TQChar( 0xE120 ), " on " );
}


@@ -477,12 +477,12 @@ KPluginInfo * IMEditorWidget::protocolFromString( const TQString &fieldValue ) c

void IMEditorWidget::splitField( const TQString &str, TQString &app, TQString &name, TQString &value )
{
int colon = str.tqfind( ':' );
int colon = str.find( ':' );
if ( colon != -1 ) {
TQString tmp = str.left( colon );
value = str.mid( colon + 1 );

int dash = tmp.tqfind( '-' );
int dash = tmp.find( '-' );
if ( dash != -1 ) {
app = tmp.left( dash );
name = tmp.mid( dash + 1 );

+ 7
- 7
kaddressbook/extensionmanager.cpp View File

@@ -74,7 +74,7 @@ void ExtensionManager::restoreSettings()

typedef TQMap<TQString, ExtensionData>::ConstIterator ConstIterator;
for ( ConstIterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) {
if ( activeExtensions.tqcontains( it.data().identifier ) ) {
if ( activeExtensions.contains( it.data().identifier ) ) {
KToggleAction *action = static_cast<KToggleAction*>( it.data().action );
if ( action )
action->setChecked( true );
@@ -102,20 +102,20 @@ void ExtensionManager::reconfigure()

bool ExtensionManager::isQuickEditVisible() const
{
return mActiveExtensions.tqcontains( "contact_editor" );
return mActiveExtensions.contains( "contact_editor" );
}

void ExtensionManager::setSelectionChanged()
{
for ( TQStringList::ConstIterator it = mActiveExtensions.begin(), end = mActiveExtensions.end(); it != end; ++it ) {
if ( mExtensionMap.tqcontains( *it ) && mExtensionMap[*it].widget )
if ( mExtensionMap.contains( *it ) && mExtensionMap[*it].widget )
mExtensionMap[*it].widget->contactsSelectionChanged();
}
}

void ExtensionManager::activationToggled( const TQString &extid )
{
if ( !mExtensionMap.tqcontains( extid ) )
if ( !mExtensionMap.contains( extid ) )
return;
const ExtensionData data = mExtensionMap[ extid ];
const bool activated = data.action->isChecked();
@@ -124,9 +124,9 @@ void ExtensionManager::activationToggled( const TQString &extid )

void ExtensionManager::setExtensionActive( const TQString& extid, bool active )
{
if ( !mExtensionMap.tqcontains( extid ) )
if ( !mExtensionMap.contains( extid ) )
return;
if ( mActiveExtensions.tqcontains( extid ) == active )
if ( mActiveExtensions.contains( extid ) == active )
return;
const ExtensionData data = mExtensionMap[ extid ];
if ( active ) {
@@ -174,7 +174,7 @@ void ExtensionManager::createActions()
mMapper->setMapping( data.action, data.identifier );
mActionList.append( data.action );

if ( mActiveExtensions.tqcontains( data.identifier ) )
if ( mActiveExtensions.contains( data.identifier ) )
data.action->setChecked( true );
}


+ 2
- 2
kaddressbook/features/distributionlistwidget.cpp View File

@@ -255,9 +255,9 @@ void DistributionListWidget::selectionContactViewChanged()
bool DistributionListWidget::alreadyExists( const TQString& distrListName ) const
{
#ifdef KDEPIM_NEW_DISTRLISTS
return core()->distributionListNames().tqcontains( distrListName );
return core()->distributionListNames().contains( distrListName );
#else
return mManager->listNames().tqcontains( distrListName );
return mManager->listNames().contains( distrListName );
#endif
}


+ 2
- 2
kaddressbook/features/resourceselection.cpp View File

@@ -241,7 +241,7 @@ void ResourceSelection::add()
if ( !ok )
return;

TQString type = types[ descs.tqfindIndex( desc ) ];
TQString type = types[ descs.findIndex( desc ) ];