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-ecb5cbfe19
tags/v3.5.13
tpearson 7 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
593 593
 Problems addressed
594 594
 ------------------
595 595
 
596
-* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog tqcontains ???? at the bottom
596
+* kolab/issue3783: SMIME encrypted and signed mail: Audit log dialog contains ???? at the bottom
597 597
 * kolab/issue3823: mimetreeviewer doesn't show structure of forward-as-attachment message #n where #n > 1
598 598
 * kolab/issue3889: Kontact crahes if opening/changing calendar view (rt#5868)
599 599
 * kolab/issue3867: Save S/MIME encrypted mails unencrypted after reading them

+ 1
- 1
README.Kolab View File

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

+ 2
- 2
akregator/COPYING View File

@@ -59,7 +59,7 @@ modification follow.
59 59
 		    GNU GENERAL PUBLIC LICENSE
60 60
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61 61
 
62
-  0. This License applies to any program or other work which tqcontains
62
+  0. This License applies to any program or other work which contains
63 63
 a notice placed by the copyright holder saying it may be distributed
64 64
 under the terms of this General Public License.  The "Program", below,
65 65
 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:
154 154
 
155 155
 The source code for a work means the preferred form of the work for
156 156
 making modifications to it.  For an executable work, complete source
157
-code means all the source code for all modules it tqcontains, plus any
157
+code means all the source code for all modules it contains, plus any
158 158
 associated interface definition files, plus the scripts used to
159 159
 control compilation and installation of the executable.  However, as a
160 160
 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
148 148
 
149 149
         for (TQValueList<TagAction*>::ConstIterator it = actions.begin(); it != actions.end(); ++it)
150 150
         {
151
-            (*it)->setChecked(tagIds.tqcontains((*it)->tag().id()));
151
+            (*it)->setChecked(tagIds.contains((*it)->tag().id()));
152 152
         }
153 153
     }
154 154
 }
@@ -197,7 +197,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag)
197 197
     if (!Settings::showTaggingGUI())
198 198
         return;
199 199
 
200
-    if (!d->tagActions.tqcontains(tag.id()))
200
+    if (!d->tagActions.contains(tag.id()))
201 201
     {
202 202
         d->tagActions[tag.id()] = new TagAction(tag, TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
203 203
         d->tagMenu->insert(d->tagActions[tag.id()]);

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

@@ -79,7 +79,7 @@ void AddFeedDialog::slotOk( )
79 79
     if (feedURL.startsWith("feed:"))
80 80
         feedURL = feedURL.right( feedURL.length() - 5 );
81 81
 
82
-    if (feedURL.tqfind(":/") == -1)
82
+    if (feedURL.find(":/") == -1)
83 83
         feedURL.prepend("http://");
84 84
     f->setXmlUrl(feedURL);
85 85
 

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

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

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

@@ -411,10 +411,10 @@ void View::slotOnShutdown()
411 411
 void View::saveSettings()
412 412
 {
413 413
     const TQValueList<int> spl1 = m_horizontalSplitter->sizes();
414
-    if ( spl1.tqcontains( 0 ) == 0 )
414
+    if ( spl1.contains( 0 ) == 0 )
415 415
         Settings::setSplitter1Sizes( spl1 );
416 416
     const TQValueList<int> spl2 = m_articleSplitter->sizes();
417
-    if ( spl2.tqcontains( 0 ) == 0 )
417
+    if ( spl2.contains( 0 ) == 0 )
418 418
         Settings::setSplitter2Sizes( spl2 );
419 419
     Settings::setViewMode( m_viewMode );
420 420
     Settings::writeConfig();
@@ -1329,7 +1329,7 @@ void View::slotArticleDelete()
1329 1329
         for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
1330 1330
         {
1331 1331
             Feed* feed = (*it).feed();
1332
-            if (!feeds.tqcontains(feed))
1332
+            if (!feeds.contains(feed))
1333 1333
                 feeds.append(feed);
1334 1334
             feed->setNotificationMode(false);
1335 1335
             (*it).setDeleted();
@@ -1529,7 +1529,7 @@ void View::updateTagActions()
1529 1529
         TQStringList atags = (*it).tags();
1530 1530
         for (TQStringList::ConstIterator it2 = atags.begin(); it2 != atags.end(); ++it2)
1531 1531
         {
1532
-            if (!tags.tqcontains(*it2))
1532
+            if (!tags.contains(*it2))
1533 1533
                 tags += *it2;
1534 1534
         }
1535 1535
     }

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

@@ -102,7 +102,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
102 102
 
103 103
     d->guid = article.guid();
104 104
     
105
-    if (!d->archive->tqcontains(d->guid))
105
+    if (!d->archive->contains(d->guid))
106 106
     {
107 107
         d->archive->addEntry(d->guid);
108 108
 
@@ -425,7 +425,7 @@ void Article::removeTag(const TQString& tag)
425 425
 
426 426
 bool Article::hasTag(const TQString& tag) const
427 427
 {
428
-    return d->archive->tags(d->guid).tqcontains(tag);
428
+    return d->archive->tags(d->guid).contains(tag);
429 429
 }
430 430
 
431 431
 TQStringList Article::tags() const
@@ -453,7 +453,7 @@ TQString Article::buildTitle(const TQString& description)
453 453
     if (description.stripWhiteSpace().isEmpty())
454 454
         return "";
455 455
         
456
-    int i = s.tqfind('>',500); /*avoid processing too much */
456
+    int i = s.find('>',500); /*avoid processing too much */
457 457
     if (i != -1)
458 458
         s = s.left(i+1);
459 459
     TQRegExp rx("(<([^\\s>]*)(?:[^>]*)>)[^<]*", false);
@@ -470,7 +470,7 @@ TQString Article::buildTitle(const TQString& description)
470 470
         }
471 471
         else
472 472
             toReplace=rx.cap(1);  // strip just tag
473
-        s=s.tqreplace(s.tqfind(toReplace),toReplace.length(),replaceWith); // do the deed
473
+        s=s.replace(s.find(toReplace),toReplace.length(),replaceWith); // do the deed
474 474
     }
475 475
     if (s.length()> 90)
476 476
         s=s.left(90)+"...";

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

@@ -179,7 +179,7 @@ bool Criterion::satisfiedBy( const Article &article ) const
179 179
 
180 180
     switch ( predicateType ) {
181 181
         case Contains:
182
-            satisfied = concreteSubject.toString().tqfind( m_object.toString(), 0, false ) != -1;
182
+            satisfied = concreteSubject.toString().find( m_object.toString(), 0, false ) != -1;
183 183
             break;
184 184
         case Equals:
185 185
             if (subjectType=="int")

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

@@ -354,7 +354,7 @@ void ArticleListView::slotArticlesAdded(TreeNode* /*node*/, const TQValueList<Ar
354 354
     
355 355
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
356 356
     {
357
-        if (!d->articleMap.tqcontains(*it))
357
+        if (!d->articleMap.contains(*it))
358 358
         {
359 359
             if (!(*it).isNull() && !(*it).isDeleted())
360 360
             {
@@ -385,7 +385,7 @@ void ArticleListView::slotArticlesUpdated(TreeNode* /*node*/, const TQValueList<
385 385
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
386 386
     {
387 387
         
388
-        if (!(*it).isNull() && d->articleMap.tqcontains(*it))
388
+        if (!(*it).isNull() && d->articleMap.contains(*it))
389 389
         {
390 390
             ArticleItem* ali = d->articleMap[*it];
391 391
 
@@ -447,7 +447,7 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList<
447 447
     
448 448
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
449 449
     {
450
-        if (d->articleMap.tqcontains(*it))
450
+        if (d->articleMap.contains(*it))
451 451
         {
452 452
             ArticleItem* ali = d->articleMap[*it];
453 453
             d->articleMap.remove(*it);

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

@@ -87,7 +87,7 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
87 87
         {
88 88
             text += TQString("<div class=\"body\">");
89 89
             TQString url=node->xmlUrl();
90
-            TQString file = url.tqreplace("/", "_").tqreplace(":", "_");
90
+            TQString file = url.replace("/", "_").replace(":", "_");
91 91
             KURL u(m_view->m_imageDir);
92 92
             u.setFileName(file);
93 93
             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
410 410
         text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
411 411
         if (article.link().isValid())
412 412
             text += "<a href=\""+article.link().url()+"\">";
413
-        text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
413
+        text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
414 414
         if (article.link().isValid())
415 415
             text += "</a>";
416 416
         text += "</div>\n";
@@ -505,7 +505,7 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
505 505
         text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
506 506
         if (link.isValid())
507 507
             text += "<a href=\""+link.url()+"\">";
508
-        text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
508
+        text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
509 509
         if (link.isValid())
510 510
             text += "</a>";
511 511
         text += "</div>\n";

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

@@ -11,7 +11,7 @@
11 11
   <Action name="viewer_copy"/>
12 12
   <Action name="selectAll"/>
13 13
   <Separator/> 
14
-  <Action name="tqfind"/>
14
+  <Action name="find"/>
15 15
   <Action name="findNext"/>
16 16
 </Menu> 
17 17
 <Menu noMerge="1" name="view">

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

@@ -87,7 +87,7 @@ class Feed::FeedPrivate
87 87
         /** caches guids of tagged articles. key: tag, value: list of guids */
88 88
         TQMap<TQString, TQStringList> taggedArticles;
89 89
 
90
-        /** list of deleted articles. This tqcontains **/
90
+        /** list of deleted articles. This contains **/
91 91
         TQValueList<Article> deletedArticles;
92 92
         
93 93
         /** caches guids of deleted articles for notification */
@@ -450,7 +450,7 @@ void Feed::appendArticles(const RSS::Document &doc)
450 450
 
451 451
     for (it = d_articles.begin(); it != en; ++it)
452 452
     {
453
-        if ( !d->articles.tqcontains((*it).guid()) ) // article not in list
453
+        if ( !d->articles.contains((*it).guid()) ) // article not in list
454 454
         {
455 455
             Article mya(*it, this);
456 456
             mya.offsetPubDate(nudge);
@@ -535,7 +535,7 @@ void Feed::appendArticle(const Article& a)
535 535
 {
536 536
     if ( (a.keep() && Settings::doNotExpireImportantArticles()) || ( !usesExpiryByAge() || !isExpired(a) ) ) // if not expired
537 537
     {
538
-        if (!d->articles.tqcontains(a.guid()))
538
+        if (!d->articles.contains(a.guid()))
539 539
         {
540 540
             d->articles[a.guid()] = a;
541 541
             if (!a.isDeleted() && a.status() != Article::Read)
@@ -726,10 +726,10 @@ void Feed::setUnread(int unread)
726 726
 
727 727
 void Feed::setArticleDeleted(Article& a)
728 728
 {
729
-    if (!d->deletedArticles.tqcontains(a))
729
+    if (!d->deletedArticles.contains(a))
730 730
         d->deletedArticles.append(a);
731 731
 
732
-    if (!d->removedArticlesNotify.tqcontains(a))
732
+    if (!d->removedArticlesNotify.contains(a))
733 733
         d->removedArticlesNotify.append(a);
734 734
 
735 735
     articlesModified();

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

@@ -59,7 +59,7 @@ FeedIconManager* FeedIconManager::self()
59 59
 
60 60
 void FeedIconManager::fetchIcon(Feed* feed)
61 61
 {
62
-    if (!d->registeredFeeds.tqcontains(feed))
62
+    if (!d->registeredFeeds.contains(feed))
63 63
     {
64 64
         d->registeredFeeds.append(feed);
65 65
         connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*)));
@@ -133,8 +133,8 @@ void FeedIconManager::slotFeedDestroyed(TreeNode* node)
133 133
 {
134 134
     Feed* feed = dynamic_cast<Feed*>(node);
135 135
     if (feed)
136
-        while (d->registeredFeeds.tqcontains(feed))
137
-            d->registeredFeeds.remove(d->registeredFeeds.tqfind(feed));
136
+        while (d->registeredFeeds.contains(feed))
137
+            d->registeredFeeds.remove(d->registeredFeeds.find(feed));
138 138
 }
139 139
 
140 140
 void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL,
@@ -147,7 +147,7 @@ void FeedIconManager::slotIconChanged(bool /*isHost*/, const TQString& hostOrURL
147 147
     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
148 148
     {
149 149
         while (( f = d->urlDict.take(hostOrURL) ))
150
-            if (d->registeredFeeds.tqcontains(f))
150
+            if (d->registeredFeeds.contains(f))
151 151
                 f->setFavicon(p);
152 152
     }
153 153
     emit signalIconChanged(hostOrURL, iconFile);

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

@@ -117,7 +117,7 @@ void FeedList::parseChildNodes(TQDomNode &node, Folder* tqparent)
117 117
             Feed* feed = Feed::fromOPML(e);
118 118
             if (feed)
119 119
             {
120
-                if (!d->urlMap[feed->xmlUrl()].tqcontains(feed))
120
+                if (!d->urlMap[feed->xmlUrl()].contains(feed))
121 121
                     d->urlMap[feed->xmlUrl()].append(feed);
122 122
                 tqparent->appendChild(feed);
123 123
             }
@@ -219,7 +219,7 @@ void FeedList::append(FeedList* list, Folder* tqparent, TreeNode* after)
219 219
     if ( list == this )
220 220
         return;
221 221
 
222
-    if ( !flatList()->tqcontains(tqparent) )
222
+    if ( !flatList()->contains(tqparent) )
223 223
         tqparent = rootNode();
224 224
 
225 225
     TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren();

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

@@ -457,12 +457,12 @@ TreeNode* NodeListView::findNodeByTitle(const TQString& title)
457 457
 
458 458
 TreeNodeItem* NodeListView::findNodeItem(TreeNode* node)
459 459
 {
460
-    return d->itemDict.tqfind(node);
460
+    return d->itemDict.find(node);
461 461
 }
462 462
 
463 463
 TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const
464 464
 { 
465
-    return dynamic_cast<TreeNodeItem*> (KListView::tqfindItem(text, column, compare)); 
465
+    return dynamic_cast<TreeNodeItem*> (KListView::findItem(text, column, compare)); 
466 466
 }
467 467
 
468 468
 void NodeListView::ensureNodeVisible(TreeNode* node)

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

@@ -92,7 +92,7 @@ class AKREGATOR_EXPORT FeedStorage : public TQObject
92 92
         virtual void clear() = 0;
93 93
 
94 94
         
95
-        virtual bool tqcontains(const TQString& guid) = 0;
95
+        virtual bool contains(const TQString& guid) = 0;
96 96
         virtual void addEntry(const TQString& guid) = 0;
97 97
         virtual void deleteArticle(const TQString& guid) = 0;
98 98
         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)
147 147
 
148 148
 void FeedStorageDummyImpl::addEntry(const TQString& guid)
149 149
 {
150
-    if (!d->entries.tqcontains(guid))
150
+    if (!d->entries.contains(guid))
151 151
     {
152 152
         d->entries[guid] = FeedStorageDummyImplPrivate::Entry();
153 153
         setTotalCount(totalCount()+1);
154 154
     }
155 155
 }
156 156
 
157
-bool FeedStorageDummyImpl::tqcontains(const TQString& guid)
157
+bool FeedStorageDummyImpl::contains(const TQString& guid)
158 158
 {
159
-    return d->entries.tqcontains(guid);
159
+    return d->entries.contains(guid);
160 160
 }
161 161
 
162 162
 void FeedStorageDummyImpl::deleteArticle(const TQString& guid)
163 163
 {
164
-    if (!d->entries.tqcontains(guid))
164
+    if (!d->entries.contains(guid))
165 165
         return;
166 166
 
167 167
     setDeleted(guid);
@@ -172,33 +172,33 @@ void FeedStorageDummyImpl::deleteArticle(const TQString& guid)
172 172
 int FeedStorageDummyImpl::comments(const TQString& guid)
173 173
 {
174 174
     
175
-    return tqcontains(guid) ? d->entries[guid].comments : 0;
175
+    return contains(guid) ? d->entries[guid].comments : 0;
176 176
 }
177 177
 
178 178
 TQString FeedStorageDummyImpl::commentsLink(const TQString& guid)
179 179
 {
180
-    return tqcontains(guid) ? d->entries[guid].commentsLink : "";
180
+    return contains(guid) ? d->entries[guid].commentsLink : "";
181 181
 }
182 182
 
183 183
 bool FeedStorageDummyImpl::guidIsHash(const TQString& guid)
184 184
 {
185
-    return tqcontains(guid) ? d->entries[guid].guidIsHash : false;
185
+    return contains(guid) ? d->entries[guid].guidIsHash : false;
186 186
 }
187 187
 
188 188
 bool FeedStorageDummyImpl::guidIsPermaLink(const TQString& guid)
189 189
 {
190
-    return tqcontains(guid) ? d->entries[guid].guidIsPermaLink : false;
190
+    return contains(guid) ? d->entries[guid].guidIsPermaLink : false;
191 191
 }
192 192
 
193 193
 uint FeedStorageDummyImpl::hash(const TQString& guid)
194 194
 {
195
-    return tqcontains(guid) ? d->entries[guid].hash : 0;
195
+    return contains(guid) ? d->entries[guid].hash : 0;
196 196
 }
197 197
 
198 198
 
199 199
 void FeedStorageDummyImpl::setDeleted(const TQString& guid)
200 200
 {
201
-    if (!tqcontains(guid))
201
+    if (!contains(guid))
202 202
         return;
203 203
 
204 204
     FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
@@ -233,99 +233,99 @@ void FeedStorageDummyImpl::setDeleted(const TQString& guid)
233 233
 
234 234
 TQString FeedStorageDummyImpl::link(const TQString& guid)
235 235
 {
236
-    return tqcontains(guid) ? d->entries[guid].link : "";
236
+    return contains(guid) ? d->entries[guid].link : "";
237 237
 }
238 238
 
239 239
 uint FeedStorageDummyImpl::pubDate(const TQString& guid)
240 240
 {
241
-    return tqcontains(guid) ? d->entries[guid].pubDate : 0;
241
+    return contains(guid) ? d->entries[guid].pubDate : 0;
242 242
 }
243 243
 
244 244
 int FeedStorageDummyImpl::status(const TQString& guid)
245 245
 {
246
-    return tqcontains(guid) ? d->entries[guid].status : 0;
246
+    return contains(guid) ? d->entries[guid].status : 0;
247 247
 }
248 248
 
249 249
 void FeedStorageDummyImpl::setqStatus(const TQString& guid, int status)
250 250
 {
251
-    if (tqcontains(guid))
251
+    if (contains(guid))
252 252
         d->entries[guid].status = status;
253 253
 }
254 254
 
255 255
 TQString FeedStorageDummyImpl::title(const TQString& guid)
256 256
 {
257
-    return tqcontains(guid) ? d->entries[guid].title : "";
257
+    return contains(guid) ? d->entries[guid].title : "";
258 258
 }
259 259
 
260 260
 TQString FeedStorageDummyImpl::description(const TQString& guid)
261 261
 {
262
-    return tqcontains(guid) ? d->entries[guid].description : "";
262
+    return contains(guid) ? d->entries[guid].description : "";
263 263
 }
264 264
 
265 265
 
266 266
 void FeedStorageDummyImpl::setPubDate(const TQString& guid, uint pubdate)
267 267
 {
268
-    if (tqcontains(guid))
268
+    if (contains(guid))
269 269
         d->entries[guid].pubDate = pubdate;
270 270
 }
271 271
 
272 272
 void FeedStorageDummyImpl::setGuidIsHash(const TQString& guid, bool isHash)
273 273
 {
274
-    if (tqcontains(guid))
274
+    if (contains(guid))
275 275
         d->entries[guid].guidIsHash = isHash;
276 276
 }
277 277
 
278 278
 void FeedStorageDummyImpl::setLink(const TQString& guid, const TQString& link)
279 279
 {
280
-    if (tqcontains(guid))
280
+    if (contains(guid))
281 281
         d->entries[guid].link = link;
282 282
 }
283 283
 
284 284
 void FeedStorageDummyImpl::setHash(const TQString& guid, uint hash)
285 285
 {
286
-    if (tqcontains(guid))
286
+    if (contains(guid))
287 287
         d->entries[guid].hash = hash;
288 288
 }
289 289
 
290 290
 void FeedStorageDummyImpl::setTitle(const TQString& guid, const TQString& title)
291 291
 {
292
-    if (tqcontains(guid))
292
+    if (contains(guid))
293 293
         d->entries[guid].title = title;
294 294
 }
295 295
 
296 296
 void FeedStorageDummyImpl::setDescription(const TQString& guid, const TQString& description)
297 297
 {
298
-    if (tqcontains(guid))
298
+    if (contains(guid))
299 299
         d->entries[guid].description = description;
300 300
 }
301 301
 
302 302
 void FeedStorageDummyImpl::setCommentsLink(const TQString& guid, const TQString& commentsLink)
303 303
 {
304
-    if (tqcontains(guid))
304
+    if (contains(guid))
305 305
         d->entries[guid].commentsLink = commentsLink;
306 306
 }
307 307
 
308 308
 void FeedStorageDummyImpl::setComments(const TQString& guid, int comments)
309 309
 {
310
-    if (tqcontains(guid))
310
+    if (contains(guid))
311 311
         d->entries[guid].comments = comments;
312 312
 }
313 313
 
314 314
 
315 315
 void FeedStorageDummyImpl::setGuidIsPermaLink(const TQString& guid, bool isPermaLink)
316 316
 {
317
-    if (tqcontains(guid))
317
+    if (contains(guid))
318 318
         d->entries[guid].guidIsPermaLink = isPermaLink;
319 319
 }
320 320
 
321 321
 void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag)
322 322
 {
323
-    if (tqcontains(guid))
323
+    if (contains(guid))
324 324
     {
325 325
         d->entries[guid].tags.append(tag);
326
-        if (!d->taggedArticles[tag].tqcontains(guid))
326
+        if (!d->taggedArticles[tag].contains(guid))
327 327
             d->taggedArticles[tag].append(guid);
328
-        if (!d->tags.tqcontains(tag))
328
+        if (!d->tags.contains(tag))
329 329
             d->tags.append(tag);
330 330
     }
331 331
 
@@ -333,7 +333,7 @@ void FeedStorageDummyImpl::addTag(const TQString& guid, const TQString& tag)
333 333
 
334 334
 void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat)
335 335
 {
336
-    if (!tqcontains(guid))
336
+    if (!contains(guid))
337 337
         return;
338 338
 
339 339
     d->entries[guid].categories.append(cat);
@@ -345,19 +345,19 @@ void FeedStorageDummyImpl::addCategory(const TQString& guid, const Category& cat
345 345
 
346 346
 void FeedStorageDummyImpl::setAuthor(const TQString& guid, const TQString& author)
347 347
 {
348
-    if (tqcontains(guid))
348
+    if (contains(guid))
349 349
         d->entries[guid].author = author;
350 350
 }
351 351
 
352 352
 TQString FeedStorageDummyImpl::author(const TQString& guid)
353 353
 {
354
-    return tqcontains(guid) ? d->entries[guid].author : TQString();
354
+    return contains(guid) ? d->entries[guid].author : TQString();
355 355
 }
356 356
 
357 357
 TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid)
358 358
 {
359 359
   if (!guid.isNull())
360
-        return tqcontains(guid) ? d->entries[guid].categories : TQValueList<Category>();
360
+        return contains(guid) ? d->entries[guid].categories : TQValueList<Category>();
361 361
     else
362 362
         return d->categories;
363 363
 }
@@ -365,7 +365,7 @@ TQValueList<Category> FeedStorageDummyImpl::categories(const TQString& guid)
365 365
 
366 366
 void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag)
367 367
 {
368
-    if (tqcontains(guid))
368
+    if (contains(guid))
369 369
     {
370 370
         d->entries[guid].tags.remove(tag);
371 371
         d->taggedArticles[tag].remove(guid);
@@ -377,7 +377,7 @@ void FeedStorageDummyImpl::removeTag(const TQString& guid, const TQString& tag)
377 377
 TQStringList FeedStorageDummyImpl::tags(const TQString& guid)
378 378
 {
379 379
     if (!guid.isNull())
380
-        return tqcontains(guid) ? d->entries[guid].tags : TQStringList();
380
+        return contains(guid) ? d->entries[guid].tags : TQStringList();
381 381
     else
382 382
     {
383 383
         return d->tags;
@@ -396,7 +396,7 @@ void FeedStorageDummyImpl::add(FeedStorage* source)
396 396
 
397 397
 void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source)
398 398
 {
399
-    if (!tqcontains(guid))
399
+    if (!contains(guid))
400 400
         addEntry(guid);
401 401
 
402 402
     setComments(guid, source->comments(guid));
@@ -424,7 +424,7 @@ void FeedStorageDummyImpl::clear()
424 424
 
425 425
 void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& url, const TQString& type, int length)
426 426
 {
427
-    if (tqcontains(guid))
427
+    if (contains(guid))
428 428
     {
429 429
         FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
430 430
         entry.hasEnclosure = true;
@@ -436,7 +436,7 @@ void FeedStorageDummyImpl::setEnclosure(const TQString& guid, const TQString& ur
436 436
 
437 437
 void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)
438 438
 {
439
-    if (tqcontains(guid))
439
+    if (contains(guid))
440 440
     {
441 441
         FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
442 442
         entry.hasEnclosure = false;
@@ -448,7 +448,7 @@ void FeedStorageDummyImpl::removeEnclosure(const TQString& guid)
448 448
 
449 449
 void FeedStorageDummyImpl::enclosure(const TQString& guid, bool& hasEnclosure, TQString& url, TQString& type, int& length)
450 450
 {
451
-    if (tqcontains(guid))
451
+    if (contains(guid))
452 452
     {
453 453
         FeedStorageDummyImplPrivate::Entry entry = d->entries[guid];
454 454
         hasEnclosure = entry.hasEnclosure;

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

@@ -50,7 +50,7 @@ class FeedStorageDummyImpl : public FeedStorage
50 50
         virtual TQStringList articles(const Category& cat);
51 51
 
52 52
 
53
-        virtual bool tqcontains(const TQString& guid);
53
+        virtual bool contains(const TQString& guid);
54 54
         virtual void addEntry(const TQString& guid);
55 55
         virtual void deleteArticle(const TQString& guid);
56 56
         virtual int comments(const TQString& guid);

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

@@ -72,7 +72,7 @@ void FetchQueue::slotAbort()
72 72
 
73 73
 void FetchQueue::addFeed(Feed *f)
74 74
 {
75
-    if (!d->queuedFeeds.tqcontains(f) && !d->fetchingFeeds.tqcontains(f))
75
+    if (!d->queuedFeeds.contains(f) && !d->fetchingFeeds.contains(f))
76 76
     {
77 77
         connectToFeed(f);
78 78
         d->queuedFeeds.append(f);

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

@@ -99,7 +99,7 @@ TQStringList Folder::tags() const
99 99
         // intersect tag sets instead of appending lists, to avoid dupes. This sucks. Definitely. I want TQSet. Now.
100 100
         TQStringList t2 = (*it)->tags();
101 101
         for (TQStringList::ConstIterator it2 = t2.begin(); it2 != t2.end(); ++it2)
102
-            if (!t.tqcontains(*it2))
102
+            if (!t.contains(*it2))
103 103
                 t.append(*it2);
104 104
     } 
105 105
     return t;
@@ -137,7 +137,7 @@ TQValueList<TreeNode*> Folder::tqchildren() const
137 137
 
138 138
 void Folder::insertChild(TreeNode* node, TreeNode* after)
139 139
 {
140
-    int pos = d->tqchildren.tqfindIndex(after);
140
+    int pos = d->tqchildren.findIndex(after);
141 141
     
142 142
     if (pos < 0)
143 143
         prependChild(node);
@@ -202,7 +202,7 @@ void Folder::prependChild(TreeNode* node)
202 202
 void Folder::removeChild(TreeNode* node)
203 203
 {
204 204
 //    kdDebug() << "enter Folder::removeChild() node:" << (node ? node->title() : "null") << endl;
205
-    if (node && d->tqchildren.tqcontains(node))
205
+    if (node && d->tqchildren.contains(node))
206 206
     {    
207 207
         node->setParent(0);
208 208
         d->tqchildren.remove(node);

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

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

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

@@ -24,7 +24,7 @@ time_t parseISO8601Date(const TQString &s)
24 24
         return 0; // error
25 25
 
26 26
     // FIXME: imho this is done in KRFCDate::parseDateISO8601() automatically, so we could omit it? -fo
27
-	if (s.tqfind('T') != -1)
27
+	if (s.find('T') != -1)
28 28
 		return KRFCDate::parseDateISO8601(s);
29 29
     else
30 30
         return KRFCDate::parseDateISO8601(s + "T12:00:00");
@@ -43,11 +43,11 @@ TQString childNodesAsXML(const TQDomNode& tqparent)
43 43
 static TQString plainTextToHtml(const TQString& plainText)
44 44
 {
45 45
     TQString str(plainText);
46
-    str.tqreplace("&", "&amp;");
47
-    str.tqreplace("\"", "&quot;");
48
-    str.tqreplace("<", "&lt;");
49
-    //str.tqreplace(">", "&gt;");
50
-    str.tqreplace("\n", "<br/>");
46
+    str.replace("&", "&amp;");
47
+    str.replace("\"", "&quot;");
48
+    str.replace("<", "&lt;");
49
+    //str.replace(">", "&gt;");
50
+    str.replace("\n", "<br/>");
51 51
     return str;
52 52
 }
53 53
 
@@ -84,7 +84,7 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
84 84
     xmltypes.append(TQString::fromUtf8("application/xml-dtd"));
85 85
     
86 86
     
87
-    if (xmltypes.tqcontains(type)
87
+    if (xmltypes.contains(type)
88 88
         || type.tqendsWith(TQString::fromUtf8("+xml"), false)
89 89
         || type.tqendsWith(TQString::fromUtf8("/xml"), false))
90 90
         return XML;
@@ -102,7 +102,7 @@ static TQString extractAtomContent(const TQDomElement& e)
102 102
     {
103 103
         case HTML:
104 104
         {
105
-            const bool hasPre = e.text().tqcontains( "<pre>", false ) || e.text().tqcontains( "<pre ", false );
105
+            const bool hasPre = e.text().contains( "<pre>", false ) || e.text().contains( "<pre ", false );
106 106
             return KCharsets::resolveEntities( hasPre ? e.text() : e.text().simplifyWhiteSpace() );
107 107
         }
108 108
         case Text:
@@ -132,10 +132,10 @@ TQString extractNode(const TQDomNode &tqparent, const TQString &elemName, bool i
132 132
         }        
133 133
         else // check for HTML; not necessary for Atom:content
134 134
         {
135
-            bool hasPre = result.tqcontains("<pre>", false) || result.tqcontains("<pre ", false);
136
-            bool hasHtml = hasPre || result.tqcontains("<");	// FIXME: test if we have html, should be more clever -> regexp
135
+            bool hasPre = result.contains("<pre>", false) || result.contains("<pre ", false);
136
+            bool hasHtml = hasPre || result.contains("<");	// FIXME: test if we have html, should be more clever -> regexp
137 137
             if(!isInlined && !hasHtml)						// perform nl2br if not a inline elt and it has no html elts
138
-                    result = result = result.tqreplace(TQChar('\n'), "<br />");
138
+                    result = result = result.replace(TQChar('\n'), "<br />");
139 139
             if(!hasPre)										// strip white spaces if no <pre>
140 140
                     result = result.simplifyWhiteSpace();
141 141
         }
@@ -151,7 +151,7 @@ TQString extractTitle(const TQDomNode & tqparent)
151 151
 
152 152
     TQString result = node.toElement().text();
153 153
 
154
-    result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).tqreplace(TQRegExp("<[^>]*>"), "").remove("\\"));
154
+    result = KCharsets::resolveEntities(KCharsets::resolveEntities(result).replace(TQRegExp("<[^>]*>"), "").remove("\\"));
155 155
 	result = result.simplifyWhiteSpace();
156 156
 
157 157
     if (result.isEmpty())
@@ -177,7 +177,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema
177 177
     {
178 178
         TQString all = remail.cap(0);
179 179
         email = remail.cap(1);
180
-        str.tqreplace(all, ""); // remove mail address
180
+        str.replace(all, ""); // remove mail address
181 181
     }
182 182
     
183 183
     // 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
147 147
     kdDebug() << url2 << endl;
148 148
     TQString t = url2;
149 149
     TQString t2 = url2;
150
-    TQString filePath = main->archivePath() +"/"+ t.tqreplace("/", "_").tqreplace(":", "_");
151
-    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.tqreplace("/", "_").tqreplace(":", "_") + ".xml";
150
+    TQString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_");
151
+    d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml";
152 152
 
153 153
     d->convert = !TQFile::exists(filePath + ".mk4") && TQFile::exists(d->oldArchivePath);
154 154
     d->storage = new c4_Storage((filePath + ".mk4").local8Bit(), true);
@@ -297,7 +297,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
297 297
 {
298 298
     c4_Row row;
299 299
     d->pguid(row) = guid.ascii();
300
-    if (!tqcontains(guid))
300
+    if (!contains(guid))
301 301
     {
302 302
         d->archiveView.Add(row);
303 303
         markDirty();
@@ -305,7 +305,7 @@ void FeedStorageMK4Impl::addEntry(const TQString& guid)
305 305
     }
306 306
 }
307 307
 
308
-bool FeedStorageMK4Impl::tqcontains(const TQString& guid)
308
+bool FeedStorageMK4Impl::contains(const TQString& guid)
309 309
 {
310 310
     return findArticle(guid) != -1;
311 311
 }
@@ -789,7 +789,7 @@ void FeedStorageMK4Impl::add(FeedStorage* source)
789 789
 
790 790
 void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
791 791
 {
792
-    if (!tqcontains(guid))
792
+    if (!contains(guid))
793 793
         addEntry(guid);
794 794
     setComments(guid, source->comments(guid));
795 795
     setCommentsLink(guid, source->commentsLink(guid));

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

@@ -50,7 +50,7 @@ class FeedStorageMK4Impl : public FeedStorage
50 50
 
51 51
         virtual TQStringList articles(const Category& cat);
52 52
 
53
-        virtual bool tqcontains(const TQString& guid);
53
+        virtual bool contains(const TQString& guid);
54 54
         virtual void addEntry(const TQString& guid);
55 55
         virtual void deleteArticle(const TQString& guid);
56 56
         virtual int comments(const TQString& guid);

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

@@ -1198,7 +1198,7 @@
1198 1198
 
1199 1199
     Moved C++ member documentation out of "mk4.h" header.  Added
1200 1200
     examples/ directory, with a find.py timing example.  Fixed bugs in
1201
-    new Mk4tcl: "$vw tqfind" and "$vw delete end".  Added tests for new
1201
+    new Mk4tcl: "$vw find" and "$vw delete end".  Added tests for new
1202 1202
     Mk4tcl OO interface: ":mk5object.test".
1203 1203
 
1204 1204
 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
131 131
 
132 132
 d4_inline int c4_String::Find(char ch_) const
133 133
 {
134
-    return tqfind(ch_);
134
+    return find(ch_);
135 135
 }
136 136
 
137 137
 d4_inline int c4_String::ReverseFind(char ch_) const
138 138
 {
139
-    return rtqfind(ch_);
139
+    return rfind(ch_);
140 140
 }
141 141
 
142 142
 d4_inline int c4_String::FindOneOf(const char* set_) const
@@ -146,7 +146,7 @@ d4_inline int c4_String::FindOneOf(const char* set_) const
146 146
 
147 147
 d4_inline int c4_String::Find(const char* sub_) const
148 148
 {
149
-    return tqfind(sub_);
149
+    return find(sub_);
150 150
 }
151 151
 
152 152
 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()
161 161
  *  Manager for persistent storage of view structures.
162 162
  *
163 163
  *  The storage class uses a view, with additional functionality to be able 
164
- *  to store and reload the data it tqcontains (including nested subviews).
164
+ *  to store and reload the data it contains (including nested subviews).
165 165
  *
166 166
  *  By default, data is loaded on demand, i.e. whenever data which has
167 167
  *  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()
276 276
 
277 277
 FeedStorage* StorageMK4Impl::archiveFor(const TQString& url)
278 278
 {
279
-    if (!d->feeds.tqcontains(url))
279
+    if (!d->feeds.contains(url))
280 280
     {
281 281
         FeedStorage* fs = new FeedStorageMK4Impl(url, this);
282 282
         d->feeds[url] = fs;

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

@@ -216,7 +216,7 @@ int NodeList::generateID()
216 216
 void NodeList::slotNodeAdded(TreeNode* node)
217 217
 {
218 218
     Folder* tqparent = node->tqparent();
219
-    if ( !node || !d->flatList.tqcontains(tqparent) || d->flatList.tqcontains(node) )
219
+    if ( !node || !d->flatList.contains(tqparent) || d->flatList.contains(node) )
220 220
         return;
221 221
 
222 222
     addNode(node, false);
@@ -224,7 +224,7 @@ void NodeList::slotNodeAdded(TreeNode* node)
224 224
 
225 225
 void NodeList::slotNodeDestroyed(TreeNode* node)
226 226
 {
227
-    if ( !node || !d->flatList.tqcontains(node) )
227
+    if ( !node || !d->flatList.contains(node) )
228 228
         return;
229 229
 
230 230
     removeNode(node);
@@ -232,7 +232,7 @@ void NodeList::slotNodeDestroyed(TreeNode* node)
232 232
 
233 233
 void NodeList::slotNodeRemoved(Folder* /*tqparent*/, TreeNode* node)
234 234
 {
235
-    if ( !node || !d->flatList.tqcontains(node) )
235
+    if ( !node || !d->flatList.contains(node) )
236 236
         return;
237 237
 
238 238
     removeNode(node);

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

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

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

@@ -17,7 +17,7 @@
17 17
   <Action name="viewer_copy"/>
18 18
   <Action name="selectAll"/>
19 19
   <Separator/>
20
-  <Action name="tqfind"/>
20
+  <Action name="find"/>
21 21
   <Action name="findNext"/>
22 22
   <Merge/>
23 23
 </Menu>

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

@@ -25,7 +25,7 @@ Plugin::addPluginProperty( const TQString& key, const TQString& value )
25 25
 TQString
26 26
 Plugin::pluginProperty( const TQString& key )
27 27
 {
28
-    if ( m_properties.tqfind( key.lower() ) == m_properties.end() )
28
+    if ( m_properties.find( key.lower() ) == m_properties.end() )
29 29
         return "false";
30 30
 
31 31
     return m_properties[key.lower()];
@@ -35,7 +35,7 @@ Plugin::pluginProperty( const TQString& key )
35 35
 bool
36 36
 Plugin::hasPluginProperty( const TQString& key )
37 37
 {
38
-    return m_properties.tqfind( key.lower() ) != m_properties.end();
38
+    return m_properties.find( key.lower() ) != m_properties.end();
39 39
 }
40 40
 
41 41
 }

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

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

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

@@ -185,7 +185,7 @@ void SimpleNodeSelector::slotItemSelected(TQListViewItem* item)
185 185
 
186 186
 void SimpleNodeSelector::slotNodeDestroyed(TreeNode* node)
187 187
 {
188
-    if (d->nodeToItem.tqcontains(node))
188
+    if (d->nodeToItem.contains(node))
189 189
     {
190 190
         TQListViewItem* item = d->nodeToItem[node];
191 191
         d->nodeToItem.remove(node);

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

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

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

@@ -100,12 +100,12 @@ bool StorageDummyImpl::rollback()
100 100
 
101 101
 int StorageDummyImpl::unreadFor(const TQString &url)
102 102
 {
103
-    return d->feeds.tqcontains(url) ? d->feeds[url].unread : 0;
103
+    return d->feeds.contains(url) ? d->feeds[url].unread : 0;
104 104
 }
105 105
 
106 106
 void StorageDummyImpl::setUnreadFor(const TQString &url, int unread)
107 107
 {
108
-    if (!d->feeds.tqcontains(url))
108
+    if (!d->feeds.contains(url))
109 109
        d->addEntry(url, unread, unread, 0);
110 110
     else
111 111
        d->feeds[url].unread = unread;
@@ -113,12 +113,12 @@ void StorageDummyImpl::setUnreadFor(const TQString &url, int unread)
113 113
 
114 114
 int StorageDummyImpl::totalCountFor(const TQString &url)
115 115
 {
116
-    return d->feeds.tqcontains(url) ? d->feeds[url].totalCount : 0;
116
+    return d->feeds.contains(url) ? d->feeds[url].totalCount : 0;
117 117
 }
118 118
 
119 119
 void StorageDummyImpl::setTotalCountFor(const TQString &url, int total)
120 120
 {
121
-    if (!d->feeds.tqcontains(url))
121
+    if (!d->feeds.contains(url))
122 122
        d->addEntry(url, 0, total, 0);
123 123
     else
124 124
        d->feeds[url].totalCount = total;
@@ -126,12 +126,12 @@ void StorageDummyImpl::setTotalCountFor(const TQString &url, int total)
126 126
 
127 127
 int StorageDummyImpl::lastFetchFor(const TQString& url)
128 128
 {
129
-    return d->feeds.tqcontains(url) ? d->feeds[url].lastFetch : 0;
129
+    return d->feeds.contains(url) ? d->feeds[url].lastFetch : 0;
130 130
 }
131 131
 
132 132
 void StorageDummyImpl::setLastFetchFor(const TQString& url, int lastFetch)
133 133
 {
134
-    if (!d->feeds.tqcontains(url))
134
+    if (!d->feeds.contains(url))
135 135
        d->addEntry(url, 0, 0, lastFetch);
136 136
     else 
137 137
        d->feeds[url].lastFetch = lastFetch;
@@ -143,7 +143,7 @@ void StorageDummyImpl::slotCommit()
143 143
 
144 144
 FeedStorage* StorageDummyImpl::archiveFor(const TQString& url)
145 145
 {
146
-    if (!d->feeds.tqcontains(url))
146
+    if (!d->feeds.contains(url))
147 147
         d->feeds[url].feedStorage = new FeedStorageDummyImpl(url, this);
148 148
 
149 149
     return d->feeds[url].feedStorage;

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

@@ -70,7 +70,7 @@ StorageFactory* StorageFactoryRegistry::getFactory(const TQString& typestr)
70 70
 
71 71
 bool StorageFactoryRegistry::containsFactory(const TQString& typestr) const
72 72
 {
73
-    return d->map.tqcontains(typestr);
73
+    return d->map.contains(typestr);
74 74
 }
75 75
 
76 76
 TQStringList StorageFactoryRegistry::list() const

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

@@ -218,7 +218,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
218 218
         newTitle = newTitle.left( newMaxLength-3 ) + "...";
219 219
     }
220 220
 
221
-    newTitle.tqreplace( '&', "&&" );
221
+    newTitle.replace( '&', "&&" );
222 222
     if ( tabLabel( sender ) != newTitle )
223 223
         changeTab( sender, newTitle );
224 224
 
@@ -235,7 +235,7 @@ void TabWidget::setTitle( const TQString &title , TQWidget* sender)
235 235
                 newTitle = newTitle.left( newMaxLength-3 ) + "...";
236 236
             }
237 237
 
238
-            newTitle.tqreplace( '&', "&&" );
238
+            newTitle.replace( '&', "&&" );
239 239
             if ( newTitle != tabLabel( page( i ) ) )
240 240
                     changeTab( page( i ), newTitle );
241 241
         }
@@ -298,8 +298,8 @@ void TabWidget::slotCloseTab()
298 298
         d->currentItem = currentPage();
299 299
     if (indexOf(d->currentItem) == 0) 
300 300
         return;
301
-    if (d->frames.tqfind(d->currentItem) != NULL)
302
-        removeFrame(d->frames.tqfind(d->currentItem));
301
+    if (d->frames.find(d->currentItem) != NULL)
302
+        removeFrame(d->frames.find(d->currentItem));
303 303
     delete d->currentItem;
304 304
     d->currentItem = 0;
305 305
 }
@@ -323,8 +323,8 @@ void TabWidget::initiateDrag(int tab)
323 323
 
324 324
 void TabWidget::slotCloseRequest(TQWidget* widget)
325 325
 {
326
-    if (d->frames.tqfind(widget) != NULL)
327
-        removeFrame(d->frames.tqfind(widget));
326
+    if (d->frames.find(widget) != NULL)
327
+        removeFrame(d->frames.find(widget));
328 328
 }
329 329
 } // namespace Akregator
330 330
 

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

@@ -196,7 +196,7 @@ void TagNode::slotArticlesAdded(TreeNode* node, const TQValueList<Article>& list
196 196
     bool added = false;
197 197
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
198 198
     {
199
-        if (!d->articles.tqcontains(*it) && d->filter.matches(*it))
199
+        if (!d->articles.contains(*it) && d->filter.matches(*it))
200 200
         {
201 201
             d->articles.append(*it);
202 202
             d->addedArticlesNotify.append(*it);
@@ -216,7 +216,7 @@ void TagNode::slotArticlesUpdated(TreeNode* node, const TQValueList<Article>& li
216 216
     bool updated = false;
217 217
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
218 218
     {
219
-        if (d->articles.tqcontains(*it))
219
+        if (d->articles.contains(*it))
220 220
         {
221 221
             if (!d->filter.matches(*it)) // articles is in list, but doesn't match our criteria anymore -> remove it
222 222
 	    {
@@ -252,7 +252,7 @@ void TagNode::slotArticlesRemoved(TreeNode* node, const TQValueList<Article>& li
252 252
     bool removed = false;
253 253
     for (TQValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
254 254
     {
255
-        if (d->articles.tqcontains(*it))
255
+        if (d->articles.contains(*it))
256 256
         {
257 257
             d->articles.remove(*it);
258 258
             d->removedArticlesNotify.append(*it);

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

@@ -76,7 +76,7 @@ public:
76 76
     virtual int totalCount() const;
77 77
 
78 78
     
79
-    /** Returns a sequence of the articles this node tqcontains. For feed groups, this returns a concatenated list of all articles in the sub tree.
79
+    /** Returns a sequence of the articles this node contains. For feed groups, this returns a concatenated list of all articles in the sub tree.
80 80
     If @c tag is not null, only articles tagged with @c tag are returned
81 81
     @return sequence of articles */
82 82
     

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

@@ -158,7 +158,7 @@ void TagNodeList::slotNodeRemoved(Folder* tqparent, TreeNode* node)
158 158
 
159 159
 bool TagNodeList::containsTagId(const TQString& tagId)
160 160
 {
161
-    return d->tagIdToNodeMap.tqcontains(tagId);
161
+    return d->tagIdToNodeMap.contains(tagId);
162 162
 }
163 163
 
164 164
 TQValueList<TagNode*> TagNodeList::toList() const

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

@@ -54,7 +54,7 @@ TagSet::~TagSet()
54 54
 
55 55
 void TagSet::insert(const Tag& tag)
56 56
 {
57
-    if (!d->map.tqcontains(tag.id()))
57
+    if (!d->map.contains(tag.id()))
58 58
     {
59 59
         d->map.insert(tag.id(), tag);
60 60
         tag.addedToTagSet(this);
@@ -64,7 +64,7 @@ void TagSet::insert(const Tag& tag)
64 64
 
65 65
 void TagSet::remove(const Tag& tag)
66 66
 {
67
-    if (d->map.tqcontains(tag.id()))
67
+    if (d->map.contains(tag.id()))
68 68
     {
69 69
         d->map.remove(tag.id());
70 70
         tag.removedFromTagSet(this);
@@ -74,17 +74,17 @@ void TagSet::remove(const Tag& tag)
74 74
 
75 75
 bool TagSet::containsID(const TQString& id) const
76 76
 {
77
-    return d->map.tqcontains(id);
77
+    return d->map.contains(id);
78 78
 }
79 79
 
80
-bool TagSet::tqcontains(const Tag& tag) const
80
+bool TagSet::contains(const Tag& tag) const
81 81
 {
82
-    return d->map.tqcontains(tag.id());
82
+    return d->map.contains(tag.id());
83 83
 }
84 84
 
85 85
 Tag TagSet::findByID(const TQString& id) const
86 86
 {
87
-    return d->map.tqcontains(id) ? d->map[id] : Tag();
87
+    return d->map.contains(id) ? d->map[id] : Tag();
88 88
 }
89 89
 
90 90
 TQMap<TQString,Tag> TagSet::toMap() const

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

@@ -63,8 +63,8 @@ class TagSet : public TQObject
63 63
         /** returns the tag set as map ((id, Tag) pairs) */
64 64
         TQMap<TQString,Tag> toMap() const;
65 65
 
66
-        /** returns @c true if this set tqcontains @c tag */
67
-        bool tqcontains(const Tag& tag) const;
66
+        /** returns @c true if this set contains @c tag */
67
+        bool contains(const Tag& tag) const;
68 68
 
69 69
         /** returns @c true if this set contains a tag with a given ID */
70 70
         bool containsID(const TQString& id) const;

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

@@ -96,7 +96,7 @@ TreeNode* TreeNode::nextSibling() const
96 96
     TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren();
97 97
     TreeNode* me = (TreeNode*)this;
98 98
         
99
-    int idx = tqchildren.tqfindIndex(me);
99
+    int idx = tqchildren.findIndex(me);
100 100
     
101 101
     return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L;
102 102
 }
@@ -108,7 +108,7 @@ TreeNode* TreeNode::prevSibling() const
108 108
     TQValueList<TreeNode*> tqchildren = d->tqparent->tqchildren();
109 109
     TreeNode* me = (TreeNode*)this;
110 110
     
111
-    int idx = tqchildren.tqfindIndex(me);
111
+    int idx = tqchildren.findIndex(me);
112 112
     return idx > 0 ? *(d->tqparent->tqchildren().at(idx-1)) : 0L;
113 113
 }
114 114
 

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

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

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

@@ -30,7 +30,7 @@ namespace Akregator {
30 30
 
31 31
 TQString Utils::stripTags(const TQString& str)
32 32
 {
33
-    return TQString(str).tqreplace(TQRegExp("<[^>]*>"), "");
33
+    return TQString(str).replace(TQRegExp("<[^>]*>"), "");
34 34
 }
35 35
 
36 36
 uint Utils::calcHash(const TQString& str)
@@ -48,7 +48,7 @@ TQString Utils::fileNameForUrl(const TQString& url_p)
48 48
 {
49 49
     TQString url2(url_p);
50 50
     
51
-    url2 = url2.tqreplace("/", "_").tqreplace(":", "_");
51
+    url2 = url2.replace("/", "_").replace(":", "_");
52 52
     
53 53
     if (url2.length() > 255)
54 54
         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)
112 112
    {
113 113
        TQString cmd = Settings::externalBrowserCustomCommand();
114 114
        TQString urlStr = url.url();
115
-       cmd.tqreplace(TQRegExp("%u"), urlStr);
115
+       cmd.replace(TQRegExp("%u"), urlStr);
116 116
        KProcess *proc = new KProcess;
117 117
        TQStringList cmdAndArgs = KShell::splitArgs(cmd);
118 118
        *proc << cmdAndArgs;
@@ -202,7 +202,7 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c
202 202
 void Viewer::slotCopy()
203 203
 {
204 204
     TQString text = selectedText();
205
-    text.tqreplace( TQChar( 0xa0 ), ' ' );
205
+    text.replace( TQChar( 0xa0 ), ' ' );
206 206
     TQClipboard *cb = TQApplication::tqclipboard();
207 207
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
208 208
     cb->setText(text);

+ 1
- 1
certmanager/certificateinfowidgetimpl.cpp View File

@@ -155,7 +155,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key  ) {
155 155
 
156 156
   for ( Kleo::DN::const_iterator dnit = dn.begin() ; dnit != dn.end() ; ++dnit ) {
157 157
 	TQString displayName = (*dnit).name();
158
-	if( dnComponentNames.tqcontains(displayName) ) displayName = dnComponentNames[displayName];
158
+	if( dnComponentNames.contains(displayName) ) displayName = dnComponentNames[displayName];
159 159
 	item = new TQListViewItem( listView, item, displayName, (*dnit).value() );
160 160
   }
161 161
 

+ 1
- 1
certmanager/certificatewizardimpl.cpp View File

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

+ 3
- 3
certmanager/certmanager.cpp View File

@@ -363,8 +363,8 @@ void CertManager::createActions() {
363 363
   mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ),
364 364
                                   "location_combo_action", mNextFindRemote? 1 : 0 );
365 365
 
366
-  mFindAction = new KAction( i18n("Find"), "tqfind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
367
-			     actionCollection(), "tqfind" );
366
+  mFindAction = new KAction( i18n("Find"), "find", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
367
+			     actionCollection(), "find" );
368 368
 
369 369
   KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() );
370 370
   KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
@@ -745,7 +745,7 @@ void CertManager::slotStartCertificateDownload( const TQString& fingerprint, con
745 745
 
746 746
 TQString CertManager::displayNameForJob( const Kleo::Job *job )
747 747
 {
748
-  JobsDisplayNameMap::iterator it = mJobsDisplayNameMap.tqfind( job );
748
+  JobsDisplayNameMap::iterator it = mJobsDisplayNameMap.find( job );
749 749
   TQString displayName;
750 750
   if ( it != mJobsDisplayNameMap.end() ) {
751 751
     displayName = *it;

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

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

+ 1
- 1
certmanager/kleopatraui.rc View File

@@ -52,7 +52,7 @@
52 52
 	<Action name="label_action" />
53 53
 	<Action name="query_lineedit_action" />
54 54
 	<Action name="location_combo_action" />
55
-	<Action name="tqfind" />
55
+	<Action name="find" />
56 56
 </ToolBar>
57 57
 
58 58
 <Menu name="listview_popup">

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

@@ -158,7 +158,7 @@ void Kleo::GnuPGProcessBase::parseStatusOutput() {
158 158
   static const int startTokenLen = sizeof startToken / sizeof *startToken - 1;
159 159
 
160 160
   int lineStart = 0;
161
-  for ( int lineEnd = d->statusBuffer.tqfind( '\n' ) ; lineEnd >= 0 ; lineEnd = d->statusBuffer.tqfind( '\n', lineStart = lineEnd+1 ) ) {
161
+  for ( int lineEnd = d->statusBuffer.find( '\n' ) ; lineEnd >= 0 ; lineEnd = d->statusBuffer.find( '\n', lineStart = lineEnd+1 ) ) {
162 162
     // get next line:
163 163
     const TQCString line = d->statusBuffer.mid( lineStart, lineEnd - lineStart ).stripWhiteSpace();
164 164
     if ( line.isEmpty() )
@@ -179,7 +179,7 @@ void Kleo::GnuPGProcessBase::parseStatusOutput() {
179 179
     TQString cmd;
180 180
     TQStringList args;
181 181
     int tagStart = 0;
182
-    for ( int tagEnd = command.tqfind( ' ' ) ; tagEnd >= 0 ; tagEnd = command.tqfind( ' ', tagStart = tagEnd+1 ) ) {
182
+    for ( int tagEnd = command.find( ' ' ) ; tagEnd >= 0 ; tagEnd = command.find( ' ', tagStart = tagEnd+1 ) ) {
183 183
       const TQCString tag = command.mid( tagStart, tagEnd - tagStart );
184 184
       if ( cmd.isNull() )
185 185
 	cmd = fromHexEscapedUtf8( tag );

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

@@ -131,7 +131,7 @@ Kleo::CryptoConfigComponent* QGpgMECryptoConfig::component( const TQString& name
131 131
 {
132 132
   if ( !mParsed )
133 133
     const_cast<QGpgMECryptoConfig*>( this )->runGpgConf( false );
134
-  return mComponents.tqfind( name );
134
+  return mComponents.find( name );
135 135
 }
136 136
 
137 137
 void QGpgMECryptoConfig::sync( bool runtime )
@@ -240,7 +240,7 @@ TQStringList QGpgMECryptoConfigComponent::groupList() const
240 240
 
241 241
 Kleo::CryptoConfigGroup* QGpgMECryptoConfigComponent::group(const TQString& name ) const
242 242
 {
243
-  return mGroups.tqfind( name );
243
+  return mGroups.find( name );
244 244
 }
245 245
 
246 246
 void QGpgMECryptoConfigComponent::sync( bool runtime )
@@ -341,7 +341,7 @@ TQStringList QGpgMECryptoConfigGroup::entryList() const
341 341
 
342 342
 Kleo::CryptoConfigEntry* QGpgMECryptoConfigGroup::entry( const TQString& name ) const
343 343
 {
344
-  return mEntries.tqfind( name );
344
+  return mEntries.find( name );
345 345
 }
346 346
 
347 347
 ////
@@ -357,15 +357,15 @@ static TQString gpgconf_escape( const TQString& str )
357 357
   // Escape special chars (including ':' and '%')
358 358
   TQString enc = KURL::encode_string( str, 106 ); // and convert to utf8 first (to get %12%34 for one special char)
359 359
   // Also encode commas, for lists.
360
-  enc.tqreplace( ',', "%2c" );
360
+  enc.replace( ',', "%2c" );
361 361
   return enc;
362 362
 }
363 363
 
364 364
 static TQString urlpart_encode( const TQString& str )
365 365
 {
366 366
   TQString enc( str );
367
-  enc.tqreplace( '%', "%25" ); // first!
368
-  enc.tqreplace( ':', "%3a" );
367
+  enc.replace( '%', "%25" ); // first!
368
+  enc.replace( ':', "%3a" );
369 369
   //kdDebug() << "  urlpart_encode: " << str << " -> " << enc << endl;
370 370
   return enc;
371 371
 }

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

@@ -468,9 +468,9 @@ TQString CryptPlugWrapper::libName() const
468 468
 
469 469
 TQString CryptPlugWrapper::protocol() const
470 470
 {
471
-  if ( _libName.tqcontains( "smime" ) )
471
+  if ( _libName.contains( "smime" ) )
472 472
     return "SMIME";
473
-  if ( _libName.tqcontains( "openpgp" ) )
473
+  if ( _libName.contains( "openpgp" ) )
474 474
     return "OpenPGP";
475 475
   return TQString();
476 476
 }
@@ -485,9 +485,9 @@ TQString CryptPlugWrapper::displayName() const
485 485
 {
486 486
     if ( !_name.isEmpty() )
487 487
       return _name;
488
-    if ( _libName.tqcontains( "smime" ) )
488
+    if ( _libName.contains( "smime" ) )
489 489
       return "gpgsm";
490
-    if ( _libName.tqcontains( "openpgp" ) )
490
+    if ( _libName.contains( "openpgp" ) )
491 491
       return "gpg";
492 492
     return i18n("(Unknown Protocol)");
493 493
 }
@@ -503,10 +503,10 @@ bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg
503 503
       _initqStatus = IniStatus_NoLibName;
504 504
       kdDebug(5150) << "No library name was given.\n" << endl;
505 505
     } else {
506
-      if ( _libName.tqcontains( "smime" ) ) {
506
+      if ( _libName.contains( "smime" ) ) {
507 507
 	_cp = new SMIMECryptPlug();
508 508
 	_config = new Config( GPGME_PROTOCOL_CMS );
509
-      } else if ( _libName.tqcontains( "openpgp" ) ) {
509
+      } else if ( _libName.contains( "openpgp" ) ) {
510 510
 	_cp = new OpenPGPCryptPlug();
511 511
 	_config = new Config( GPGME_PROTOCOL_OpenPGP );
512 512
       } else {

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

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

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

@@ -309,7 +309,7 @@ reorder_dn( const Kleo::DN::Attribute::List & dn ) {
309 309
 
310 310
   // find all unknown entries in their order of appearance
311 311
   for ( Kleo::DN::const_iterator it = dn.begin(); it != dn.end(); ++it )
312
-    if ( attrOrder.tqfind( (*it).name() ) == attrOrder.end() )
312
+    if ( attrOrder.find( (*it).name() ) == attrOrder.end() )
313 313
       unknownEntries.push_back( *it );
314 314
 
315 315
   // process the known attrs in the desired order

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

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

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

@@ -116,7 +116,7 @@ static int status( void * void_ctx, const char * line ) {
116 116
 static int inquire( void * void_ctx, const char * keyword ) {
117 117
     assuan_context_t ctx = (assuan_context_t)void_ctx;
118 118
     assert( ctx );
119
-    const std::map<std::string,std::string>::const_iterator it = inquireData.tqfind( keyword );
119
+    const std::map<std::string,std::string>::const_iterator it = inquireData.find( keyword );
120 120
     if ( it == inquireData.end() )
121 121
         return gpg_error( GPG_ERR_UNKNOWN_COMMAND );
122 122
 
@@ -179,7 +179,7 @@ int main( int argc, char * argv[] ) {
179 179
             options.push_back( argv[++optind] );
180 180
         } else if ( qstrcmp( arg, "--inquire" ) == 0 ) {
181 181
             const std::string inqval = argv[++optind];
182
-            const size_t pos = inqval.tqfind( '=' );
182
+            const size_t pos = inqval.find( '=' );
183 183
             // ### implement indirection with "@file"...
184 184
             inquireData[inqval.substr( 0, pos )] = inqval.substr( pos+1 );
185 185
         } else {

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

@@ -88,7 +88,7 @@ static TQStringList split( char * buffer, int buflen, TQString & old ) {
88 88
 }
89 89
 
90 90
 static TQString escape( TQString str ) {
91
-  return str.tqreplace( '&', "&amp" ).tqreplace( '<', "&lt;" ).tqreplace( '>', "&gt;" );
91
+  return str.replace( '&', "&amp" ).replace( '<', "&lt;" ).replace( '>', "&gt;" );
92 92
 }
93 93
 
94 94
 void GnuPGViewer::slotStdout( KProcess *, char * buffer, int buflen ) {

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

@@ -59,7 +59,7 @@ using namespace Kleo;
59 59
 
60 60
 static inline TQPixmap loadIcon( TQString s ) {
61 61
   return KGlobal::instance()->iconLoader()
62
-    ->loadIcon( s.tqreplace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium );
62
+    ->loadIcon( s.replace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium );
63 63
 }
64 64
 
65 65
 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() {
173 173
 
174 174
   const TQStringList all = Kleo::DNAttributeMapper::instance()->names();
175 175
   for ( TQStringList::const_iterator it = all.begin() ; it != all.end() ; ++it )
176
-    if ( order.tqfind( *it ) == order.end() )
176
+    if ( order.find( *it ) == order.end() )
177 177
       (void)new TQListViewItem( d->availableLV, *it, d->mapper->name2label( *it ) );
178 178
 
179 179
   if ( !d->placeHolderItem->listView() )

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

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

+ 2
- 2
indexlib/GPL_V2 View File

@@ -59,7 +59,7 @@ modification follow.
59 59
 		    GNU GENERAL PUBLIC LICENSE
60 60
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61 61
 
62
-  0. This License applies to any program or other work which tqcontains
62
+  0. This License applies to any program or other work which contains
63 63
 a notice placed by the copyright holder saying it may be distributed
64 64
 under the terms of this General Public License.  The "Program", below,
65 65
 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:
154 154
 
155 155
 The source code for a work means the preferred form of the work for
156 156
 making modifications to it.  For an executable work, complete source
157
-code means all the source code for all modules it tqcontains, plus any
157
+code means all the source code for all modules it contains, plus any
158 158
 associated interface definition files, plus the scripts used to
159 159
 control compilation and installation of the executable.  However, as a
160 160
 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 {
332 332
 // The same problem occurs with has_facet.
333 333
 // These macros provide a consistent way to access a locale's facets.
334 334
 // Usage:
335
-//    tqreplace
335
+//    replace
336 336
 //       std::use_facet<Type>(loc);
337 337
 //    with
338 338
 //       BOOST_USE_FACET(Type, loc);
@@ -357,7 +357,7 @@ namespace std {
357 357
 
358 358
 // BOOST_NESTED_TEMPLATE workaround ------------------------------------------//
359 359
 // Member templates are supported by some compilers even though they can't use
360
-// the A::template member<U> syntax, as a workaround tqreplace:
360
+// the A::template member<U> syntax, as a workaround replace:
361 361
 //
362 362
 // typedef typename A::template rebind<U> binder;
363 363
 //

+ 1
- 1
indexlib/stringset.h View File

@@ -129,7 +129,7 @@ struct stringset {
129 129
 		void clear();
130 130
 
131 131
 		/**
132
-		 * Returns std::make_pair( tqfind( word ), tqfind( word + 'Z' ) ) which makes it easy
132
+		 * Returns std::make_pair( find( word ), find( word + 'Z' ) ) which makes it easy
133 133
 		 * to implement word* searches
134 134
 		 */
135 135
 		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 )
139 139
   TQStringList customs = a.customs();
140 140
   TQStringList::ConstIterator it5;
141 141
   for( it5 = customs.begin(); it5 != customs.end(); ++it5 ) {
142
-    int posDash = (*it5).tqfind( "-" );
143
-    int posColon = (*it5).tqfind( ":" );
142
+    int posDash = (*it5).find( "-" );
143
+    int posColon = (*it5).find( ":" );
144 144
   
145 145
     TQString app = (*it5).left( posDash );
146 146
     TQString cname = (*it5).mid( posDash + 1, posColon - posDash - 1 );
@@ -583,8 +583,8 @@ void MainWindow::editCustom()
583 583
                                         this );
584 584
   if ( !ok || name.isEmpty() ) return;
585 585
 
586
-  int posDash = name.tqfind( "-" );
587
-  int posColon = name.tqfind( ":" );
586
+  int posDash = name.find( "-" );
587
+  int posColon = name.find( ":" );
588 588
   
589 589
   TQString app = name.left( posDash );
590 590
   TQString cname = name.mid( posDash + 1, posColon - posDash - 1 );
@@ -610,8 +610,8 @@ void MainWindow::newCustom()
610 610
                                         this );
611 611
   if ( !ok || name.isEmpty() ) return;
612 612
   
613
-  int posDash = name.tqfind( "-" );
614
-  int posColon = name.tqfind( ":" );
613
+  int posDash = name.find( "-" );
614
+  int posColon = name.find( ":" );
615 615
   
616 616
   TQString app = name.left( posDash );
617 617
   TQString cname = name.mid( posDash + 1, posColon - posDash - 1 );

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

@@ -53,8 +53,8 @@ void KABC2Mutt::loadingFinished()
53 53
   for ( iaddr = mAddressBook->begin(); iaddr != mAddressBook->end(); ++iaddr ) {
54 54
     const TQString name = (*iaddr).givenName() + ' ' + (*iaddr).familyName();
55 55
     if ( !mQuery.isEmpty() ) {
56
-      bool match = (name.tqfind(mQuery, 0, mIgnoreCase) > -1) ||
57
-                   ((*iaddr).preferredEmail().tqfind( mQuery, 0, mIgnoreCase ) > -1 );
56
+      bool match = (name.find(mQuery, 0, mIgnoreCase) > -1) ||
57
+                   ((*iaddr).preferredEmail().find( mQuery, 0, mIgnoreCase ) > -1 );
58 58
       if ( !match )
59 59
         continue;
60 60
     }
@@ -86,9 +86,9 @@ void KABC2Mutt::loadingFinished()
86 86
       else
87 87
         if ( !(*iaddr).familyName().isEmpty() )
88 88
           key = (*iaddr).givenName().left( 1 ).lower() +
89
-                (*iaddr).familyName().lower().tqreplace( space, underscore );
89
+                (*iaddr).familyName().lower().replace( space, underscore );
90 90
         else
91
-          key = (*iaddr).givenName().lower().tqreplace( space, underscore );
91
+          key = (*iaddr).givenName().lower().replace( space, underscore );
92 92
 
93 93
       while ( from != to ) {
94 94
         std::cout << "alias " << key;
@@ -101,7 +101,7 @@ void KABC2Mutt::loadingFinished()
101 101
 
102 102
       if ( !(*iaddr).nickName().isEmpty() ) {
103 103
         std::cout << "alias "
104
-                  << (*iaddr).nickName().lower().tqreplace( space, underscore )
104
+                  << (*iaddr).nickName().lower().replace( space, underscore )
105 105
                   << '\t' << name << " <"
106 106
                   << (*iaddr).preferredEmail() << '>' << std::endl;
107 107
       }
@@ -130,7 +130,7 @@ void KABC2Mutt::loadingFinished()
130 130
     KABC::DistributionList *list = manager.list( *iaddr );
131 131
     if ( list ) {
132 132
       if ( !mQuery.isEmpty() ) {
133
-        bool match = ((*iaddr).tqfind(mQuery) > -1);
133
+        bool match = ((*iaddr).find(mQuery) > -1);
134 134
         if ( !match )
135 135
           continue;
136 136
       }
@@ -140,7 +140,7 @@ void KABC2Mutt::loadingFinished()
140 140
         continue;
141 141
 
142 142
       if ( mFormat == Aliases ) {
143
-        std::cout << "alias " << (*iaddr).tqreplace( TQRegExp( " " ), "_" )
143
+        std::cout << "alias " << (*iaddr).replace( TQRegExp( " " ), "_" )
144 144
                   << '\t' << emails.join( "," ) << std::endl;
145 145
       } else {
146 146
         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 )
617 617
     new TQCheckBox( KABC::Address::typeLabel( *it ), mGroup );
618 618
 
619 619
   for ( int i = 0; i < mGroup->count(); ++i ) {
620
-    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
620
+    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
621 621
     box->setChecked( type & mTypeList[ i ] );
622 622
   }
623 623
 }
@@ -630,7 +630,7 @@ int AddressTypeDialog::type() const
630 630
 {
631 631
   int type = 0;
632 632
   for ( int i = 0; i < mGroup->count(); ++i ) {
633
-    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
633
+    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
634 634
     if ( box->isChecked() )
635 635
       type += mTypeList[ i ];
636 636
   }

+ 1
- 1
kaddressbook/addresseeeditorwidget.cpp View File

@@ -486,7 +486,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs()
486 486
 
487 487
   const TQStringList list = KGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true );
488 488
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
489
-    if ( activePages.tqfind( (*it).mid( (*it).tqfindRev('/') + 1 ) ) == activePages.end() )
489
+    if ( activePages.find( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() )
490 490
       continue;
491 491
 
492 492
     ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget );

+ 1
- 1
kaddressbook/addviewdialog.cpp View File

@@ -94,7 +94,7 @@ TQString AddViewDialog::viewName()const
94 94
 TQString AddViewDialog::viewType()const
95 95
 {
96 96
   // we missuse the name property for storing the type
97
-  return mTypeGroup->tqfind( mTypeId )->name();
97
+  return mTypeGroup->find( mTypeId )->name();
98 98
 }
99 99
 
100 100
 void AddViewDialog::clicked( int id )

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

@@ -79,17 +79,17 @@ TQString LocationMap::createUrl( const KABC::Address &addr )
79 79
   }
80 80
 
81 81
 #if KDE_VERSION >= 319
82
-  return urlTemplate.tqreplace( "%s", addr.street() ).
83
-                     tqreplace( "%r", addr.region() ).
84
-                     tqreplace( "%l", addr.locality() ).
85
-                     tqreplace( "%z", addr.postalCode() ).
86
-                     tqreplace( "%c", addr.countryToISO( addr.country() ) );
82
+  return urlTemplate.replace( "%s", addr.street() ).
83
+                     replace( "%r", addr.region() ).
84
+                     replace( "%l", addr.locality() ).
85
+                     replace( "%z", addr.postalCode() ).
86
+                     replace( "%c", addr.countryToISO( addr.country() ) );
87 87
 #else
88
-  return urlTemplate.tqreplace( "%s", addr.street() ).
89
-                     tqreplace( "%r", addr.region() ).
90
-                     tqreplace( "%l", addr.locality() ).
91
-                     tqreplace( "%z", addr.postalCode() ).
92
-                     tqreplace( "%c", "" );
88
+  return urlTemplate.replace( "%s", addr.street() ).
89
+                     replace( "%r", addr.region() ).
90
+                     replace( "%l", addr.locality() ).
91
+                     replace( "%z", addr.postalCode() ).
92
+                     replace( "%c", "" );
93 93
 #endif
94 94
 }
95 95
 

+ 3
- 3
kaddressbook/customfieldswidget.cpp View File

@@ -103,7 +103,7 @@ TQString AddFieldDialog::title() const
103 103
 TQString AddFieldDialog::identifier() const
104 104
 {
105 105
   TQString id = mTitle->text().lower();
106
-  return id.tqreplace( ",", "_" ).tqreplace( " ", "_" );
106
+  return id.replace( ",", "_" ).replace( " ", "_" );
107 107
 }
108 108
 
109 109
 TQString AddFieldDialog::type() const
@@ -547,12 +547,12 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const
547 547
 
548 548
 void splitField( const TQString &str, TQString &app, TQString &name, TQString &value )
549 549
 {
550
-  int colon = str.tqfind( ':' );
550
+  int colon = str.find( ':' );
551 551
   if ( colon != -1 ) {
552 552
     TQString tmp = str.left( colon );
553 553
     value = str.mid( colon + 1 );
554 554
 
555
-    int dash = tmp.tqfind( '-' );
555
+    int dash = tmp.find( '-' );
556 556
     if ( dash != -1 ) {
557 557
       app = tmp.left( dash );
558 558
       name = tmp.mid( dash + 1 );

+ 2
- 2
kaddressbook/distributionlistpicker.cpp View File

@@ -97,7 +97,7 @@ void KPIM::DistributionListPickerDialog::slotUser1()
97 97
         if ( name.isEmpty() )
98 98
             return;
99 99
 
100
-        validName = !listNames.tqcontains( name );
100
+        validName = !listNames.contains( name );
101 101
 
102 102
         if ( validName )
103 103
         {
@@ -107,7 +107,7 @@ void KPIM::DistributionListPickerDialog::slotUser1()
107 107
             m_book->insertAddressee( list );
108 108
 
109 109
             m_listBox->insertItem( name );
110
-            TQListBoxItem* item = m_listBox->tqfindItem( name );
110
+            TQListBoxItem* item = m_listBox->findItem( name );
111 111
             m_listBox->setSelected( item, true );
112 112
         }
113 113
         else

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

@@ -50,7 +50,7 @@ IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *>
50 50
 
51 51
   mProtocols = protocols;
52 52
   populateProtocols();
53
-  cmbProtocol->setCurrentItem( mProtocols.tqfindIndex( protocol ) );
53
+  cmbProtocol->setCurrentItem( mProtocols.findIndex( protocol ) );
54 54
 
55 55
   edtAddress->setText( address.section( TQChar( 0xE120 ), 0, 0 ) );
56 56
   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,
166 166
   //mWidget->btnUp->setEnabled( false );
167 167
   //mWidget->btnDown->setEnabled( false );
168 168
   mPreferred = preferredIM;
169
-  mPreferred = mPreferred.tqreplace( " on ", TQString( TQChar( 0xE120 ) ), true );
169
+  mPreferred = mPreferred.replace( " on ", TQString( TQChar( 0xE120 ) ), true );
170 170
   mProtocols = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KABC/IMProtocol" ) ) );
171 171
 
172 172
   // 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()
351 351
       mPreferred = addressWid->address();
352 352
     }
353 353
 
354
-    if ( mChangedProtocols.tqfind( addressWid->protocol() ) == mChangedProtocols.end() )
354
+    if ( mChangedProtocols.find( addressWid->protocol() ) == mChangedProtocols.end() )
355 355
       mChangedProtocols.append( addressWid->protocol() );
356 356
 
357 357
     mWidget->lvAddresses->sort();
@@ -388,7 +388,7 @@ void IMEditorWidget::slotEdit()
388 388
       }
389 389
 
390 390
       // the entry for the protocol of the current address has changed
391
-      if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() ) {
391
+      if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() ) {
392 392
         mChangedProtocols.append( current->protocol() );
393 393
       }
394 394
       // update protocol - has another protocol gained an address?
@@ -396,7 +396,7 @@ void IMEditorWidget::slotEdit()
396 396
         modified = true;
397 397
         // this proto is losing an entry
398 398
         current->setProtocol( addressWid->protocol() );
399
-        if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() )
399
+        if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() )
400 400
           mChangedProtocols.append( current->protocol() );
401 401
       }
402 402
 
@@ -431,7 +431,7 @@ void IMEditorWidget::slotDelete()
431 431
   while( it.current() ) {
432 432
     if ( it.current()->isSelected() ) {
433 433
       IMAddressLVI * current = static_cast<IMAddressLVI*>( *it );
434
-      if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() )
434
+      if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() )
435 435
         mChangedProtocols.append( current->protocol() );
436 436
 
437 437
       if ( current->preferred() )
@@ -457,7 +457,7 @@ void IMEditorWidget::slotDelete()
457 457
 TQString IMEditorWidget::preferred() const
458 458
 {
459 459
   TQString retval( mPreferred );
460
-  return retval.tqreplace( TQChar( 0xE120 ), " on " );
460
+  return retval.replace( TQChar( 0xE120 ), " on " );
461 461
 }
462 462
 
463 463
 
@@ -477,12 +477,12 @@ KPluginInfo * IMEditorWidget::protocolFromString( const TQString &fieldValue ) c
477 477
 
478 478
 void IMEditorWidget::splitField( const TQString &str, TQString &app, TQString &name, TQString &value )
479 479
 {
480
-  int colon = str.tqfind( ':' );
480
+  int colon = str.find( ':' );
481 481
   if ( colon != -1 ) {
482 482
     TQString tmp = str.left( colon );
483 483
     value = str.mid( colon + 1 );
484 484
 
485
-    int dash = tmp.tqfind( '-' );
485
+    int dash = tmp.find( '-' );
486 486
     if ( dash != -1 ) {
487 487
       app = tmp.left( dash );
488 488
       name = tmp.mid( dash + 1 );

+ 7
- 7
kaddressbook/extensionmanager.cpp View File

@@ -74,7 +74,7 @@ void ExtensionManager::restoreSettings()
74 74
 
75 75
   typedef TQMap<TQString, ExtensionData>::ConstIterator ConstIterator;
76 76
   for ( ConstIterator it = mExtensionMap.begin(), end = mExtensionMap.end(); it != end; ++it ) {
77
-    if ( activeExtensions.tqcontains( it.data().identifier ) ) {
77
+    if ( activeExtensions.contains( it.data().identifier ) ) {
78 78
       KToggleAction *action = static_cast<KToggleAction*>( it.data().action );
79 79
       if ( action )
80 80
         action->setChecked( true );
@@ -102,20 +102,20 @@ void ExtensionManager::reconfigure()
102 102
 
103 103
 bool ExtensionManager::isQuickEditVisible() const
104 104
 {
105
-  return mActiveExtensions.tqcontains( "contact_editor" );
105
+  return mActiveExtensions.contains( "contact_editor" );
106 106
 }
107 107
 
108 108
 void ExtensionManager::setSelectionChanged()
109 109
 {
110 110
   for ( TQStringList::ConstIterator it = mActiveExtensions.begin(), end = mActiveExtensions.end(); it != end; ++it ) {
111
-    if ( mExtensionMap.tqcontains( *it ) && mExtensionMap[*it].widget )
111
+    if ( mExtensionMap.contains( *it ) && mExtensionMap[*it].widget )
112 112
       mExtensionMap[*it].widget->contactsSelectionChanged();
113 113
   }
114 114
 }
115 115
 
116 116
 void ExtensionManager::activationToggled( const TQString &extid )
117 117
 {
118
-  if ( !mExtensionMap.tqcontains( extid ) )
118
+  if ( !mExtensionMap.contains( extid ) )
119 119
     return;
120 120
   const ExtensionData data = mExtensionMap[ extid ];
121 121
   const bool activated = data.action->isChecked();
@@ -124,9 +124,9 @@ void ExtensionManager::activationToggled( const TQString &extid )
124 124
 
125 125
 void ExtensionManager::setExtensionActive( const TQString& extid, bool active )
126 126
 {
127
-  if ( !mExtensionMap.tqcontains( extid ) )
127
+  if ( !mExtensionMap.contains( extid ) )
128 128
     return;
129
-  if ( mActiveExtensions.tqcontains( extid ) == active )
129
+  if ( mActiveExtensions.contains( extid ) == active )
130 130
     return;
131 131
   const ExtensionData data = mExtensionMap[ extid ];
132 132
   if ( active ) {
@@ -174,7 +174,7 @@ void ExtensionManager::createActions()
174 174
     mMapper->setMapping( data.action, data.identifier );
175 175
     mActionList.append( data.action );
176 176
 
177
-    if ( mActiveExtensions.tqcontains( data.identifier ) )
177
+    if ( mActiveExtensions.contains( data.identifier ) )
178 178
       data.action->setChecked( true );
179 179
   }
180 180
 

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

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

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

@@ -241,7 +241,7 @@ void ResourceSelection::add()
241 241
   if ( !ok )
242 242
     return;
243 243
 
244
-  TQString type = types[ descs.tqfindIndex( desc ) ];
244
+  TQString type = types[ descs.findIndex( desc ) ];
245 245
 
246 246
   // Create new resource
247 247
   KABC::Resource *resource = mManager->createResource( type );
@@ -410,7 +410,7 @@ void ResourceSelection::slotSubresourceAdded( KPIM::ResourceABC *resource,
410 410
                                               const TQString& subResource )
411 411
 {
412 412
   kdDebug(5720) << k_funcinfo << resource->resourceName() << " " << subResource << endl;
413
-  TQListViewItem *i = mListView->tqfindItem( resource->resourceName(), 0 );
413
+  TQListViewItem *i = mListView->findItem( resource->resourceName(), 0 );
414 414
   if ( !i )
415 415
     // Not found
416 416
     return;

+ 2
- 2
kaddressbook/filtereditdialog.cpp View File

@@ -71,7 +71,7 @@ void FilterEditDialog::setFilter( const Filter &filter )
71 71
   TQStringList categories = filter.categories();
72 72
   TQListViewItem *item = mCategoriesView->firstChild();
73 73
   while ( item != 0 ) {
74
-    if ( categories.tqcontains( item->text( 0 ) ) ) {
74
+    if ( categories.contains( item->text( 0 ) ) ) {
75 75
       TQCheckListItem *checkItem = static_cast<TQCheckListItem*>( item );
76 76
       checkItem->setOn( true );
77 77
     }
@@ -102,7 +102,7 @@ Filter FilterEditDialog::filter()
102 102
   }
103 103
   filter.setCategories( categories );
104 104
 
105
-  if ( mMatchRuleGroup->tqfind( 0 )->isOn() )
105
+  if ( mMatchRuleGroup->find( 0 )->isOn() )
106 106
     filter.setMatchRule( Filter::Matching );
107 107
   else
108 108
     filter.setMatchRule( Filter::NotMatching );

+ 3
- 3
kaddressbook/geowidget.cpp View File

@@ -404,13 +404,13 @@ void GeoDialog::loadCityList()
404 404
       pos = name.search(line, pos);
405 405
       if ( pos > 0 ) {
406 406
         n = line.mid( pos, name.matchedLength() ).stripWhiteSpace();
407
-        n.tqreplace( '_', " " );
407
+        n.replace( '_', " " );
408 408
       }
409 409
 
410 410
       if ( !c.isEmpty() && !n.isEmpty() ) {
411
-        pos = c.tqfind( "+", 1 );
411
+        pos = c.find( "+", 1 );
412 412
         if ( pos < 0 )
413
-          pos = c.tqfind( "-", 1 );
413
+          pos = c.find( "-", 1 );
414 414
         if ( pos > 0 ) {
415 415
           GeoData data;
416 416
           data.latitude = calculateCoordinate( c.left( pos ) );

+ 1
- 1
kaddressbook/jumpbuttonbar.cpp View File

@@ -121,7 +121,7 @@ void JumpButtonBar::updateButtons()
121 121
       return;
122 122
     }
123 123
 
124
-    if ( !character.isEmpty() && !characters.tqcontains( character ) )
124
+    if ( !character.isEmpty() && !characters.contains( character ) )
125 125
       characters.append( character );
126 126
   }
127 127
 

+ 7
- 7
kaddressbook/kabcore.cpp View File

@@ -778,7 +778,7 @@ void KABCore::addEmail( const TQString &aStr )
778 778
   const KABC::AddressBook::Iterator endIt( mAddressBook->end() );
779 779
   for ( it = mAddressBook->begin(); !found && (it != endIt); ++it ) {
780 780
     emailList = (*it).emails();
781
-    if ( emailList.tqcontains( email ) > 0 ) {
781
+    if ( emailList.contains( email ) > 0 ) {
782 782
       found = true;
783 783
       (*it).setNameFromString( fullName );
784 784
       editContact( (*it).uid() );
@@ -831,7 +831,7 @@ void KABCore::editContact( const TQString &uid )
831 831
 
832 832
   KABC::Addressee addr = mAddressBook->findByUid( localUID );
833 833
   if ( !addr.isEmpty() ) {
834
-    AddresseeEditorDialog *dialog = mEditorDict.tqfind( addr.uid() );
834
+    AddresseeEditorDialog *dialog = mEditorDict.find( addr.uid() );
835 835
     if ( !dialog ) {
836 836
 
837 837
       if ( !addr.resource()->readOnly() )
@@ -1005,7 +1005,7 @@ TQString KABCore::getNameByPhone( const TQString &phone )
1005 1005
     const KABC::PhoneNumber::List::Iterator phoneEndIter( phoneList.end() );
1006 1006
     for ( ; !found && ( phoneIter != phoneEndIter ); ++phoneIter) {
1007 1007
       // Get rid of separator chars so just the numbers are compared.
1008
-      if ( (*phoneIter).number().tqreplace( r, "" ) == localPhone.tqreplace( r, "" ) ) {
1008
+      if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
1009 1009
         ownerName = (*iter).realName();
1010 1010
         found = true;
1011 1011
       }
@@ -1406,7 +1406,7 @@ void KABCore::initActions()
1406 1406
   action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) );
1407 1407
 
1408 1408
   // misc
1409
-  action = new KAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "tqfind", 0,
1409
+  action = new KAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "find", 0,
1410 1410
                         this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" );
1411 1411
   action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) );
1412 1412
 
@@ -1449,7 +1449,7 @@ void KABCore::updateCategories()
1449 1449
   TQStringList::ConstIterator it;
1450 1450
   const TQStringList::ConstIterator endIt( customCategories.end() );
1451 1451
   for ( it = customCategories.begin(); it != endIt; ++it ) {
1452
-    if ( categories.tqfind( *it ) == categories.end() ) {
1452
+    if ( categories.find( *it ) == categories.end() ) {
1453 1453
       categories.append( *it );
1454 1454
     }
1455 1455
   }
@@ -1477,7 +1477,7 @@ TQStringList KABCore::allCategories() const
1477 1477
     categories = (*it).categories();
1478 1478
     const TQStringList::ConstIterator catEndIt( categories.end() );
1479 1479
     for ( catIt = categories.begin(); catIt != catEndIt; ++catIt ) {
1480
-      if ( !allCategories.tqcontains( *catIt ) )
1480
+      if ( !allCategories.contains( *catIt ) )
1481 1481
         allCategories.append( *catIt );
1482 1482
 	}
1483 1483
   }
@@ -1519,7 +1519,7 @@ void KABCore::categoriesSelected( const TQStringList &categories )
1519 1519
         TQStringList::ConstIterator catIt;
1520 1520
         const TQStringList::ConstIterator catEndIt( categories.end() );
1521 1521
         for ( catIt = categories.begin(); catIt != catEndIt; ++catIt ) {
1522
-          if ( !addrCategories.tqcontains( *catIt ) )
1522
+          if ( !addrCategories.contains( *catIt ) )
1523 1523
             addrCategories.append( *catIt );
1524 1524
         }
1525 1525
         addr.setCategories( addrCategories );

+ 2
- 2
kaddressbook/kablock.cpp View File

@@ -65,7 +65,7 @@ KABLock *KABLock::self( KABC::AddressBook *ab )
65 65
 
66 66
 bool KABLock::lock( KABC::Resource *resource )
67 67
 {
68
-  if ( mLocks.tqfind( resource ) == mLocks.end() ) { // not locked yet
68
+  if ( mLocks.find( resource ) == mLocks.end() ) { // not locked yet
69 69
     KABC::Ticket *ticket = mAddressBook->requestSaveTicket( resource );
70 70
     if ( !ticket ) {
71 71
       return false;
@@ -89,7 +89,7 @@ bool KABLock::unlock( KABC::Resource *resource )
89 89
   if ( resource == 0 )
90 90
     resource = wrapper->getStandardResource();
91 91
 
92
-  if ( mLocks.tqfind( resource ) == mLocks.end() ) { // hmm, not good...
92
+  if ( mLocks.find( resource ) == mLocks.end() ) { // hmm, not good...
93 93
     return false;
94 94
   } else {
95 95
     LockEntry &entry = mLocks[ resource ];

+ 8
- 8
kaddressbook/kabtools.cpp View File

@@ -39,12 +39,12 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList &
39 39
   uint number = 0;
40 40
   do {
41 41
     name = addressee.givenName() + "_" + addressee.familyName() + uniquePart + ".vcf";
42
-    name.tqreplace( ' ', '_' );
43
-    name.tqreplace( '/', '_' );
42
+    name.replace( ' ', '_' );
43
+    name.replace( '/', '_' );
44 44
 
45 45
     ++number;
46 46
     uniquePart = TQString( "_%1" ).tqarg( number );
47
-  } while ( existingFiles.tqcontains( name ) );
47
+  } while ( existingFiles.contains( name ) );
48 48
 
49 49
   existingFiles.append( name );
50 50
 
@@ -141,7 +141,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
141 141
     KABC::Address::List::ConstIterator addrIt( addresses.begin() );
142 142
     const KABC::Address::List::ConstIterator addrEndIt( addresses.end() );
143 143
     for ( ; addrIt != addrEndIt; ++addrIt ) {
144
-      if ( !masterAddresses.tqcontains( *addrIt ) )
144
+      if ( !masterAddresses.contains( *addrIt ) )
145 145
         masterAddressee.insertAddress( *addrIt );
146 146
     }
147 147
 
@@ -156,7 +156,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
156 156
     TQStringList::ConstIterator it( categories.begin() );
157 157
     TQStringList::ConstIterator endIt( categories.end() );
158 158
     for ( it = categories.begin(); it != endIt; ++it )
159
-      if ( !masterCategories.tqcontains( *it ) )
159
+      if ( !masterCategories.contains( *it ) )
160 160
         newCategories.append( *it );
161 161
     masterAddressee.setCategories( newCategories );
162 162
 
@@ -169,7 +169,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
169 169
     const TQStringList masterEmails = masterAddressee.emails();
170 170
     endIt = emails.end();
171 171
     for ( it = emails.begin(); it != endIt; ++it )
172
-      if ( !masterEmails.tqcontains( *it ) )
172
+      if ( !masterEmails.contains( *it ) )
173 173
         masterAddressee.insertEmail( *it, false );
174 174
 
175 175
     // FN
@@ -239,7 +239,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
239 239
     KABC::PhoneNumber::List::ConstIterator phoneIt( phones.begin() );
240 240
     const KABC::PhoneNumber::List::ConstIterator phoneEndIt( phones.end() );
241 241
     for ( ; phoneIt != phoneEndIt; ++phoneIt )
242
-      if ( !masterPhones.tqcontains( *phoneIt ) )
242
+      if ( !masterPhones.contains( *phoneIt ) )
243 243
         masterAddressee.insertPhoneNumber( *phoneIt );
244 244
 
245 245
     // TITLE
@@ -262,7 +262,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list )
262 262
     TQStringList newCustoms( masterCustoms );
263 263
     endIt = customs.end();
264 264
     for ( it = customs.begin(); it != endIt; ++it )
265
-      if ( !masterCustoms.tqcontains( *it ) )
265
+      if ( !masterCustoms.contains( *it ) )
266 266
         newCustoms.append( *it );
267 267
     masterAddressee.setCustoms( newCustoms );
268 268
   }

+ 1
- 1
kaddressbook/kcmconfigs/kabldapconfig.desktop View File

@@ -1,5 +1,5 @@
1 1
 [Desktop Entry]
2
-Icon=tqfind
2
+Icon=find
3 3
 Type=Service
4 4
 ServiceTypes=KCModule
5 5
 DocPath=kaddressbook/preferences.html#preferences-ldap-lookup

+ 2
- 2
kaddressbook/keywidget.cpp View File

@@ -98,7 +98,7 @@ void KeyWidget::addKey()
98 98
   KABC::Key::TypeList::ConstIterator it;
99 99
   for ( it = typeList.begin(); it != typeList.end(); ++it ) {
100 100
     if ( (*it) != KABC::Key::Custom &&
101
-         !existingKeyTypes.tqcontains( KABC::Key::typeLabel( *it ) ) ) {
101
+         !existingKeyTypes.contains( KABC::Key::typeLabel( *it ) ) ) {
102 102
       keyMap.insert( KABC::Key::typeLabel( *it ), *it );
103 103
       keyTypeNames.append( KABC::Key::typeLabel( *it ) );
104 104
     }
@@ -110,7 +110,7 @@ void KeyWidget::addKey()
110 110
     return;
111 111
 
112 112
   int type = keyMap[ name ];
113
-  if ( !keyTypeNames.tqcontains( name ) )
113
+  if ( !keyTypeNames.contains( name ) )
114 114
     type = KABC::Key::Custom;
115 115
 
116 116
   KURL url = KFileDialog::getOpenURL();

+ 5
- 5
kaddressbook/phoneeditwidget.cpp View File

@@ -68,7 +68,7 @@ PhoneTypeCombo::~PhoneTypeCombo()
68 68
 
69 69
 void PhoneTypeCombo::setType( int type )
70 70
 {
71
-  if ( !mTypeList.tqcontains( type ) )
71
+  if ( !mTypeList.contains( type ) )
72 72
     mTypeList.insert( mTypeList.at( mTypeList.count() - 1 ), type );
73 73
 
74 74
   mType = type;
@@ -97,7 +97,7 @@ void PhoneTypeCombo::update()
97 97
     }
98 98
   }
99 99
 
100
-  setCurrentItem( mLastSelected = mTypeList.tqfindIndex( mType ) );
100
+  setCurrentItem( mLastSelected = mTypeList.findIndex( mType ) );
101 101
 
102 102
   blockSignals( blocked );
103 103
 }
@@ -117,7 +117,7 @@ void PhoneTypeCombo::otherSelected()
117 117
   PhoneTypeDialog dlg( mType, this );
118 118
   if ( dlg.exec() ) {
119 119
     mType = dlg.type();
120
-    if ( !mTypeList.tqcontains( mType ) )
120
+    if ( !mTypeList.contains( mType ) )
121 121
       mTypeList.insert( mTypeList.at( mTypeList.count() - 1 ), mType );
122 122
   } else {
123 123
     setType( mTypeList[ mLastSelected ] );
@@ -315,7 +315,7 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *tqparent )
315 315
     new TQCheckBox( KABC::PhoneNumber::typeLabel( *it ), mGroup );
316 316
 
317 317
   for ( int i = 0; i < mGroup->count(); ++i ) {
318
-    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
318
+    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
319 319
     box->setChecked( mType & mTypeList[ i ] );
320 320
   }
321 321
 
@@ -327,7 +327,7 @@ int PhoneTypeDialog::type() const
327 327
   int type = 0;
328 328
 
329 329
   for ( int i = 0; i < mGroup->count(); ++i ) {
330
-    TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i );
330
+    TQCheckBox *box = (TQCheckBox*)mGroup->find( i );
331 331
     if ( box->isChecked() )
332 332
       type += mTypeList[ i ];
333 333
   }

+ 2
- 2
kaddressbook/printing/kabentrypainter.cpp View File

@@ -139,7 +139,7 @@ int KABEntryPainter::hits( const TQRectList& list, const TQPoint &p )
139 139
   int count = 0;
140 140
 
141 141
   for ( pos = list.begin(); pos != list.end(); ++pos ) {
142
-    if ( (*pos).tqcontains( p ) )
142
+    if ( (*pos).contains( p ) )
143 143
       return count;
144 144
 
145 145
     ++count;
@@ -241,7 +241,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr,
241 241
   if ( !( addr.prefix().isEmpty() ) )
242 242
     y += fmBody.lineSpacing() / 2;
243 243
 
244
-  // fill the parts stringlist, it tqcontains "parts" (printable areas)
244
+  // fill the parts stringlist, it contains "parts" (printable areas)
245 245
   // that will be combined to fill the page as effectively as possible:
246 246
   // Email addresses:
247 247
   if ( !addr.emails().isEmpty() && mShowEmails ) {

+ 2
- 2
kaddressbook/printing/mikesstyle.cpp View File

@@ -226,14 +226,14 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr,
226 226
 
227 227
   // Determine which half of the fields is higher
228 228
   for ( int i = 0; i < numFields / 2; i++ )
229
-    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1);
229
+    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1);
230 230
 
231 231
   height = halfHeight;
232 232
 
233 233
   // now the second half
234 234
   halfHeight = 0;
235 235
   for ( int i = numFields / 2; i < numFields; i++ )
236
-    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1);
236
+    halfHeight += fm.height() * (fieldList[ i ]->value( addr ).contains( '\n' ) + 1);
237 237
 
238 238
   height = TQMAX( height, halfHeight );
239 239
 

+ 1
- 1
kaddressbook/printing/printingwizard.cpp View File

@@ -186,7 +186,7 @@ void PrintingWizard::print()
186 186
         const TQStringList tmp( (*it).categories() );
187 187
         TQStringList::ConstIterator tmpIt;
188 188
         for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt )
189
-          if ( categories.tqcontains( *tmpIt ) ) {
189
+          if ( categories.contains( *tmpIt ) ) {
190 190
             list.append( *it );
191