Browse Source

Remove additional unneeded tq method conversions

Timothy Pearson 7 years ago
parent
commit
716a5de887
100 changed files with 429 additions and 429 deletions
  1. 1
    1
      NewsLog.txt
  2. 2
    2
      akregator/src/addfeeddialog.cpp
  3. 16
    16
      akregator/src/akregator_part.cpp
  4. 16
    16
      akregator/src/akregator_view.cpp
  5. 1
    1
      akregator/src/akregator_view.h
  6. 7
    7
      akregator/src/article.cpp
  7. 1
    1
      akregator/src/article.h
  8. 2
    2
      akregator/src/articlefilter.cpp
  9. 1
    1
      akregator/src/articlefilter.h
  10. 61
    61
      akregator/src/articleviewer.cpp
  11. 6
    6
      akregator/src/feed.cpp
  12. 6
    6
      akregator/src/feedlist.cpp
  13. 8
    8
      akregator/src/feedlistview.cpp
  14. 1
    1
      akregator/src/feedlistview.h
  15. 1
    1
      akregator/src/feedstorage.h
  16. 2
    2
      akregator/src/feedstoragedummyimpl.cpp
  17. 1
    1
      akregator/src/feedstoragedummyimpl.h
  18. 33
    33
      akregator/src/folder.cpp
  19. 9
    9
      akregator/src/folder.h
  20. 5
    5
      akregator/src/frame.cpp
  21. 1
    1
      akregator/src/frame.h
  22. 3
    3
      akregator/src/kcursorsaver.h
  23. 1
    1
      akregator/src/librss/tools_p.cpp
  24. 1
    1
      akregator/src/listtabwidget.cpp
  25. 2
    2
      akregator/src/mk4storage/feedstoragemk4impl.cpp
  26. 1
    1
      akregator/src/mk4storage/feedstoragemk4impl.h
  27. 3
    3
      akregator/src/mk4storage/metakit/CHANGES
  28. 1
    1
      akregator/src/mk4storage/metakit/README
  29. 1
    1
      akregator/src/mk4storage/metakit/src/column.h
  30. 2
    2
      akregator/src/nodelist.cpp
  31. 3
    3
      akregator/src/notificationmanager.cpp
  32. 8
    8
      akregator/src/pluginmanager.cpp
  33. 3
    3
      akregator/src/progressmanager.cpp
  34. 1
    1
      akregator/src/propertiesdialog.cpp
  35. 2
    2
      akregator/src/simplenodeselector.cpp
  36. 1
    1
      akregator/src/tagnode.cpp
  37. 6
    6
      akregator/src/treenode.cpp
  38. 6
    6
      certmanager/certificateinfowidgetimpl.cpp
  39. 4
    4
      certmanager/certificatewizard.ui
  40. 7
    7
      certmanager/certificatewizardimpl.cpp
  41. 29
    29
      certmanager/certmanager.cpp
  42. 1
    1
      certmanager/certmanager.h
  43. 11
    11
      certmanager/conf/appearanceconfigwidget.cpp
  44. 6
    6
      certmanager/conf/configuredialog.cpp
  45. 2
    2
      certmanager/conf/dirservconfigpage.cpp
  46. 1
    1
      certmanager/hierarchyanalyser.cpp
  47. 5
    5
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  48. 4
    4
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  49. 2
    2
      certmanager/lib/backends/chiasmus/chiasmusjob.cpp
  50. 2
    2
      certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
  51. 1
    1
      certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
  52. 14
    14
      certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
  53. 3
    3
      certmanager/lib/backends/qgpgme/gnupgprocessbase.h
  54. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
  55. 4
    4
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  56. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmejob.cpp
  57. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
  58. 2
    2
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  59. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
  60. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
  61. 1
    1
      certmanager/lib/cryptplugwrapper.cpp
  62. 1
    1
      certmanager/lib/kleo/cryptobackendfactory.cpp
  63. 1
    1
      certmanager/lib/kleo/hierarchicalkeylistjob.cpp
  64. 1
    1
      certmanager/lib/kleo/multideletejob.cpp
  65. 2
    2
      certmanager/lib/tests/test_gnupgprocessbase.cpp
  66. 1
    1
      certmanager/lib/tests/test_keygen.cpp
  67. 1
    1
      certmanager/lib/tests/test_keylister.cpp
  68. 1
    1
      certmanager/lib/ui/backendconfigwidget.cpp
  69. 2
    2
      certmanager/lib/ui/cryptoconfigmodule.cpp
  70. 3
    3
      certmanager/lib/ui/kdhorizontalline.cpp
  71. 1
    1
      certmanager/lib/ui/kdhorizontalline.h
  72. 15
    15
      certmanager/lib/ui/keylistview.cpp
  73. 4
    4
      certmanager/lib/ui/keylistview.h
  74. 1
    1
      certmanager/lib/ui/keyrequester.cpp
  75. 6
    6
      certmanager/lib/ui/keyselectiondialog.cpp
  76. 4
    4
      certmanager/lib/ui/messagebox.cpp
  77. 1
    1
      certmanager/lib/ui/progressdialog.cpp
  78. 1
    1
      certmanager/storedtransferjob.cpp
  79. 1
    1
      indexlib/boost-compat/config/abi/borland_prefix.hpp
  80. 2
    2
      indexlib/boost-compat/config/user.hpp
  81. 6
    6
      kaddressbook/addresseditwidget.cpp
  82. 1
    1
      kaddressbook/addresseeeditordialog.cpp
  83. 4
    4
      kaddressbook/addresseeeditorwidget.cpp
  84. 4
    4
      kaddressbook/common/filter.cpp
  85. 1
    1
      kaddressbook/common/locationmap.cpp
  86. 1
    1
      kaddressbook/contacteditorwidgetmanager.cpp
  87. 1
    1
      kaddressbook/distributionlisteditor.cpp
  88. 3
    3
      kaddressbook/distributionlistentryview.cpp
  89. 1
    1
      kaddressbook/distributionlistpicker.cpp
  90. 3
    3
      kaddressbook/editors/imeditorwidget.cpp
  91. 1
    1
      kaddressbook/editors/imeditorwidget.h
  92. 1
    1
      kaddressbook/emaileditwidget.cpp
  93. 1
    1
      kaddressbook/extensionmanager.cpp
  94. 1
    1
      kaddressbook/features/distributionlistwidget.cpp
  95. 2
    2
      kaddressbook/features/resourceselection.cpp
  96. 1
    1
      kaddressbook/geowidget.cpp
  97. 1
    1
      kaddressbook/interfaces/xxport.h
  98. 1
    1
      kaddressbook/jumpbuttonbar.cpp
  99. 8
    8
      kaddressbook/kabcore.cpp
  100. 0
    0
      kaddressbook/kabcore.h

+ 1
- 1
NewsLog.txt View File

@@ -2063,7 +2063,7 @@ Bugfixes
2063 2063
 
2064 2064
 Korganizer
2065 2065
 -----------
2066
-- proko35 W1-9 icon tqalignment was improved.
2066
+- proko35 W1-9 icon alignment was improved.
2067 2067
 
2068 2068
 Additional Fixes
2069 2069
 ================

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

@@ -83,7 +83,7 @@ void AddFeedDialog::slotOk( )
83 83
         feedURL.prepend("http://");
84 84
     f->setXmlUrl(feedURL);
85 85
 
86
-    widget->statusLabel->setText( i18n("Downloading %1").tqarg(feedURL) );
86
+    widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) );
87 87
 
88 88
     connect( feed, TQT_SIGNAL(fetched(Feed* )),
89 89
              this, TQT_SLOT(fetchCompleted(Feed *)) );
@@ -102,7 +102,7 @@ void AddFeedDialog::fetchCompleted(Feed */*f*/)
102 102
 
103 103
 void AddFeedDialog::fetchError(Feed *)
104 104
 {
105
-    KMessageBox::error(this, i18n("Feed not found from %1.").tqarg(feedURL));
105
+    KMessageBox::error(this, i18n("Feed not found from %1.").arg(feedURL));
106 106
     KDialogBase::slotCancel();
107 107
 }
108 108
 

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

@@ -146,7 +146,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
146 146
    
147 147
     TQStringList storageParams;
148 148
     
149
-    storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false"));
149
+    storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
150 150
     
151 151
     if (factory != 0)
152 152
     {
@@ -168,7 +168,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
168 168
     {
169 169
         m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
170 170
 
171
-        KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
171
+        KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
172 172
     }
173 173
 
174 174
     Filters::ArticleFilterList list;
@@ -194,7 +194,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
194 194
     m_extension = new BrowserExtension(this, "ak_extension");
195 195
 
196 196
     connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&)));
197
-    connect(m_view, TQT_SIGNAL(seStatusBarText(const TQString&)), this, TQT_SIGNAL(seStatusBarText(const TQString&)));
197
+    connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&)));
198 198
     connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int)));
199 199
     connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&)));
200 200
     connect(m_view, TQT_SIGNAL(signalStarted(KIO::Job*)), this, TQT_SIGNAL(started(KIO::Job*)));
@@ -232,7 +232,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
232 232
 
233 233
     initFonts();
234 234
 
235
-    RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION));
235
+    RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
236 236
 }
237 237
 
238 238
 void Part::loadPlugins()
@@ -432,7 +432,7 @@ bool Part::openFile()
432 432
         
433 433
                 copyFile(backup);
434 434
         
435
-                KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("XML Parsing Error") );
435
+                KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") );
436 436
             }
437 437
 
438 438
             if (!doc.setContent(listBackup))
@@ -447,7 +447,7 @@ bool Part::openFile()
447 447
             TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::currentDateTime().toTime_t());
448 448
             copyFile(backup);
449 449
 
450
-            KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").tqarg(backup), i18n("OPML Parsing Error") );
450
+            KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
451 451
         }
452 452
         m_view->loadFeeds(createDefaultFeedList());
453 453
     }
@@ -486,7 +486,7 @@ void Part::slotSaveFeedList()
486 486
     if (file.open(IO_WriteOnly) == false)
487 487
     {
488 488
         //FIXME: allow to save the feedlist into different location -tpr 20041118
489
-        KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") );
489
+        KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") );
490 490
         return;
491 491
     }
492 492
 
@@ -639,10 +639,10 @@ void Part::importFile(const KURL& url)
639 639
         if (doc.setContent(TQByteArray(file.readAll())))
640 640
             m_view->importFeeds(doc);
641 641
         else
642
-            KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(filename), i18n("OPML Parsing Error") );
642
+            KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(filename), i18n("OPML Parsing Error") );
643 643
     }
644 644
     else
645
-        KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").tqarg(filename), i18n("Read Error"));
645
+        KMessageBox::error(m_view, i18n("The file %1 could not be read, check if it exists or if it is readable for the current user.").arg(filename), i18n("Read Error"));
646 646
 
647 647
     if (isRemote)
648 648
         KIO::NetAccess::removeTempFile(filename);
@@ -656,7 +656,7 @@ void Part::exportFile(const KURL& url)
656 656
 
657 657
         if ( file.exists() &&
658 658
                 KMessageBox::questionYesNo(m_view,
659
-            i18n("The file %1 already exists; do you want to overwrite it?").tqarg(file.name()),
659
+            i18n("The file %1 already exists; do you want to overwrite it?").arg(file.name()),
660 660
             i18n("Export"),
661 661
             i18n("Overwrite"),
662 662
             KStdGuiItem::cancel()) == KMessageBox::No )
@@ -664,7 +664,7 @@ void Part::exportFile(const KURL& url)
664 664
 
665 665
         if ( !file.open(IO_WriteOnly) )
666 666
         {
667
-            KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(file.name()), i18n("Write Error") );
667
+            KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(file.name()), i18n("Write Error") );
668 668
             return;
669 669
         }
670 670
 
@@ -978,11 +978,11 @@ bool Part::tryToLock(const TQString& backendName)
978 978
                         "can cause the loss of archived articles and crashes at startup.</b> "
979 979
                         "You should disable the archive for now "
980 980
                         "unless you are sure that %2 is not already running.</qt>")
981
-                        .tqarg( programName, programName, backendName );
981
+                        .arg( programName, programName, backendName );
982 982
               // TQString::arg( st ) only replaces the first occurrence of %1
983 983
               // with st while TQString::arg( s1, s2 ) replacess all occurrences
984 984
               // of %1 with s1 and all occurrences of %2 with s2. So don't
985
-              // even think about changing the above to .tqarg( programName ).
985
+              // even think about changing the above to .arg( programName ).
986 986
             else
987 987
                 msg = i18n("<qt>%1 seems to be running on another display on this "
988 988
                         "machine. <b>Running %1 and %2 at the same "
@@ -990,7 +990,7 @@ bool Part::tryToLock(const TQString& backendName)
990 990
                         "the loss of archived articles and crashes at startup.</b> "
991 991
                         "You should disable the archive for now "
992 992
                         "unless you are sure that %2 is not already running.</qt>")
993
-                        .tqarg( oldProgramName, programName, backendName );
993
+                        .arg( oldProgramName, programName, backendName );
994 994
         }
995 995
         else
996 996
         {
@@ -1001,7 +1001,7 @@ bool Part::tryToLock(const TQString& backendName)
1001 1001
                         "You should disable the archive for now "
1002 1002
                         "unless you are sure that it is "
1003 1003
                         "not already running on %2.</qt>")
1004
-                        .tqarg( programName, oldHostName, backendName );
1004
+                        .arg( programName, oldHostName, backendName );
1005 1005
             else
1006 1006
                 msg = i18n("<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the "
1007 1007
                         "same time is not supported by the %4 backend and can cause "
@@ -1009,7 +1009,7 @@ bool Part::tryToLock(const TQString& backendName)
1009 1009
                         "You should disable the archive for now "
1010 1010
                         "unless you are sure that %1 is "
1011 1011
                         "not running on %3.</qt>")
1012
-                        .tqarg( oldProgramName, programName, oldHostName, backendName );
1012
+                        .arg( oldProgramName, programName, oldHostName, backendName );
1013 1013
         }
1014 1014
 
1015 1015
         KCursorSaver idle( KBusyPtr::idle() );

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

@@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
145 145
 
146 146
         virtual bool visitTagNode(TagNode* node)
147 147
         {
148
-            TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").tqarg(node->title());
148
+            TQString msg = i18n("<qt>Are you sure you want to delete tag <b>%1</b>? The tag will be removed from all articles.</qt>").arg(node->title());
149 149
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue)
150 150
             {
151 151
                 Tag tag = node->tag();
@@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
166 166
             if (node->title().isEmpty())
167 167
                 msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>");
168 168
             else
169
-                msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(node->title());
169
+                msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(node->title());
170 170
 
171 171
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue)
172 172
             {
@@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
182 182
             if (node->title().isEmpty())
183 183
                 msg = i18n("<qt>Are you sure you want to delete this feed?</qt>");
184 184
             else
185
-                msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title());
185
+                msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title());
186 186
 
187 187
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue)
188 188
             {
@@ -468,7 +468,7 @@ void View::connectFrame(Frame *f)
468 468
 void View::sloStatusText(const TQString &c)
469 469
 {
470 470
     if (sender() == m_currentFrame)
471
-        emit seStatusBarText(c);
471
+        emit setStatusBarText(c);
472 472
 }
473 473
 
474 474
 void View::slotCaptionChanged(const TQString &c)
@@ -690,7 +690,7 @@ void View::slotFrameChanged(Frame *f)
690 690
 
691 691
     emit setWindowCaption(f->caption());
692 692
     emit setProgress(f->progress());
693
-    emit seStatusBarText(f->statusText());
693
+    emit setStatusBarText(f->statusText());
694 694
 
695 695
     if (f->part() == m_part)
696 696
         m_part->mergePart(m_articleViewer);
@@ -884,7 +884,7 @@ void View::slotFeedAdd()
884 884
 
885 885
     }
886 886
 
887
-    TreeNode* lastChild = group->tqchildren().last();
887
+    TreeNode* lastChild = group->children().last();
888 888
 
889 889
     addFeed(TQString(), lastChild, group, false);
890 890
 }
@@ -1070,14 +1070,14 @@ void View::slotFetchingStarted()
1070 1070
 {
1071 1071
     m_mainFrame->setState(Frame::Started);
1072 1072
     m_actionManager->action("feed_stop")->setEnabled(true);
1073
-    m_mainFrame->seStatusText(i18n("Fetching Feeds..."));
1073
+    m_mainFrame->setStatusText(i18n("Fetching Feeds..."));
1074 1074
 }
1075 1075
 
1076 1076
 void View::slotFetchingStopped()
1077 1077
 {
1078 1078
     m_mainFrame->setState(Frame::Completed);
1079 1079
     m_actionManager->action("feed_stop")->setEnabled(false);
1080
-    m_mainFrame->seStatusText(TQString());
1080
+    m_mainFrame->setStatusText(TQString());
1081 1081
 }
1082 1082
 
1083 1083
 void View::slotFeedFetched(Feed *feed)
@@ -1186,7 +1186,7 @@ void View::slotArticleSelected(const Article& article)
1186 1186
             if (delay > 0)
1187 1187
                 m_markReadTimer->start( delay*1000, true );
1188 1188
             else
1189
-                a.seStatus(Article::Read);
1189
+                a.setStatus(Article::Read);
1190 1190
         }
1191 1191
     }
1192 1192
 
@@ -1312,7 +1312,7 @@ void View::slotArticleDelete()
1312 1312
         case 0:
1313 1313
             return;
1314 1314
         case 1:
1315
-            msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape(articles.first().title()));
1315
+            msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title()));
1316 1316
             break;
1317 1317
         default:
1318 1318
             msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",
@@ -1370,7 +1370,7 @@ void View::slotSetSelectedArticleRead()
1370 1370
         return;
1371 1371
 
1372 1372
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
1373
-        (*it).seStatus(Article::Read);
1373
+        (*it).setStatus(Article::Read);
1374 1374
 }
1375 1375
 
1376 1376
 void View::slotTextToSpeechRequest()
@@ -1408,7 +1408,7 @@ void View::slotSetSelectedArticleUnread()
1408 1408
         return;
1409 1409
 
1410 1410
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
1411
-        (*it).seStatus(Article::Unread);
1411
+        (*it).setStatus(Article::Unread);
1412 1412
 }
1413 1413
 
1414 1414
 void View::slotSetSelectedArticleNew()
@@ -1419,7 +1419,7 @@ void View::slotSetSelectedArticleNew()
1419 1419
         return;
1420 1420
 
1421 1421
     for (TQValueList<Article>::Iterator it = articles.begin(); it != articles.end(); ++it)
1422
-        (*it).seStatus(Article::New);
1422
+        (*it).setStatus(Article::New);
1423 1423
 }
1424 1424
 
1425 1425
 void View::slotSetCurrentArticleReadDelayed()
@@ -1429,7 +1429,7 @@ void View::slotSetCurrentArticleReadDelayed()
1429 1429
     if (article.isNull())
1430 1430
         return;
1431 1431
 
1432
-    article.seStatus(Article::Read);
1432
+    article.setStatus(Article::Read);
1433 1433
 }
1434 1434
 
1435 1435
 void View::slotMouseOverInfo(const KFileItem *kifi)
@@ -1437,11 +1437,11 @@ void View::slotMouseOverInfo(const KFileItem *kifi)
1437 1437
     if (kifi)
1438 1438
     {
1439 1439
         KFileItem *k=(KFileItem*)kifi;
1440
-        m_mainFrame->seStatusText(k->url().prettyURL());//geStatusBarInfo());
1440
+        m_mainFrame->setStatusText(k->url().prettyURL());//geStatusBarInfo());
1441 1441
     }
1442 1442
     else
1443 1443
     {
1444
-        m_mainFrame->seStatusText(TQString());
1444
+        m_mainFrame->setStatusText(TQString());
1445 1445
     }
1446 1446
 }
1447 1447
 

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

@@ -134,7 +134,7 @@ namespace Akregator {
134 134
             void signalUnreadCountChanged(int);
135 135
 
136 136
             void setWindowCaption(const TQString&);
137
-            void seStatusBarText(const TQString&);
137
+            void setStatusBarText(const TQString&);
138 138
             void setProgress(int);
139 139
             void signalStarted(KIO::Job*);
140 140
             void signalCompleted();

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

@@ -109,7 +109,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
109 109
         if (article.meta("deleted") == "true") 
110 110
         { // if article is in deleted state, we just add the status and omit the rest
111 111
             d->status = Private::Read | Private::Deleted;
112
-            d->archive->seStatus(d->guid, d->status);
112
+            d->archive->setStatus(d->guid, d->status);
113 113
         }
114 114
         else
115 115
         { // article is not deleted, let's add it to the archive
@@ -157,7 +157,7 @@ void Article::initialize(RSS::Article article, Backend::FeedStorage* archive)
157 157
                 int statusInt = status.toInt();
158 158
                 if (statusInt == New)
159 159
                     statusInt = Unread;
160
-                seStatus(statusInt);
160
+                setStatus(statusInt);
161 161
             }
162 162
             setKeep(article.meta("keep") == "true");
163 163
         }
@@ -210,9 +210,9 @@ void Article::setDeleted()
210 210
     if (isDeleted())
211 211
         return;
212 212
   
213
-    seStatus(Read);
213
+    setStatus(Read);
214 214
     d->status = Private::Deleted | Private::Read;
215
-    d->archive->seStatus(d->guid, d->status);
215
+    d->archive->setStatus(d->guid, d->status);
216 216
     d->archive->setDeleted(d->guid);
217 217
 
218 218
     if (d->feed)
@@ -299,7 +299,7 @@ int Article::status() const
299 299
         return Unread;
300 300
 }
301 301
 
302
-void Article::seStatus(int stat)
302
+void Article::setStatus(int stat)
303 303
 {
304 304
     // use status() rather than statusBits() here to filter out status flags that we are not
305 305
     // interested in
@@ -319,7 +319,7 @@ void Article::seStatus(int stat)
319 319
                 d->status = ( d->status | Private::New) & ~Private::Read;
320 320
                 break;
321 321
         }
322
-        d->archive->seStatus(d->guid, d->status);
322
+        d->archive->setStatus(d->guid, d->status);
323 323
         if (d->feed)
324 324
             d->feed->setArticleChanged(*this, oldStatus);
325 325
      }
@@ -404,7 +404,7 @@ RSS::Enclosure Article::enclosure() const
404 404
 void Article::setKeep(bool keep)
405 405
 {
406 406
     d->status = keep ? ( statusBits() | Private::Keep) : ( statusBits() & ~Private::Keep);
407
-    d->archive->seStatus(d->guid, d->status);
407
+    d->archive->setStatus(d->guid, d->status);
408 408
     if (d->feed)
409 409
         d->feed->setArticleChanged(*this);
410 410
 }

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

@@ -80,7 +80,7 @@ namespace Akregator
80 80
             bool isNull() const;
81 81
             
82 82
             int status() const;
83
-            void seStatus(int s);
83
+            void setStatus(int s);
84 84
 
85 85
             void offsetPubDate(int secs);
86 86
 

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

@@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status)
449 449
 void SeStatusAction::exec(Article& article)
450 450
 {
451 451
     if (!article.isNull())
452
-        article.seStatus(m_status);
452
+        article.setStatus(m_status);
453 453
 }
454 454
 
455 455
 int SeStatusAction::status() const
@@ -457,7 +457,7 @@ int SeStatusAction::status() const
457 457
     return m_status;
458 458
 }
459 459
 
460
-void SeStatusAction::seStatus(int status)
460
+void SeStatusAction::setStatus(int status)
461 461
 {
462 462
     m_status = status;
463 463
 }

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

@@ -174,7 +174,7 @@ class SeStatusAction : public AbstractAction
174 174
         virtual void exec(Article& article);
175 175
         
176 176
         int status() const;
177
-        void seStatus(int status);
177
+        void setStatus(int status);
178 178
 
179 179
         virtual void writeConfig(KConfig* config) const;
180 180
         virtual void readConfig(KConfig* config);

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

@@ -72,9 +72,9 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
72 72
         m_view->m_link = TQString();
73 73
         
74 74
         TQString text;
75
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
75
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
76 76
         
77
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">").tqarg(directionOf(Utils::stripTags(node->title())));
77
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title())));
78 78
         text += node->title();
79 79
         if(node->unread() == 0)
80 80
             text += i18n(" (no unread articles)");
@@ -90,26 +90,26 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
90 90
             TQString file = url.replace("/", "_").replace(":", "_");
91 91
             KURL u(m_view->m_imageDir);
92 92
             u.setFileName(file);
93
-            text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(u.url());
93
+            text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url());
94 94
         }
95 95
         else text += "<div class=\"body\">";
96 96
         
97 97
         
98 98
         if( !node->description().isEmpty() )
99 99
         {
100
-            text += TQString("<div dir=\"%1\">").tqarg(Utils::stripTags(directionOf(node->description())));
101
-            text += i18n("<b>Description:</b> %1<br><br>").tqarg(node->description());
100
+            text += TQString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description())));
101
+            text += i18n("<b>Description:</b> %1<br><br>").arg(node->description());
102 102
             text += "</div>\n"; // /description
103 103
         }
104 104
         
105 105
         if ( !node->htmlUrl().isEmpty() )
106 106
         {
107
-            text += TQString("<div dir=\"%1\">").tqarg(directionOf(node->htmlUrl()));
108
-            text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").tqarg(node->htmlUrl()).tqarg(node->htmlUrl());
107
+            text += TQString("<div dir=\"%1\">").arg(directionOf(node->htmlUrl()));
108
+            text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").arg(node->htmlUrl()).arg(node->htmlUrl());
109 109
             text += "</div>\n"; // / link
110 110
         }
111 111
         
112
-        //text += i18n("<b>Unread articles:</b> %1").tqarg(node->unread());
112
+        //text += i18n("<b>Unread articles:</b> %1").arg(node->unread());
113 113
         text += "</div>"; // /body
114 114
         
115 115
         m_view->renderContent(text);
@@ -121,8 +121,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
121 121
         m_view->m_link = TQString();
122 122
         
123 123
         TQString text;
124
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
125
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
124
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
125
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
126 126
         if(node->unread() == 0)
127 127
             text += i18n(" (no unread articles)");
128 128
         else
@@ -139,8 +139,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
139 139
         m_view->m_link = TQString();
140 140
         
141 141
         TQString text;
142
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
143
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
142
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
143
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
144 144
         if(node->unread() == 0)
145 145
             text += i18n(" (no unread articles)");
146 146
         else
@@ -198,10 +198,10 @@ void ArticleViewer::generateNormalModeCSS()
198 198
             "  font-size: %2 ! important;\n"
199 199
             "  color: %3 ! important;\n"
200 200
             "  background: %4 ! important;\n"
201
-            "}\n\n").tqarg(Settings::standardFont())
202
-            .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
203
-            .tqarg(cg.text().name())
204
-            .tqarg(cg.base().name());
201
+            "}\n\n").arg(Settings::standardFont())
202
+            .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
203
+            .arg(cg.text().name())
204
+            .arg(cg.base().name());
205 205
     m_normalModeCSS += TQString(
206 206
     "a {\n"
207 207
     + TQString("  color: %1 ! important;\n")
@@ -214,18 +214,18 @@ void ArticleViewer::generateNormalModeCSS()
214 214
     +"  margin-bottom: 10pt;\n"
215 215
 //    +"  width: 99%;\n"
216 216
     +        "}\n\n")
217
-            .tqarg(cg.link().name())
218
-            .tqarg(cg.background().name())
219
-            .tqarg(cg.text().name());
217
+            .arg(cg.link().name())
218
+            .arg(cg.background().name())
219
+            .arg(cg.text().name());
220 220
 
221 221
     m_normalModeCSS += TQString(".headertitle a:link { color: %1  ! important; }\n"
222 222
     ".headertitle a:visited { color: %2 ! important; }\n"
223 223
     ".headertitle a:hover{ color: %3 ! important; }\n"
224 224
             ".headertitle a:active { color: %4 ! important; }\n")
225
-            .tqarg(cg.highlightedText().name())
226
-            .tqarg(cg.highlightedText().name())
227
-            .tqarg(cg.highlightedText().name())
228
-            .tqarg(cg.highlightedText().name());
225
+            .arg(cg.highlightedText().name())
226
+            .arg(cg.highlightedText().name())
227
+            .arg(cg.highlightedText().name())
228
+            .arg(cg.highlightedText().name());
229 229
     
230 230
     m_normalModeCSS += TQString(
231 231
     ".headertitle {\n"
@@ -244,8 +244,8 @@ void ArticleViewer::generateNormalModeCSS()
244 244
     ".headimage {\n"
245 245
     "  float: right;\n"
246 246
     "  margin-left: 5px;\n"
247
-            "}\n\n").tqarg(cg.highlight().name())
248
-            .tqarg(cg.highlightedText().name());
247
+            "}\n\n").arg(cg.highlight().name())
248
+            .arg(cg.highlightedText().name());
249 249
     
250 250
     m_normalModeCSS += TQString(
251 251
     "body { clear: none; }\n\n"
@@ -278,10 +278,10 @@ void ArticleViewer::generateCombinedModeCSS()
278 278
             "  font-size: %2 ! important;\n"
279 279
             "  color: %3 ! important;\n"
280 280
             "  background: %4 ! important;\n"
281
-            "}\n\n").tqarg(Settings::standardFont())
282
-            .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
283
-            .tqarg(cg.text().name())
284
-            .tqarg(cg.base().name());
281
+            "}\n\n").arg(Settings::standardFont())
282
+            .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
283
+            .arg(cg.text().name())
284
+            .arg(cg.base().name());
285 285
     m_combinedModeCSS += (
286 286
     "a {\n"
287 287
     + TQString("  color: %1 ! important;\n")
@@ -294,18 +294,18 @@ void ArticleViewer::generateCombinedModeCSS()
294 294
     +"  margin-bottom: 10pt;\n"
295 295
 //    +"  width: 99%;\n"
296 296
     +        "}\n\n")
297
-            .tqarg(cg.link().name())
298
-            .tqarg(cg.background().name())
299
-            .tqarg(cg.text().name());
297
+            .arg(cg.link().name())
298
+            .arg(cg.background().name())
299
+            .arg(cg.text().name());
300 300
 
301 301
     m_combinedModeCSS += TQString(".headertitle a:link { color: %1  ! important; }\n"
302 302
     ".headertitle a:visited { color: %2 ! important; }\n"
303 303
     ".headertitle a:hover{ color: %3 ! important; }\n"
304 304
             ".headertitle a:active { color: %4 ! important; }\n")
305
-            .tqarg(cg.highlightedText().name())
306
-            .tqarg(cg.highlightedText().name())
307
-            .tqarg(cg.highlightedText().name())
308
-            .tqarg(cg.highlightedText().name());
305
+            .arg(cg.highlightedText().name())
306
+            .arg(cg.highlightedText().name())
307
+            .arg(cg.highlightedText().name())
308
+            .arg(cg.highlightedText().name());
309 309
     m_combinedModeCSS += TQString(
310 310
     ".headertitle {\n"
311 311
     "  background: %1 ! important;\n"
@@ -323,8 +323,8 @@ void ArticleViewer::generateCombinedModeCSS()
323 323
     ".headimage {\n"
324 324
     "  float: right;\n"
325 325
     "  margin-left: 5px;\n"
326
-            "}\n\n").tqarg(cg.highlight().name())
327
-            .tqarg(cg.highlightedText().name());
326
+            "}\n\n").arg(cg.highlight().name())
327
+            .arg(cg.highlightedText().name());
328 328
     
329 329
     m_combinedModeCSS += TQString(
330 330
     "body { clear: none; }\n\n"
@@ -368,11 +368,11 @@ void ArticleViewer::displayAboutPage()
368 368
 {
369 369
     TQString location = locate("data", "akregator/about/main.html");
370 370
     TQString content = KPIM::kFileToString(location);
371
-    content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
371
+    content = content.arg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
372 372
     if ( kapp->reverseLayout() )
373
-        content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
373
+        content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
374 374
     else
375
-        content = content.tqarg( "" );
375
+        content = content.arg( "" );
376 376
 
377 377
     begin(KURL( location ));
378 378
     TQString info =
@@ -389,25 +389,25 @@ void ArticleViewer::displayAboutPage()
389 389
             "<p>We hope that you will enjoy Akregator.</p>\n"
390 390
             "<p>Thank you,</p>\n"
391 391
             "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Akregator Team</p>\n")
392
-            .tqarg(AKREGATOR_VERSION) // Akregator version
393
-            .tqarg("http://akregator.kde.org/"); // Akregator homepage URL
392
+            .arg(AKREGATOR_VERSION) // Akregator version
393
+            .arg("http://akregator.kde.org/"); // Akregator homepage URL
394 394
 
395 395
     TQString fontSize = TQString::number( pointsToPixel( Settings::mediumFontSize() ));
396 396
     TQString appTitle = i18n("Akregator");
397 397
     TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite");
398 398
     TQString quickDescription = i18n("An RSS feed reader for the K Desktop Environment.");
399
-    write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info));
399
+    write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info));
400 400
     end();
401 401
 }
402 402
 
403 403
 TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article)
404 404
 {
405 405
     TQString text;
406
-    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
406
+    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
407 407
 
408 408
     if (!article.title().isEmpty())
409 409
     {
410
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
410
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
411 411
         if (article.link().isValid())
412 412
             text += "<a href=\""+article.link().url()+"\">";
413 413
         text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
@@ -417,16 +417,16 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
417 417
     }
418 418
     if (article.pubDate().isValid())
419 419
     {
420
-        text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
421
-        text += TQString ("%1:").tqarg(i18n("Date"));
420
+        text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
421
+        text += TQString ("%1:").arg(i18n("Date"));
422 422
         text += "</span><span class=\"headertext\">";
423 423
         text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL?
424 424
     }
425 425
     TQString author = article.author();
426 426
     if (!author.isEmpty())
427 427
     {
428
-        text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
429
-        text += TQString ("%1:").tqarg(i18n("Author"));
428
+        text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
429
+        text += TQString ("%1:").arg(i18n("Author"));
430 430
         text += "</span><span class=\"headertext\">";
431 431
         text += author+"</span>\n"; // TODO: might need RTL?
432 432
     }
@@ -437,14 +437,14 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
437 437
         TQString file = Utils::fileNameForUrl(feed->xmlUrl());
438 438
         KURL u(m_imageDir);
439 439
         u.setFileName(file);
440
-        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
440
+        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
441 441
     }
442 442
 
443 443
     
444 444
 
445 445
     if (!article.description().isEmpty())
446 446
     {
447
-        text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
447
+        text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
448 448
         text += "<span class=\"content\">"+article.description()+"</span>";
449 449
         text += "</div>";
450 450
     }
@@ -486,7 +486,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
486 486
         //int length = article.enclosure().length();
487 487
         //TQString lengthStr = KIO::convertSize(length);
488 488
 
489
-        //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").tqarg(url).tqarg(url).tqarg(lengthStr).tqarg(type);
489
+        //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type);
490 490
     }
491 491
     //kdDebug() << text << endl;
492 492
     return text;
@@ -496,13 +496,13 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
496 496
 TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& article)
497 497
 {
498 498
     TQString text;
499
-    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
499
+    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
500 500
 
501 501
     KURL link = article.link();
502 502
     
503 503
     if (!article.title().isEmpty())
504 504
     {
505
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
505
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
506 506
         if (link.isValid())
507 507
             text += "<a href=\""+link.url()+"\">";
508 508
         text += article.title().replace("<", "&lt;").replace(">", "&gt;"); // TODO: better leave things escaped in the parser
@@ -512,8 +512,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
512 512
     }
513 513
     if (article.pubDate().isValid())
514 514
     {
515
-        text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
516
-        text += TQString ("%1:").tqarg(i18n("Date"));
515
+        text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
516
+        text += TQString ("%1:").arg(i18n("Date"));
517 517
         text += "</span><span class=\"headertext\">";
518 518
         text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL?
519 519
     }
@@ -521,8 +521,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
521 521
     TQString author = article.author();
522 522
     if (!author.isEmpty())
523 523
     {
524
-        text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
525
-        text += TQString ("%1:").tqarg(i18n("Author"));
524
+        text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
525
+        text += TQString ("%1:").arg(i18n("Author"));
526 526
         text += "</span><span class=\"headertext\">";
527 527
         text += author+"</span>\n"; // TODO: might need RTL?
528 528
     }
@@ -534,14 +534,14 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
534 534
         TQString file = Utils::fileNameForUrl(feed->xmlUrl());
535 535
         KURL u(m_imageDir);
536 536
         u.setFileName(file);
537
-        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
537
+        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
538 538
     }
539 539
 
540 540
     
541 541
 
542 542
     if (!article.description().isEmpty())
543 543
     {
544
-        text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
544
+        text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
545 545
         text += "<span class=\"content\">"+article.description()+"</span>";
546 546
         text += "</div>";
547 547
     }

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

@@ -402,7 +402,7 @@ void Feed::slotMarkAllArticlesAsRead()
402 402
         TQValueList<Article>::Iterator en = tarticles.end();
403 403
 
404 404
         for (it = tarticles.begin(); it != en; ++it)
405
-            (*it).seStatus(Article::Read);
405
+            (*it).setStatus(Article::Read);
406 406
         setNotificationMode(true, true);
407 407
     }
408 408
 }
@@ -464,9 +464,9 @@ void Feed::appendArticles(const RSS::Document &doc)
464 464
             d->addedArticlesNotify.append(mya);
465 465
             
466 466
             if (!mya.isDeleted() && !markImmediatelyAsRead())
467
-                mya.seStatus(Article::New);
467
+                mya.setStatus(Article::New);
468 468
             else
469
-                mya.seStatus(Article::Read);
469
+                mya.setStatus(Article::Read);
470 470
                 
471 471
             changed = true;
472 472
         }
@@ -479,12 +479,12 @@ void Feed::appendArticles(const RSS::Document &doc)
479 479
             {
480 480
                 mya.setKeep(old.keep());
481 481
                 int oldstatus = old.status();
482
-                old.seStatus(Article::Read);
482
+                old.setStatus(Article::Read);
483 483
 
484 484
                 d->articles.remove(old.guid());
485 485
                 appendArticle(mya);
486 486
 
487
-                mya.seStatus(oldstatus);
487
+                mya.setStatus(oldstatus);
488 488
 
489 489
                 d->updatedArticlesNotify.append(mya);
490 490
                 changed = true;
@@ -558,7 +558,7 @@ void Feed::fetch(bool followDiscovery)
558 558
     {
559 559
         if ((*it).status() == Article::New)
560 560
         {
561
-            (*it).seStatus(Article::Unread);
561
+            (*it).setStatus(Article::Unread);
562 562
         }
563 563
     }
564 564
 

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

@@ -222,10 +222,10 @@ void FeedList::append(FeedList* list, Folder* parent, TreeNode* after)
222 222
     if ( !flatList()->contains(parent) )
223 223
         parent = rootNode();
224 224
 
225
-    TQValueList<TreeNode*> tqchildren = list->rootNode()->tqchildren();
225
+    TQValueList<TreeNode*> children = list->rootNode()->children();
226 226
 
227
-    TQValueList<TreeNode*>::ConstIterator end(  tqchildren.end() );
228
-    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
227
+    TQValueList<TreeNode*>::ConstIterator end(  children.end() );
228
+    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
229 229
     {
230 230
         list->rootNode()->removeChild(*it);
231 231
         parent->insertChild(*it, after);
@@ -254,11 +254,11 @@ TQDomDocument FeedList::toXML() const
254 254
     TQDomElement body = doc.createElement( "body" );
255 255
     root.appendChild( body );
256 256
 
257
-    TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren();
257
+    TQValueList<TreeNode*> children = rootNode()->children();
258 258
 
259
-    TQValueList<TreeNode*>::ConstIterator end(  tqchildren.end() );
259
+    TQValueList<TreeNode*>::ConstIterator end(  children.end() );
260 260
 
261
-    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != end; ++it)
261
+    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != end; ++it)
262 262
         body.appendChild( (*it)->toOPML(body, doc) );
263 263
 
264 264
     return doc;

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

@@ -180,8 +180,8 @@ class NodeListView::DeleteItemVisitor : public TreeNodeVisitor
180 180
         virtual bool visitFolder(Folder* node)
181 181
         {
182 182
             // delete child items recursively before deleting parent
183
-            TQValueList<TreeNode*> tqchildren = node->tqchildren();
184
-            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
183
+            TQValueList<TreeNode*> children = node->children();
184
+            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
185 185
                 visit(*it);
186 186
             
187 187
             visitTreeNode(node);
@@ -267,10 +267,10 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
267 267
 
268 268
             }
269 269
             m_view->d->itemDict.insert(node, item);
270
-            TQValueList<TreeNode*> tqchildren = node->tqchildren();
270
+            TQValueList<TreeNode*> children = node->children();
271 271
 
272
-            // add tqchildren recursively
273
-            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
272
+            // add children recursively
273
+            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
274 274
                 visit(*it);
275 275
 
276 276
             m_view->connectToNode(node);
@@ -305,9 +305,9 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
305 305
             }
306 306
             m_view->d->itemDict.insert(node, item);
307 307
             
308
-            // add tqchildren recursively
309
-            TQValueList<TreeNode*> tqchildren = node->tqchildren();
310
-            for (TQValueList<TreeNode*>::ConstIterator it =  tqchildren.begin(); it != tqchildren.end(); ++it )
308
+            // add children recursively
309
+            TQValueList<TreeNode*> children = node->children();
310
+            for (TQValueList<TreeNode*>::ConstIterator it =  children.begin(); it != children.end(); ++it )
311 311
                 visit(*it);
312 312
 
313 313
             m_view->connectToNode(node);

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

@@ -157,7 +157,7 @@ protected slots:
157 157
     
158 158
     /** Called when a node in the tree is taken out of the tree (parent->removeChild()) 
159 159
     
160
-    Removes a node and its tqchildren from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
160
+    Removes a node and its children from the tree. Note that it doesn't delete the corresponding view items (get deleted only when the node itself gets deleted) */
161 161
     virtual void slotNodeRemoved(Folder* parent, TreeNode* node);
162 162
     
163 163
     /** deletes the item belonging to the deleted node */

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

@@ -111,7 +111,7 @@ class AKREGATOR_EXPORT FeedStorage : public TQObject
111 111
         virtual uint pubDate(const TQString& guid) = 0;
112 112
         virtual void setPubDate(const TQString& guid, uint pubdate) = 0;
113 113
         virtual int status(const TQString& guid) = 0;
114
-        virtual void seStatus(const TQString& guid, int status) = 0;
114
+        virtual void setStatus(const TQString& guid, int status) = 0;
115 115
         virtual TQString title(const TQString& guid) = 0;
116 116
         virtual void setTitle(const TQString& guid, const TQString& title) = 0;
117 117
         virtual TQString description(const TQString& guid) = 0;

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

@@ -246,7 +246,7 @@ int FeedStorageDummyImpl::status(const TQString& guid)
246 246
     return contains(guid) ? d->entries[guid].status : 0;
247 247
 }
248 248
 
249
-void FeedStorageDummyImpl::seStatus(const TQString& guid, int status)
249
+void FeedStorageDummyImpl::setStatus(const TQString& guid, int status)
250 250
 {
251 251
     if (contains(guid))
252 252
         d->entries[guid].status = status;
@@ -407,7 +407,7 @@ void FeedStorageDummyImpl::copyArticle(const TQString& guid, FeedStorage* source
407 407
     setHash(guid, source->hash(guid));
408 408
     setLink(guid, source->link(guid));
409 409
     setPubDate(guid, source->pubDate(guid));
410
-    seStatus(guid, source->status(guid));
410
+    setStatus(guid, source->status(guid));
411 411
     setTitle(guid, source->title(guid));
412 412
     TQStringList tags = source->tags(guid);
413 413
     

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

@@ -69,7 +69,7 @@ class FeedStorageDummyImpl : public FeedStorage
69 69
         virtual uint pubDate(const TQString& guid);
70 70
         virtual void setPubDate(const TQString& guid, uint pubdate);
71 71
         virtual int status(const TQString& guid);
72
-        virtual void seStatus(const TQString& guid, int status);
72
+        virtual void setStatus(const TQString& guid, int status);
73 73
         virtual TQString title(const TQString& guid);
74 74
         virtual void setTitle(const TQString& guid, const TQString& title);
75 75
         virtual TQString description(const TQString& guid);

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

@@ -39,9 +39,9 @@ namespace Akregator {
39 39
 class Folder::FolderPrivate
40 40
 {
41 41
     public:
42
-        /** List of tqchildren */
43
-        TQValueList<TreeNode*> tqchildren;
44
-        /** caching unread count of tqchildren */
42
+        /** List of children */
43
+        TQValueList<TreeNode*> children;
44
+        /** caching unread count of children */
45 45
         int unread;
46 46
         /** whether or not the folder is expanded */
47 47
         bool open;
@@ -77,7 +77,7 @@ Folder::Folder(const TQString& title) : TreeNode(), d(new FolderPrivate)
77 77
 Folder::~Folder()
78 78
 {
79 79
     TreeNode* tmp = 0;
80
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != d->tqchildren.end(); ++it)
80
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != d->children.end(); ++it)
81 81
     {
82 82
         delete tmp;
83 83
         tmp = *it;
@@ -93,8 +93,8 @@ Folder::~Folder()
93 93
 TQStringList Folder::tags() const
94 94
 {
95 95
     TQStringList t;
96
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
97
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
96
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
97
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
98 98
     {
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();
@@ -108,8 +108,8 @@ TQStringList Folder::tags() const
108 108
 TQValueList<Article> Folder::articles(const TQString& tag)
109 109
 {
110 110
     TQValueList<Article> seq;
111
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
112
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
111
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
112
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
113 113
         seq += (*it)->articles(tag);
114 114
      
115 115
     return seq;
@@ -123,21 +123,21 @@ TQDomElement Folder::toOPML( TQDomElement parent, TQDomDocument document ) const
123 123
     el.setAttribute("isOpen", d->open ? "true" : "false");
124 124
     el.setAttribute( "id", TQString::number(id()) );
125 125
 
126
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
127
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
126
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
127
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
128 128
         el.appendChild( (*it)->toOPML(el, document) );
129 129
         
130 130
     return el;
131 131
 }
132 132
 
133
-TQValueList<TreeNode*> Folder::tqchildren() const
133
+TQValueList<TreeNode*> Folder::children() const
134 134
 {
135
-    return d->tqchildren;
135
+    return d->children;
136 136
 }
137 137
 
138 138
 void Folder::insertChild(TreeNode* node, TreeNode* after)
139 139
 {
140
-    int pos = d->tqchildren.findIndex(after);
140
+    int pos = d->children.findIndex(after);
141 141
     
142 142
     if (pos < 0)
143 143
         prependChild(node);
@@ -150,10 +150,10 @@ void Folder::insertChild(uint index, TreeNode* node)
150 150
 //    kdDebug() << "enter Folder::insertChild(int, node) " << node->title() << endl;
151 151
     if (node)
152 152
     {
153
-        if (index >= d->tqchildren.size())
154
-            d->tqchildren.append(node);
153
+        if (index >= d->children.size())
154
+            d->children.append(node);
155 155
         else
156
-            d->tqchildren.insert(d->tqchildren.at(index), node);
156
+            d->children.insert(d->children.at(index), node);
157 157
         node->setParent(this);
158 158
         connectToNode(node);
159 159
         updateUnreadCount();
@@ -170,7 +170,7 @@ void Folder::appendChild(TreeNode* node)
170 170
 //    kdDebug() << "enter Folder::appendChild() " << node->title() << endl;
171 171
     if (node)
172 172
     {
173
-        d->tqchildren.append(node);
173
+        d->children.append(node);
174 174
         node->setParent(this);
175 175
         connectToNode(node);
176 176
         updateUnreadCount();
@@ -187,7 +187,7 @@ void Folder::prependChild(TreeNode* node)
187 187
 //    kdDebug() << "enter Folder::prependChild() " << node->title() << endl;
188 188
     if (node)
189 189
     {
190
-        d->tqchildren.prepend(node);
190
+        d->children.prepend(node);
191 191
         node->setParent(this);
192 192
         connectToNode(node);
193 193
         updateUnreadCount();
@@ -202,10 +202,10 @@ 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.contains(node))
205
+    if (node && d->children.contains(node))
206 206
     {    
207 207
         node->setParent(0);
208
-        d->tqchildren.remove(node);
208
+        d->children.remove(node);
209 209
         disconnectFromNode(node);
210 210
         updateUnreadCount();    
211 211
         emit signalChildRemoved(this, node);
@@ -219,12 +219,12 @@ void Folder::removeChild(TreeNode* node)
219 219
 
220 220
 TreeNode* Folder::firstChild()
221 221
 {
222
-    return d->tqchildren.isEmpty() ? 0 : d->tqchildren.first();
222
+    return d->children.isEmpty() ? 0 : d->children.first();
223 223
 }            
224 224
 
225 225
 TreeNode* Folder::lastChild()
226 226
 {
227
-    return d->tqchildren.isEmpty() ? 0 : d->tqchildren.last();
227
+    return d->children.isEmpty() ? 0 : d->children.last();
228 228
 }
229 229
             
230 230
 bool Folder::isOpen() const
@@ -246,8 +246,8 @@ int Folder::totalCount() const
246 246
 {
247 247
     int totalCount = 0;
248 248
 
249
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
250
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
249
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
250
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
251 251
         totalCount += (*it)->totalCount();
252 252
     
253 253
     return totalCount;
@@ -257,8 +257,8 @@ void Folder::updateUnreadCount()
257 257
 {
258 258
     int unread = 0;
259 259
 
260
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
261
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
260
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
261
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
262 262
         unread += (*it)->unread();
263 263
     
264 264
     d->unread = unread;
@@ -267,8 +267,8 @@ void Folder::updateUnreadCount()
267 267
 void Folder::slotMarkAllArticlesAsRead() 
268 268
 {
269 269
     setNotificationMode(false);
270
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
271
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
270
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
271
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
272 272
         (*it)->slotMarkAllArticlesAsRead();
273 273
     setNotificationMode(true, true);
274 274
 }
@@ -281,7 +281,7 @@ void Folder::slotChildChanged(TreeNode* /*node*/)
281 281
 
282 282
 void Folder::slotChildDestroyed(TreeNode* node)
283 283
 {
284
-    d->tqchildren.remove(node);
284
+    d->children.remove(node);
285 285
     updateUnreadCount();    
286 286
     nodeModified();
287 287
 }
@@ -289,16 +289,16 @@ void Folder::slotChildDestroyed(TreeNode* node)
289 289
 void Folder::slotDeleteExpiredArticles()
290 290
 {
291 291
     setNotificationMode(false);
292
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
293
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
292
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
293
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
294 294
         (*it)->slotDeleteExpiredArticles();
295 295
     setNotificationMode(true, true);
296 296
 }
297 297
 
298 298
 void Folder::slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchOnly)
299 299
 {
300
-    TQValueList<TreeNode*>::ConstIterator en = d->tqchildren.end();
301
-    for (TQValueList<TreeNode*>::ConstIterator it = d->tqchildren.begin(); it != en; ++it)
300
+    TQValueList<TreeNode*>::ConstIterator en = d->children.end();
301
+    for (TQValueList<TreeNode*>::ConstIterator it = d->children.begin(); it != en; ++it)
302 302
         (*it)->slotAddToFetchQueue(queue, intervalFetchOnly);
303 303
 }
304 304
 

+ 9
- 9
akregator/src/folder.h View File

@@ -61,18 +61,18 @@ namespace Akregator
61 61
 
62 62
             virtual bool accept(TreeNodeVisitor* visitor);
63 63
             
64
-            /** returns recursively concatenated articles of tqchildren  
65
-            @return an article sequence containing articles of tqchildren */
64
+            /** returns recursively concatenated articles of children  
65
+            @return an article sequence containing articles of children */
66 66
             virtual TQValueList<Article> articles(const TQString& tag=TQString());
67 67
 
68 68
             /** returns a list of all tags occurring in the subtree of this folder */
69 69
             virtual TQStringList tags() const;
70 70
             
71
-            /** returns the number of unread articles in all tqchildren    
71
+            /** returns the number of unread articles in all children    
72 72
             @return number of unread articles */
73 73
             virtual int unread() const;
74 74
             
75
-            /** returns the number of articles in all tqchildren
75
+            /** returns the number of articles in all children
76 76
             @return number of articles */
77 77
             virtual int totalCount() const;
78 78
             
@@ -86,10 +86,10 @@ namespace Akregator
86 86
             @return The newly created element representing this feed group */
87 87
             virtual TQDomElement toOPML( TQDomElement parent, TQDomDocument document ) const;
88 88
             
89
-            /** returns the (direct) tqchildren of this node.
89
+            /** returns the (direct) children of this node.
90 90
             @return a list of pointers to the child nodes
91 91
              */
92
-            virtual TQValueList<TreeNode*> tqchildren() const;
92
+            virtual TQValueList<TreeNode*> children() const;
93 93
             
94 94
             /** inserts @c node as child after child node @c after.
95 95
             if @c after is not a child of this group, @c node will be inserted as first child
@@ -105,7 +105,7 @@ namespace Akregator
105 105
             @param node the tree node to insert */
106 106
             virtual void appendChild(TreeNode* node);
107 107
 
108
-            /** remove @c node from tqchildren. Note that @c node will not be deleted
108
+            /** remove @c node from children. Note that @c node will not be deleted
109 109
             @param node the child node to remove  */
110 110
             virtual void removeChild(TreeNode* node);
111 111
 
@@ -134,7 +134,7 @@ namespace Akregator
134 134
             /** Delete expired articles recursively. */
135 135
             virtual void slotDeleteExpiredArticles();
136 136
             
137
-            /** Mark articles of tqchildren recursively as read. */
137
+            /** Mark articles of children recursively as read. */
138 138
             virtual void slotMarkAllArticlesAsRead();
139 139
  
140 140
             /** Called when a child was modified. 
@@ -147,7 +147,7 @@ namespace Akregator
147 147
             */
148 148
             virtual void slotChildDestroyed(TreeNode* node);
149 149
 
150
-            /** enqueues tqchildren recursively for fetching
150
+            /** enqueues children recursively for fetching
151 151
             @param queue a fetch queue 
152 152
             @param internvalFetchesOnly */
153 153
             virtual void slotAddToFetchQueue(FetchQueue* queue, bool intervalFetchesOnly=false);

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

@@ -51,7 +51,7 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co
51 51
     if (watchSignals) // e.g, articles tab has no part
52 52
     {
53 53
         connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &)));
54
-        connect(m_part, TQT_SIGNAL(seStatusBarText (const TQString &)), this, TQT_SLOT(seStatusText (const TQString &)));
54
+        connect(m_part, TQT_SIGNAL(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &)));
55 55
 
56 56
         KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p );
57 57
         if (ext)
@@ -120,7 +120,7 @@ void Frame::setCaption(const TQString &s)
120 120
     emit captionChanged(s);
121 121
 }
122 122
 
123
-void Frame::seStatusText(const TQString &s)
123
+void Frame::setStatusText(const TQString &s)
124 124
 {
125 125
     m_statusText=s;
126 126
     m_statusText.replace(TQRegExp("<[^>]*>"), "");
@@ -175,7 +175,7 @@ void Frame::setStarted()
175 175
 {
176 176
     if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID();
177 177
     m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString(), false);
178
-    m_progressItem->seStatus(i18n("Loading..."));
178
+    m_progressItem->setStatus(i18n("Loading..."));
179 179
     //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch()));
180 180
     m_state=Started;
181 181
     emit started();
@@ -184,7 +184,7 @@ void Frame::setStarted()
184 184
 void Frame::setCanceled(const TQString &s)
185 185
 {
186 186
     if(m_progressItem) {
187
-        m_progressItem->seStatus(i18n("Loading canceled"));
187
+        m_progressItem->setStatus(i18n("Loading canceled"));
188 188
         m_progressItem->setComplete();
189 189
         m_progressItem = 0;
190 190
     }
@@ -195,7 +195,7 @@ void Frame::setCanceled(const TQString &s)
195 195
 void Frame::setCompleted()
196 196
 {
197 197
     if(m_progressItem) {
198
-        m_progressItem->seStatus(i18n("Loading completed"));
198
+        m_progressItem->setStatus(i18n("Loading completed"));
199 199
         m_progressItem->setComplete();
200 200
         m_progressItem = 0;
201 201
     }

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

@@ -70,7 +70,7 @@ namespace Akregator
70 70
             void setProgress(int);
71 71
             void setCaption(const TQString &);
72 72
             void setTitle(const TQString &);
73
-            void seStatusText(const TQString &); 
73
+            void setStatusText(const TQString &); 
74 74
 
75 75
         signals:
76 76
             void captionChanged(const TQString &);

+ 3
- 3
akregator/src/kcursorsaver.h View File

@@ -17,9 +17,9 @@ namespace Akregator {
17 17
 class KCursorSaver : public TQt
18 18
 {
19 19
 public:
20
-    /// constructor taking TQCursor tqshapes
21
-    KCursorSaver(TQt::CursorShape tqshape) {
22
-        TQApplication::setOverrideCursor( TQCursor(tqshape) );
20
+    /// constructor taking TQCursor shapes
21
+    KCursorSaver(TQt::CursorShape shape) {
22
+        TQApplication::setOverrideCursor( TQCursor(shape) );
23 23
         inited = true;
24 24
     }
25 25
 

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

@@ -239,7 +239,7 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver
239 239
         name = email;
240 240
     
241 241
     if (!email.isNull())
242
-        return TQString("<a href=\"mailto:%1\">%2</a>").tqarg(email).tqarg(name);
242
+        return TQString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name);
243 243
     else
244 244
         return name;
245 245
 }

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

@@ -125,7 +125,7 @@ void ListTabWidget::slotRootNodeChanged(NodeListView* view, TreeNode* node)
125 125
     if (unread > 0)
126 126
     {
127 127
         //uncomment this to append unread count
128
-        //d->tabWidget->changeTab(view,  TQString("<qt>%1 (%2)").tqarg(d->captions[view]).tqarg(node->unread()));
128
+        //d->tabWidget->changeTab(view,  TQString("<qt>%1 (%2)").arg(d->captions[view]).arg(node->unread()));
129 129
         d->tabWidget->changeTab(view, d->captions[view]);
130 130
     }
131 131
     else

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

@@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid)
401 401
     return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0;
402 402
 }
403 403
 
404
-void FeedStorageMK4Impl::seStatus(const TQString& guid, int status)
404
+void FeedStorageMK4Impl::setStatus(const TQString& guid, int status)
405 405
 {
406 406
     int findidx = findArticle(guid);
407 407
     if (findidx == -1)
@@ -799,7 +799,7 @@ void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
799 799
     setHash(guid, source->hash(guid));
800 800
     setLink(guid, source->link(guid));
801 801
     setPubDate(guid, source->pubDate(guid));
802
-    seStatus(guid, source->status(guid));
802
+    setStatus(guid, source->status(guid));
803 803
     setTitle(guid, source->title(guid));
804 804
     setAuthor(guid, source->author(guid));
805 805
 

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

@@ -69,7 +69,7 @@ class FeedStorageMK4Impl : public FeedStorage
69 69
         virtual uint pubDate(const TQString& guid);
70 70
         virtual void setPubDate(const TQString& guid, uint pubdate);
71 71
         virtual int status(const TQString& guid);
72
-        virtual void seStatus(const TQString& guid, int status);
72
+        virtual void setStatus(const TQString& guid, int status);
73 73
         virtual TQString title(const TQString& guid);
74 74
         virtual void setTitle(const TQString& guid, const TQString& title);
75 75
         virtual TQString description(const TQString& guid);

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

@@ -996,9 +996,9 @@
996 996
     M-solaris.sh and M-dyn.sh scripts need to be manually edited when
997 997
     choosing between CC and gcc.
998 998
 
999
-2001-03-27    Double-tqalignment bug on Solaris
999
+2001-03-27    Double-alignment bug on Solaris
1000 1000
 
1001
-    Two changes (c4_Bytes in mk4.h and src/column.h) to fix an tqalignment
1001
+    Two changes (c4_Bytes in mk4.h and src/column.h) to fix an alignment
1002 1002
     problem for 8-byte doubles on Solaris.  This caused tests b17, b23,
1003 1003
     b24, s22, and s28 to fail.
1004 1004
 
@@ -1084,7 +1084,7 @@
1084 1084
 
1085 1085
 2000-10-03    Fixes for Alpha Unix
1086 1086
 
1087
-    Moved _item in column.h up to fix tqalignment sensitivity.  Config.h
1087
+    Moved _item in column.h up to fix alignment sensitivity.  Config.h
1088 1088
     did not get SIZE_LONG right on Alpha Unix (0?).
1089 1089
 
1090 1090
 2000-09-27    Contributed fixes and Python 2.0b2

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

@@ -40,7 +40,7 @@ WEBSITE URLS - The main pages on the world wide web, for news and downloads:
40 40
     License info:   http://www.equi4.com/mklicense.html
41 41
     Contact info:   http://www.equi4.com/contact.html
42 42
 
43
-ACKNOWLEDGEMENTS - Thanks to everyone who has helped tqshape and extend Metakit,
43
+ACKNOWLEDGEMENTS - Thanks to everyone who has helped shape and extend Metakit,
44 44
     including Kyrill Denisenko, Mark Roseman, Gordon McMillan, Matt Newman,
45 45
     Christian Tismer, John Bushakra, Steve Landers, Jacob Levy, John Barnard,
46 46
     Nicholas Riley, Brian Kelley, and many more people who have reported bugs

+ 1
- 1
akregator/src/mk4storage/metakit/src/column.h View File

@@ -169,7 +169,7 @@ private:
169 169
   tSetter _setter;
170 170
 
171 171
   union {
172
-  t4_byte _item[8]; // holds temp result (careful with tqalignment!)
172
+  t4_byte _item[8]; // holds temp result (careful with alignment!)
173 173
   double _aligner;  // needed for SPARC
174 174
   };
175 175
 

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

@@ -165,9 +165,9 @@ void NodeList::clear()
165 165
 {
166 166
     Q_ASSERT(rootNode());
167 167
     
168
-    TQValueList<TreeNode*> tqchildren = rootNode()->tqchildren();
168
+    TQValueList<TreeNode*> children = rootNode()->children();
169 169
 
170
-    for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
170
+    for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it)
171 171
         delete *it; // emits signal "emitSignalDestroyed"
172 172
 }
173 173
 

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

@@ -76,7 +76,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds)
76 76
     if (feeds.count() == 1)
77 77
     {
78 78
         KNotifyClient::Instance inst(m_instance);
79
-        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").tqarg(feeds[0]));
79
+        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").arg(feeds[0]));
80 80
     }
81 81
     else if (feeds.count() > 1)
82 82
     {
@@ -84,7 +84,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds)
84 84
         for (TQStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it)
85 85
             message += *it + "\n";
86 86
         KNotifyClient::Instance inst(m_instance);
87
-        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").tqarg(message));
87
+        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message));
88 88
     }
89 89
 }
90 90
 
@@ -99,7 +99,7 @@ void NotificationManager::doNotify()
99 99
         if (feedTitle != (*it).feed()->title())
100 100
         {
101 101
             feedTitle = (*it).feed()->title();
102
-            message += TQString("<p><b>%1:</b></p>").tqarg(feedTitle);
102
+            message += TQString("<p><b>%1:</b></p>").arg(feedTitle);
103 103
         }
104 104
         message += (*it).title() + "<br>";
105 105
     }

+ 8
- 8
akregator/src/pluginmanager.cpp View File

@@ -92,8 +92,8 @@ PluginManager::createFromService( const KService::Ptr service )
92 92
     if ( !lib ) {
93 93
         KMessageBox::error( 0, i18n( "<p>KLibLoader could not load the plugin:<br/><i>%1</i></p>"
94 94
                                      "<p>Error message:<br/><i>%2</i></p>" )
95
-                               .tqarg( service->library() )
96
-                               .tqarg( loader->lastErrorMessage() ) );
95
+                               .arg( service->library() )
96
+                               .arg( loader->lastErrorMessage() ) );
97 97
         return 0;
98 98
     }
99 99
     //look up address of init function and cast it to pointer-to-function
@@ -167,12 +167,12 @@ PluginManager::showAbout( const TQString &constraint )
167 167
 
168 168
     TQString str  = "<html><body><table width=\"100%\" border=\"1\">";
169 169
 
170
-    str += body.tqarg( i18n( "Name" ),                s->name() );
171
-    str += body.tqarg( i18n( "Library" ),             s->library() );
172
-    str += body.tqarg( i18n( "Authors" ),             s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) );
173
-    str += body.tqarg( i18n( "Email" ),               s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) );
174
-    str += body.tqarg( i18n( "Version" ),             s->property( "X-KDE-akregator-version" ).toString() );
175
-    str += body.tqarg( i18n( "Framework Version" ),   s->property( "X-KDE-akregator-framework-version" ).toString() );
170
+    str += body.arg( i18n( "Name" ),                s->name() );
171
+    str += body.arg( i18n( "Library" ),             s->library() );
172
+    str += body.arg( i18n( "Authors" ),             s->property( "X-KDE-akregator-authors" ).toStringList().join( "\n" ) );
173
+    str += body.arg( i18n( "Email" ),               s->property( "X-KDE-akregator-email" ).toStringList().join( "\n" ) );
174
+    str += body.arg( i18n( "Version" ),             s->property( "X-KDE-akregator-version" ).toString() );
175
+    str += body.arg( i18n( "Framework Version" ),   s->property( "X-KDE-akregator-framework-version" ).toString() );
176 176
 
177 177
     str += "</table></body></html>";
178 178
 

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

@@ -178,7 +178,7 @@ void ProgressItemHandler::slotFetchCompleted()
178 178
 {
179 179
     if (d->progressItem)
180 180
     {
181
-        d->progressItem->seStatus(i18n("Fetch completed"));
181
+        d->progressItem->setStatus(i18n("Fetch completed"));
182 182
         d->progressItem->setComplete();
183 183
         d->progressItem = 0;
184 184
     }
@@ -188,7 +188,7 @@ void ProgressItemHandler::slotFetchError()
188 188
 {
189 189
     if (d->progressItem)
190 190
     {
191
-        d->progressItem->seStatus(i18n("Fetch error"));
191
+        d->progressItem->setStatus(i18n("Fetch error"));
192 192
         d->progressItem->setComplete();
193 193
         d->progressItem = 0;
194 194
     }
@@ -198,7 +198,7 @@ void ProgressItemHandler::slotFetchAborted()
198 198
 {
199 199
     if (d->progressItem)
200 200
     {
201
-        d->progressItem->seStatus(i18n("Fetch aborted"));
201
+        d->progressItem->setStatus(i18n("Fetch aborted"));
202 202
         d->progressItem->setComplete();
203 203
         d->progressItem = 0;
204 204
     }

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

@@ -102,7 +102,7 @@ void FeedPropertiesDialog::slotSetCaption(const TQString& c)
102 102
     if(c.isEmpty())
103 103
         setCaption(i18n("Feed Properties"));
104 104
     else
105
-        setCaption(i18n("Properties of %1").tqarg(c));
105
+        setCaption(i18n("Properties of %1").arg(c));
106 106
 
107 107
 }
108 108
 

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

@@ -102,9 +102,9 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor
102 102
     virtual bool visitFolder(Folder* node)
103 103
     {
104 104
         visitTreeNode(node);
105
-        TQValueList<TreeNode*> tqchildren = node->tqchildren();
105
+        TQValueList<TreeNode*> children = node->children();
106 106
         m_view->d->nodeToItem[node]->setExpandable(true);
107
-        for (TQValueList<TreeNode*>::ConstIterator it = tqchildren.begin(); it != tqchildren.end(); ++it)
107
+        for (TQValueList<TreeNode*>::ConstIterator it = children.begin(); it != children.end(); ++it)
108 108
              createItems(*it);
109 109
         return true;
110 110
     }

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

@@ -162,7 +162,7 @@ void TagNode::slotMarkAllArticlesAsRead()
162 162
     setNotificationMode(false);
163 163
     TQValueList<Article>::Iterator en = d->articles.end();
164 164
     for (TQValueList<Article>::Iterator it = d->articles.begin(); it != en; ++it)
165
-        (*it).seStatus(Article::Read);
165
+        (*it).setStatus(Article::Read);
166 166
     setNotificationMode(true);
167 167
 }
168 168
     

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

@@ -93,23 +93,23 @@ TreeNode* TreeNode::nextSibling() const
93 93
 {
94 94
     if (!d->parent)
95 95
         return 0;
96
-    TQValueList<TreeNode*> tqchildren = d->parent->tqchildren();
96
+    TQValueList<TreeNode*> children = d->parent->children();
97 97
     TreeNode* me = (TreeNode*)this;
98 98
         
99
-    int idx = tqchildren.findIndex(me);
99
+    int idx = children.findIndex(me);
100 100
     
101
-    return idx+1 < tqchildren.size() ? *(tqchildren.at(idx+1)) : 0L;
101
+    return idx+1 < children.size() ? *(children.at(idx+1)) : 0L;
102 102
 }
103 103
 
104 104
 TreeNode* TreeNode::prevSibling() const
105 105
 {
106 106
     if (!d->parent)
107 107
         return 0;
108
-    TQValueList<TreeNode*> tqchildren = d->parent->tqchildren();
108
+    TQValueList<TreeNode*> children = d->parent->children();
109 109
     TreeNode* me = (TreeNode*)this;
110 110
     
111
-    int idx = tqchildren.findIndex(me);
112
-    return idx > 0 ? *(d->parent->tqchildren().at(idx-1)) : 0L;
111
+    int idx = children.findIndex(me);
112
+    return idx > 0 ? *(d->parent->children().at(idx-1)) : 0L;
113 113
 }
114 114
 
115 115
 Folder* TreeNode::parent() const

+ 6
- 6
certmanager/certificateinfowidgetimpl.cpp View File

@@ -126,7 +126,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key  ) {
126 126
 
127 127
   TQListViewItem * item = 0;
128 128
   item = new TQListViewItem( listView, item, i18n("Valid"), TQString("From %1 to %2")
129
-			    .tqarg( time_t2string( key.subkey(0).creationTime() ),
129
+			    .arg( time_t2string( key.subkey(0).creationTime() ),
130 130
 				  time_t2string( key.subkey(0).expirationTime() ) ) );
131 131
   item = new TQListViewItem( listView, item, i18n("Can be used for signing"),
132 132
 			    key.canSign() ? i18n("Yes") : i18n("No") );
@@ -187,7 +187,7 @@ static void showChainListError( TQWidget * parent, const GpgME::Error & err, con
187 187
   const TQString msg = i18n("<qt><p>An error occurred while fetching "
188 188
 			   "the certificate <b>%1</b> from the backend:</p>"
189 189
 			   "<p><b>%2</b></p></qt>")
190
-    .tqarg( subject ? TQString::fromUtf8( subject ) : TQString(),
190
+    .arg( subject ? TQString::fromUtf8( subject ) : TQString(),
191 191
 	  TQString::fromLocal8Bit( err.asString() ) );
192 192
   KMessageBox::error( parent, msg, i18n("Certificate Listing Failed" ) );
193 193
 }
@@ -266,7 +266,7 @@ void CertificateInfoWidgetImpl::startCertificateDump() {
266 266
                     this, TQT_SLOT( slotDumpProcessExited(KProcess*) ) );
267 267
 
268 268
   if ( !proc->start( KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdout | KProcess::Stderr) ) ) {
269
-    TQString wmsg = i18n("Failed to execute gpgsm:\n%1").tqarg( i18n( "program not found" ) );
269
+    TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) );
270 270
     dumpView->setText( TQStyleSheet::escape( wmsg ) );
271 271
     delete proc;
272 272
   }
@@ -294,9 +294,9 @@ void CertificateInfoWidgetImpl::slotDumpProcessExited(KProcess* proc) {
294 294
     {
295 295
       TQString wmsg = i18n("Failed to execute gpgsm:\n%1");
296 296
       if ( rc == -1 )
297
-        wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
297
+        wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
298 298
       else
299
-        wmsg = wmsg.tqarg( strerror(rc) );
299
+        wmsg = wmsg.arg( strerror(rc) );
300 300
       dumpView->setText( TQStyleSheet::escape( wmsg ) );
301 301
     }
302 302
   }
@@ -328,7 +328,7 @@ void CertificateInfoWidgetImpl::updateChainView() {
328 328
     item = new TQListViewItem( pathView, Kleo::DN( (*it++).userID(0).id() ).prettyDN() );
329 329
   else {
330 330
     item = new TQListViewItem( pathView, i18n("Issuer certificate not found ( %1)")
331
-			      .tqarg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
331
+			      .arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
332 332
     item->setOpen( true ); // TQt bug: doesn't open after setEnabled( false ) :/
333 333
     item->setEnabled( false );
334 334
   }

+ 4
- 4
certmanager/certificatewizard.ui View File

@@ -82,7 +82,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
82 82
                 <property name="text">
83 83
                     <string>On this page, you will configure the cryptographic key length and the type of certificate to create.</string>
84 84
                 </property>
85
-                <property name="tqalignment">
85
+                <property name="alignment">
86 86
                     <set>WordBreak|AlignVCenter</set>
87 87
                 </property>
88 88
             </widget>
@@ -226,7 +226,7 @@ The key pair will be generated in a decentralized manner. Please contact your lo
226 226
                 <property name="text">
227 227
                     <string>On this page, you will enter some personal data that will be stored in your certificate and that will help other people to determine that it is actually you who is sending a message.</string>
228 228
                 </property>
229
-                <property name="tqalignment">
229
+                <property name="alignment">
230 230
                     <set>WordBreak|AlignVCenter</set>
231 231
                 </property>
232 232
             </widget>
@@ -322,7 +322,7 @@ Once you are done with your settings, click
322 322
 a kmail composer will be opened; you can add detailed information for the CA
323 323
 there.&lt;/p&gt;&lt;qt&gt;</string>
324 324
                 </property>
325
-                <property name="tqalignment">
325
+                <property name="alignment">
326 326
                     <set>WordBreak|AlignVCenter</set>
327 327
                 </property>
328 328
             </widget>
@@ -485,7 +485,7 @@ Your key pair has now been created and stored locally. The corresponding certifi
485 485
 If you want to change anything, press Back and make your changes; otherwise, press Finish to send the certificate request to the CA.
486 486
 &lt;/qt&gt;</string>
487 487
                 </property>
488
-                <property name="tqalignment">
488
+                <property name="alignment">
489 489
                     <set>WordBreak|AlignVCenter</set>
490 490
                 </property>
491 491
             </widget>

+ 7
- 7
certmanager/certificatewizardimpl.cpp View File

@@ -88,10 +88,10 @@ static TQString attributeLabel( const TQString & attr, bool required ) {
88 88
   if ( !label.isEmpty() )
89 89
     if ( required )
90 90
       return i18n("Format string for the labels in the \"Your Personal Data\" page - required field",
91
-		  "*%1 (%2):").tqarg( label, attr );
91
+		  "*%1 (%2):").arg( label, attr );
92 92
     else
93 93
       return i18n("Format string for the labels in the \"Your Personal Data\" page",
94
-		  "%1 (%2):").tqarg( label, attr );
94
+		  "%1 (%2):").arg( label, attr );
95 95
 
96 96
   else if ( required )
97 97
     return '*' + attr + ':';
@@ -196,7 +196,7 @@ void CertificateWizardImpl::slotGenerateCertificate()
196 196
     TQString certParms;
197 197
     certParms += "<GnupgKeyParms format=\"internal\">\n";
198 198
     certParms += "Key-Type: RSA\n";
199
-    certParms += TQString( "Key-Length: %1\n" ).tqarg( keyLengths[keyLengthCB->currentItem()] );
199
+    certParms += TQString( "Key-Length: %1\n" ).arg( keyLengths[keyLengthCB->currentItem()] );
200 200
     certParms += "Key-Usage: ";
201 201
     if ( signOnlyCB->isChecked() )
202 202
       certParms += "Sign";
@@ -255,7 +255,7 @@ void CertificateWizardImpl::slotGenerateCertificate()
255 255
     if ( err )
256 256
       KMessageBox::error( this,
257 257
 			  i18n( "Could not start certificate generation: %1" )
258
-			  .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
258
+			  .arg( TQString::fromLocal8Bit( err.asString() ) ),
259 259
 			  i18n( "Certificate Manager Error" ) );
260 260
     else {
261 261
       generatePB->setEnabled( false );
@@ -278,7 +278,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res,
278 278
 	  if ( !res.error().isCanceled() )
279 279
 	    KMessageBox::error( this,
280 280
 				i18n( "Could not generate certificate: %1" )
281
-				.tqarg( TQString::fromLatin1( res.error().asString() ) ),
281
+				.arg( TQString::fromLatin1( res.error().asString() ) ),
282 282
 				i18n( "Certificate Manager Error" ) );
283 283
     } else {
284 284
         // next will stay enabled until the user clicks Generate
@@ -434,7 +434,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
434 434
   if ( result != 0 ) {
435 435
     kdDebug() << "Couldn't connect to KMail\n";
436 436
     KMessageBox::error( this,
437
-                        i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).tqarg( error ) );
437
+                        i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).arg( error ) );
438 438
     return;
439 439
   }
440 440
 
@@ -481,7 +481,7 @@ void CertificateWizardImpl::accept()
481 481
       if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(
482 482
                                                                      this,
483 483
                                                                      i18n( "A file named \"%1\" already exists. "
484
-                                                                           "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
484
+                                                                           "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
485 485
                                                                      i18n( "Overwrite File?" ),
486 486
                                                                      i18n( "&Overwrite" ) ) )
487 487
         return;

+ 29
- 29
certmanager/certmanager.cpp View File

@@ -523,7 +523,7 @@ void CertManager::slotRefreshKeysResult( const GpgME::Error & err ) {
523 523
     return;
524 524
   if ( err )
525 525
     KMessageBox::error( this, i18n("An error occurred while trying to refresh "
526
-				   "keys:\n%1").tqarg( TQString::fromLocal8Bit( err.asString() ) ),
526
+				   "keys:\n%1").arg( TQString::fromLocal8Bit( err.asString() ) ),
527 527
 			i18n("Refreshing Keys Failed") );
528 528
 }
529 529
 
@@ -532,7 +532,7 @@ static void showKeyListError( TQWidget * parent, const GpgME::Error & err ) {
532 532
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
533 533
 			    "the certificates from the backend:</p>"
534 534
 			    "<p><b>%1</b></p></qt>" )
535
-    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
535
+    .arg( TQString::fromLocal8Bit( err.asString() ) );
536 536
 
537 537
   KMessageBox::error( parent, msg, i18n( "Certificate Listing Failed" ) );
538 538
 }
@@ -705,8 +705,8 @@ static void showCertificateDownloadError( TQWidget * parent, const GpgME::Error
705 705
   const TQString msg = i18n( "<qt><p>An error occurred while trying "
706 706
 			    "to download the certificate %1:</p>"
707 707
 			    "<p><b>%2</b></p></qt>" )
708
-                      .tqarg( certDisplayName )
709
-                      .tqarg( TQString::fromLocal8Bit( err.asString() ) );
708
+                      .arg( certDisplayName )
709
+                      .arg( TQString::fromLocal8Bit( err.asString() ) );
710 710
 
711 711
   KMessageBox::error( parent, msg, i18n( "Certificate Download Failed" ) );
712 712
 }
@@ -773,8 +773,8 @@ static void showCertificateImportError( TQWidget * parent, const GpgME::Error &
773 773
   const TQString msg = i18n( "<qt><p>An error occurred while trying "
774 774
 			    "to import the certificate %1:</p>"
775 775
 			    "<p><b>%2</b></p></qt>" )
776
-                      .tqarg( certDisplayName )
777
-                      .tqarg( TQString::fromLocal8Bit( err.asString() ) );
776
+                      .arg( certDisplayName )
777
+                      .arg( TQString::fromLocal8Bit( err.asString() ) );
778 778
   KMessageBox::error( parent, msg, i18n( "Certificate Import Failed" ) );
779 779
 }
780 780
 
@@ -810,50 +810,50 @@ void CertManager::slotCertificateImportResult( const GpgME::ImportResult & res )
810 810
     const TQString boldLine = i18n("<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>");
811 811
 
812 812
     TQStringList lines;
813
-    lines.push_back( normalLine.tqarg( i18n("Total number processed:"),
813
+    lines.push_back( normalLine.arg( i18n("Total number processed:"),
814 814
 				     TQString::number( res.numConsidered() ) ) );
815
-    lines.push_back( normalLine.tqarg( i18n("Imported:"),
815
+    lines.push_back( normalLine.arg( i18n("Imported:"),
816 816
 				     TQString::number( res.numImported() ) ) );
817 817
     if ( res.newSignatures() )
818
-      lines.push_back( normalLine.tqarg( i18n("New signatures:"),
818
+      lines.push_back( normalLine.arg( i18n("New signatures:"),
819 819
 				       TQString::number( res.newSignatures() ) ) );
820 820
     if ( res.newUserIDs() )
821
-      lines.push_back( normalLine.tqarg( i18n("New user IDs:"),
821
+      lines.push_back( normalLine.arg( i18n("New user IDs:"),
822 822
 				       TQString::number( res.newUserIDs() ) ) );
823 823
     if ( res.numKeysWithoutUserID() )
824
-      lines.push_back( normalLine.tqarg( i18n("Keys without user IDs:"),
824
+      lines.push_back( normalLine.arg( i18n("Keys without user IDs:"),
825 825
 				       TQString::number( res.numKeysWithoutUserID() ) ) );
826 826
     if ( res.newSubkeys() )
827
-      lines.push_back( normalLine.tqarg( i18n("New subkeys:"),
827
+      lines.push_back( normalLine.arg( i18n("New subkeys:"),
828 828
 				       TQString::number( res.newSubkeys() ) ) );
829 829
     if ( res.newRevocations() )
830
-      lines.push_back( boldLine.tqarg( i18n("Newly revoked:"),
830
+      lines.push_back( boldLine.arg( i18n("Newly revoked:"),
831 831
 				     TQString::number( res.newRevocations() ) ) );
832 832
     if ( res.notImported() )
833
-      lines.push_back( boldLine.tqarg( i18n("Not imported:"),
833
+      lines.push_back( boldLine.arg( i18n("Not imported:"),
834 834
 				     TQString::number( res.notImported() ) ) );
835 835
     if ( res.numUnchanged() )
836
-      lines.push_back( normalLine.tqarg( i18n("Unchanged:"),
836
+      lines.push_back( normalLine.arg( i18n("Unchanged:"),
837 837
 				       TQString::number( res.numUnchanged() ) ) );
838 838
     if ( res.numSecretKeysConsidered() )
839
-      lines.push_back( normalLine.tqarg( i18n("Secret keys processed:"),
839
+      lines.push_back( normalLine.arg( i18n("Secret keys processed:"),
840 840
 				       TQString::number( res.numSecretKeysConsidered() ) ) );
841 841
     if ( res.numSecretKeysImported() )
842
-      lines.push_back( normalLine.tqarg( i18n("Secret keys imported:"),
842
+      lines.push_back( normalLine.arg( i18n("Secret keys imported:"),
843 843
 				       TQString::number( res.numSecretKeysImported() ) ) );
844 844
     if ( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() > 0 )
845
-      lines.push_back( boldLine.tqarg( i18n("Secret keys <em>not</em> imported:"),
845
+      lines.push_back( boldLine.arg( i18n("Secret keys <em>not</em> imported:"),
846 846
 				     TQString::number( res.numSecretKeysConsidered()
847 847
 						      - res.numSecretKeysImported()
848 848
 						      - res.numSecretKeysUnchanged() ) ) );
849 849
     if ( res.numSecretKeysUnchanged() )
850
-      lines.push_back( normalLine.tqarg( i18n("Secret keys unchanged:"),
850
+      lines.push_back( normalLine.arg( i18n("Secret keys unchanged:"),
851 851
 				       TQString::number( res.numSecretKeysUnchanged() ) ) );
852 852
 
853 853
     KMessageBox::information( this,
854 854
 			      i18n( "<qt><p>Detailed results of importing %1:</p>"
855 855
 				    "<table>%2</table></qt>" )
856
-			      .tqarg( displayName ).tqarg( lines.join( TQString() ) ),
856
+			      .arg( displayName ).arg( lines.join( TQString() ) ),
857 857
 			      i18n( "Certificate Import Result" ) );
858 858
 
859 859
     disconnectJobFromStatusBarProgress( res.error() );
@@ -875,7 +875,7 @@ void CertManager::slotDirmngrExited() {
875 875
     if ( !mDirmngrProc->normalExit() )
876 876
         KMessageBox::error( this, i18n( "The GpgSM process that tried to import the CRL file ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) );
877 877
     else if ( mDirmngrProc->exitStatus() )
878
-      KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
878
+      KMessageBox::error( this, i18n( "An error occurred when trying to import the CRL file. The output from GpgSM was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
879 879
     else
880 880
       KMessageBox::information( this, i18n( "CRL file imported successfully." ), i18n( "Certificate Manager Information" ) );
881 881
 
@@ -935,7 +935,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces
935 935
            this, TQT_SLOT(slotStderr(KProcess*,char*,int)) );
936 936
   if( !mDirmngrProc->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
937 937
     delete mDirmngrProc; mDirmngrProc = 0;
938
-    KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).tqarg( processname ), i18n( "Certificate Manager Error" ) );
938
+    KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) );
939 939
     return false;
940 940
   }
941 941
   return true;
@@ -992,7 +992,7 @@ void CertManager::slotClearCRLsResult() {
992 992
   if ( !mDirmngrProc->normalExit() )
993 993
     KMessageBox::error( this, i18n( "The DirMngr process that tried to clear the CRL cache ended prematurely because of an unexpected error." ), i18n( "Certificate Manager Error" ) );
994 994
   else if ( mDirmngrProc->exitStatus() )
995
-    KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").tqarg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
995
+    KMessageBox::error( this, i18n( "An error occurred when trying to clear the CRL cache. The output from DirMngr was:\n%1").arg( mErrorbuffer ), i18n( "Certificate Manager Error" ) );
996 996
   else
997 997
     KMessageBox::information( this, i18n( "CRL cache cleared successfully." ), i18n( "Certificate Manager Information" ) );
998 998
   delete mDirmngrProc; mDirmngrProc = 0;
@@ -1003,7 +1003,7 @@ static void showDeleteError( TQWidget * parent, const GpgME::Error & err ) {
1003 1003
   const TQString msg = i18n("<qt><p>An error occurred while trying to delete "
1004 1004
 			   "the certificates:</p>"
1005 1005
 			   "<p><b>%1</b></p></qt>")
1006
-    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
1006
+    .arg( TQString::fromLocal8Bit( err.asString() ) );
1007 1007
   KMessageBox::error( parent, msg, i18n("Certificate Deletion Failed") );
1008 1008
 }
1009 1009
 
@@ -1076,7 +1076,7 @@ void CertManager::slotDeleteCertificate() {
1076 1076
   const TQString msg = keysToDelete.size() > keys.size()
1077 1077
     ? i18n("Do you really want to delete this certificate and the %1 certificates it certified?",
1078 1078
 	   "Do you really want to delete these %n certificates and the %1 certificates they certified?",
1079
-	   keys.size() ).tqarg( keysToDelete.size() - keys.size() )
1079
+	   keys.size() ).arg( keysToDelete.size() - keys.size() )
1080 1080
     : i18n("Do you really want to delete this certificate?",
1081 1081
 	   "Do you really want to delete these %n certificates?", keys.size() ) ;
1082 1082
 
@@ -1098,7 +1098,7 @@ void CertManager::slotDeleteCertificate() {
1098 1098
                           "the certificates:</p>"
1099 1099
                           "<p><b>%1</b><p></qt>" );
1100 1100
     KMessageBox::error( this,
1101
-			str.tqarg( i18n("Operation not supported by the backend.") ),
1101
+			str.arg( i18n("Operation not supported by the backend.") ),
1102 1102
 			i18n("Certificate Deletion Failed") );
1103 1103
   }
1104 1104
 
@@ -1206,7 +1206,7 @@ static void showCertificateExportError( TQWidget * parent, const GpgME::Error &
1206 1206
   const TQString msg = i18n("<qt><p>An error occurred while trying to export "
1207 1207
 			   "the certificate:</p>"
1208 1208
 			   "<p><b>%1</b></p></qt>")
1209
-    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
1209
+    .arg( TQString::fromLocal8Bit( err.asString() ) );
1210 1210
   KMessageBox::error( parent, msg, i18n("Certificate Export Failed") );
1211 1211
 }
1212 1212
 
@@ -1239,7 +1239,7 @@ static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w )
1239 1239
          KMessageBox::warningContinueCancel(
1240 1240
                                             w,
1241 1241
                                             i18n( "A file named \"%1\" already exists. "
1242
-                                                  "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
1242
+                                                  "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
1243 1243
                                             i18n( "Overwrite File?" ),
1244 1244
                                             i18n( "&Overwrite" ) ) )
1245 1245
       return false;
@@ -1301,7 +1301,7 @@ static void showSecretKeyExportError( TQWidget * parent, const GpgME::Error & er
1301 1301
   const TQString msg = i18n("<qt><p>An error occurred while trying to export "
1302 1302
 			   "the secret key:</p>"
1303 1303
 			   "<p><b>%1</b></p></qt>")
1304
-    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
1304
+    .arg( TQString::fromLocal8Bit( err.asString() ) );
1305 1305
   KMessageBox::error( parent, msg, i18n("Secret-Key Export Failed") );
1306 1306
 }
1307 1307
 

+ 1
- 1
certmanager/certmanager.h View File

@@ -137,7 +137,7 @@ private slots:
137 137
     void slotConfigureGpgME();
138 138
     void slotContextMenu(Kleo::KeyListViewItem*, const TQPoint& point);
139 139
     void slotDropped(const KURL::List&);
140
-    /** Schedule a tqrepaint for the listview items. E.g. when the
140
+    /** Schedule a repaint for the listview items. E.g. when the
141 141
 	colour config has changed */
142 142
     void slotRepaint();
143 143
     /** Schedule a validating keylisting for the selected items (or

+ 11
- 11
certmanager/conf/appearanceconfigwidget.cpp View File

@@ -139,7 +139,7 @@ private:
139 139
     setText( 0, name );
140 140
   }
141 141
 
142
-  void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
142
+  void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
143 143
 
144 144
 private:
145 145
   TQColor mForegroundColor, mBackgroundColor;
@@ -152,7 +152,7 @@ private:
152 152
   bool mDirty;
153 153
 };
154 154
 
155
-void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
155
+void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
156 156
   TQColorGroup _cg = cg;
157 157
   TQFont font = p->font();
158 158
   if ( mHasFont )
@@ -172,7 +172,7 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in
172 172
   if ( mBackgroundColor.isValid() )
173 173
     _cg.setColor( TQColorGroup::Base, mBackgroundColor );
174 174
 
175
-  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
175
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
176 176
 }
177 177
 
178 178
 ////
@@ -227,7 +227,7 @@ void AppearanceConfigWidget::slotDefaultClicked()
227 227
   if ( !item )
228 228
     return;
229 229
   item->setDefaultAppearance();
230
-  item->tqrepaint();
230
+  item->repaint();
231 231
   slotSelectionChanged( item );
232 232
   emit changed();
233 233
 }
@@ -280,7 +280,7 @@ void AppearanceConfigWidget::slotForegroundClicked() {
280 280
   int result = KColorDialog::getColor( fg );
281 281
   if ( result == KColorDialog::Accepted ) {
282 282
     item->setForegroundColor( fg );
283
-    item->tqrepaint();
283
+    item->repaint();
284 284
     emit changed();
285 285
   }
286 286
 }
@@ -294,7 +294,7 @@ void AppearanceConfigWidget::slotBackgroundClicked() {
294 294
   int result = KColorDialog::getColor( bg );
295 295
   if ( result == KColorDialog::Accepted ) {
296 296
     item->setBackgroundColor( bg );
297
-    item->tqrepaint();
297
+    item->repaint();
298 298
     emit changed();
299 299
   }
300 300
 }
@@ -308,7 +308,7 @@ void AppearanceConfigWidget::slotFontClicked() {
308 308
   int result = KFontDialog::getFont( font );
309 309
   if ( result == KFontDialog::Accepted ) {
310 310
     item->setFont( font );
311
-    item->tqrepaint();
311
+    item->repaint();
312 312
     emit changed();
313 313
   }
314 314
 }
@@ -320,7 +320,7 @@ void AppearanceConfigWidget::defaults()
320 320
   for ( ; lvit.current() ; ++lvit ) {
321 321
     CategoryListViewItem* item = static_cast<CategoryListViewItem *>( lvit.current() );
322 322
     item->setDefaultAppearance();
323
-    item->tqrepaint();
323
+    item->repaint();
324 324
   }
325 325
   emit changed();
326 326
 }
@@ -330,7 +330,7 @@ void AppearanceConfigWidget::slotItalicClicked()
330 330
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
331 331
   if ( item ) {
332 332
     item->toggleItalic();
333
-    item->tqrepaint();
333
+    item->repaint();
334 334
     emit changed();
335 335
   }
336 336
 }
@@ -340,7 +340,7 @@ void AppearanceConfigWidget::slotBoldClicked()
340 340
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
341 341
   if ( item ) {
342 342
     item->toggleBold();
343
-    item->tqrepaint();
343
+    item->repaint();
344 344
     emit changed();
345 345
   }
346 346
 }
@@ -350,7 +350,7 @@ void AppearanceConfigWidget::slotStrikeoutClicked()
350 350
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
351 351
   if ( item ) {
352 352
     item->toggleStrikeout();
353
-    item->tqrepaint();
353
+    item->repaint();
354 354
     emit changed();
355 355
   }
356 356
 }

+ 6
- 6
certmanager/conf/configuredialog.cpp View File

@@ -52,9 +52,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
52 52
   // the KCMultiDialog starts with the size of the first kcm, not
53 53
   // the largest one. This way at least after the first showing of
54 54
   // the largest kcm the size is kept.
55
-  const KConfigGroup tqgeometry( KGlobal::config(), "Geometry" );
56
-  const int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" );
57
-  const int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" );
55
+  const KConfigGroup geometry( KGlobal::config(), "Geometry" );
56
+  const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
57
+  const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
58 58
   if ( width != 0 && height != 0 ) {
59 59
      setMinimumSize( width, height );
60 60
   }
@@ -62,9 +62,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
62 62
 }
63 63
 
64 64
 void ConfigureDialog::hideEvent( TQHideEvent * ) {
65
-  KConfigGroup tqgeometry( KGlobal::config(), "Geometry" );
66
-  tqgeometry.writeEntry( "ConfigureDialogWidth", width() );
67
-  tqgeometry.writeEntry( "ConfigureDialogHeight",height() );
65
+  KConfigGroup geometry( KGlobal::config(), "Geometry" );
66
+  geometry.writeEntry( "ConfigureDialogWidth", width() );
67
+  geometry.writeEntry( "ConfigureDialogHeight",height() );
68 68
 }
69 69
 
70 70
 ConfigureDialog::~ConfigureDialog() {

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

@@ -283,11 +283,11 @@ Kleo::CryptoConfigEntry* DirectoryServicesConfigurationPage::configEntry( const
283 283
 {
284 284
     Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName );
285 285
     if ( !entry ) {
286
-        KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) );
286
+        KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) );
287 287
         return 0;
288 288
     }
289 289
     if( entry->argType() != argType || entry->isList() != isList ) {
290
-        KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) );
290
+        KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) );
291 291
         return 0;
292 292
     }
293 293
     return entry;

+ 1
- 1
certmanager/hierarchyanalyser.cpp View File

@@ -69,7 +69,7 @@ const std::vector<GpgME::Key> & HierarchyAnalyser::subjectsForIssuer( const char
69 69
 
70 70
 std::vector<GpgME::Key> HierarchyAnalyser::subjectsForIssuerRecursive( const char * issuer_dn ) const {
71 71
   std::vector<GpgME::Key> keys = subjectsForIssuer( issuer_dn );
72
-  for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would tqinvalidate them
72
+  for ( unsigned int i = 0 ; i < keys.size() ; ++i ) // can't use iterators here, since appending would invalidate them
73 73
     if ( const char * fpr = keys[i].primaryFingerprint() ) {
74 74
       const std::vector<GpgME::Key> & tmp = subjectsForIssuer( fpr );
75 75
       std::copy( tmp.begin(), tmp.end(), std::back_inserter( keys ) );

+ 5
- 5
certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp View File

@@ -90,7 +90,7 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
90 90
 void KWatchGnuPGMainWindow::slotClear()
91 91
 {
92 92
   mCentralWidget->clear();
93
-  mCentralWidget->append( tqtr("[%1] Log cleared").tqarg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
93
+  mCentralWidget->append( tqtr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
94 94
 }
95 95
 
96 96
 void KWatchGnuPGMainWindow::createActions()
@@ -135,7 +135,7 @@ void KWatchGnuPGMainWindow::startWatcher()
135 135
 	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
136 136
 	}
137 137
 	mCentralWidget->append(tqtr("[%1] Log stopped")
138
-						   .tqarg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
138
+						   .arg( TQDateTime::currentDateTime().toString(Qt::ISODate)));
139 139
   }
140 140
   mWatcher->clearArguments();
141 141
   KConfig* config = kapp->config();
@@ -148,7 +148,7 @@ void KWatchGnuPGMainWindow::startWatcher()
148 148
 	KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) );
149 149
   } else {
150 150
 	mCentralWidget->append( tqtr("[%1] Log started")
151
-							.tqarg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
151
+							.arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) );
152 152
   }
153 153
   connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
154 154
 		   this, TQT_SLOT( slotWatcherExited() ) );
@@ -176,7 +176,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
176 176
 		entry->setStringValue( TQString("socket://")+
177 177
 							   config->readEntry("Socket",
178 178
 												 WATCHGNUPGSOCKET ));
179
-		logclients << TQString("%1 (%2)").tqarg(*it).tqarg(comp->description());
179
+		logclients << TQString("%1 (%2)").arg(*it).arg(comp->description());
180 180
 	  }
181 181
 	  entry = group->entry("debug-level");
182 182
 	  if( entry ) {
@@ -237,7 +237,7 @@ void KWatchGnuPGMainWindow::slotSaveAs()
237 237
 	if( KMessageBox::Yes !=
238 238
 		KMessageBox::warningYesNo( this, i18n("The file named \"%1\" already "
239 239
 											  "exists. Are you sure you want "
240
-											  "to overwrite it?").tqarg(filename),
240
+											  "to overwrite it?").arg(filename),
241 241
 								   i18n("Overwrite File"), i18n("Overwrite"), KStdGuiItem::cancel() ) ) {
242 242
 	  return;
243 243
 	}

+ 4
- 4
certmanager/lib/backends/chiasmus/chiasmusbackend.cpp View File

@@ -432,13 +432,13 @@ Kleo::CryptoBackend::Protocol * Kleo::ChiasmusBackend::protocol( const char * na
432 432
 
433 433
 bool Kleo::ChiasmusBackend::checkForOpenPGP( TQString * reason ) const {
434 434
   if ( reason )
435
-    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "OpenPGP" );
435
+    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "OpenPGP" );
436 436
   return false;
437 437
 }
438 438
 
439 439
 bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const {
440 440
   if ( reason )
441
-    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "SMIME" );
441
+    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "SMIME" );
442 442
   return false;
443 443
 }
444 444
 
@@ -454,7 +454,7 @@ bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const {
454 454
   const TQFileInfo fi( KShell::tildeExpand( chiasmus ) );
455 455
   if ( !fi.isExecutable() ) {
456 456
     if ( reason )
457
-      *reason = i18n( "File \"%1\" does not exist or is not executable." ).tqarg( chiasmus );
457
+      *reason = i18n( "File \"%1\" does not exist or is not executable." ).arg( chiasmus );
458 458
     return false;
459 459
   }
460 460
 
@@ -467,7 +467,7 @@ bool Kleo::ChiasmusBackend::checkForProtocol( const char * name, TQString * reas
467 467
   if ( qstricmp( name, "Chiasmus" ) == 0 )
468 468
     return checkForChiasmus( reason );
469 469
   if ( reason )
470
-    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name );
470
+    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
471 471
   return 0;
472 472
 }
473 473
 

+ 2
- 2
certmanager/lib/backends/chiasmus/chiasmusjob.cpp View File

@@ -208,9 +208,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * parent, const TQString & cap
208 208
   const TQString msg = ( mMode == Encrypt
209 209
                         ? i18n( "Encryption failed: %1" )
210 210
                         : i18n( "Decryption failed: %1" ) )
211
-    .tqarg( TQString::fromLocal8Bit( mError.asString() ) );
211
+    .arg( TQString::fromLocal8Bit( mError.asString() ) );
212 212
   if ( !mStderr.isEmpty() ) {
213
-    const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr );
213
+    const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( mStderr );
214 214
     KMessageBox::detailedError( parent, msg, details, caption );
215 215
   } else {
216 216
     KMessageBox::error( parent, msg, caption );

+ 2
- 2
certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp View File

@@ -71,7 +71,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea
71 71
   if ( !mXiaLibrary ) {
72 72
     if ( reason )
73 73
       *reason = i18n( "Failed to load %1: %2" )
74
-                .tqarg( libfile,KLibLoader::self()->lastErrorMessage() );
74
+                .arg( libfile,KLibLoader::self()->lastErrorMessage() );
75 75
     kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile
76 76
                   << "\" failed: " << KLibLoader::self()->lastErrorMessage() << endl;
77 77
     return 0;
@@ -79,7 +79,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea
79 79
   if ( !mXiaLibrary->hasSymbol( "Chiasmus" ) ) {
80 80
     if ( reason )
81 81
       *reason = i18n( "Failed to load %1: %2" )
82
-                .tqarg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
82
+                .arg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
83 83
     kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile
84 84
                   << "\" failed: " << "Library does not contain the symbol \"Chiasmus\"." << endl;
85 85
     return 0;

+ 1
- 1
certmanager/lib/backends/chiasmus/obtainkeysjob.cpp View File

@@ -96,7 +96,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) {
96 96
     return;
97 97
   }
98 98
 
99
-  emit progress( i18n( "Scanning directory %1..." ).tqarg( mKeyPaths[mIndex] ),
99
+  emit progress( i18n( "Scanning directory %1..." ).arg( mKeyPaths[mIndex] ),
100 100
                  mIndex, mKeyPaths.size() );
101 101
 
102 102
   const TQDir dir( KShell::tildeExpand( mKeyPaths[mIndex] ) );

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

@@ -45,11 +45,11 @@
45 45
 #include <assert.h>
46 46
 
47 47
 struct Kleo::GnuPGProcessBase::Private {
48
-  Private() : useStatusFD( false ), statnot( 0 ) {
48
+  Private() : usetStatusFD( false ), statnot( 0 ) {
49 49
     statusFD[0] = statusFD[1] = -1;
50 50
   }
51 51
 
52
-  bool useStatusFD;
52
+  bool usetStatusFD;
53 53
   int statusFD[2];
54 54
   TQSocketNotifier * statnot;
55 55
   TQCString statusBuffer;
@@ -66,13 +66,13 @@ Kleo::GnuPGProcessBase::~GnuPGProcessBase() {
66 66
   delete d; d = 0;
67 67
 }
68 68
 
69
-void Kleo::GnuPGProcessBase::setUseStatusFD( bool use ) {
69
+void Kleo::GnuPGProcessBase::setUsetStatusFD( bool use ) {
70 70
   assert( d );
71
-  d->useStatusFD = use;
71
+  d->usetStatusFD = use;
72 72
 }
73 73
 
74 74
 bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) {
75
-  if ( d->useStatusFD ) {
75
+  if ( d->usetStatusFD ) {
76 76
     // set up the status-fd. This should be in setupCommunication(),
77 77
     // but then it's too late: we need the fd of the pipe to pass it
78 78
     // as argument to the --status-fd option:
@@ -100,7 +100,7 @@ bool Kleo::GnuPGProcessBase::start( RunMode runmode, Communication comm ) {
100 100
 int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) {
101 101
   if ( int ok = KProcess::setupCommunication( comm ) )
102 102
     return ok;
103
-  if ( d->useStatusFD ) {
103
+  if ( d->usetStatusFD ) {
104 104
     // base class impl returned error, so close our fd's, too
105 105
     ::close( d->statusFD[0] );
106 106
     ::close( d->statusFD[1] );
@@ -110,7 +110,7 @@ int Kleo::GnuPGProcessBase::setupCommunication( Communication comm ) {
110 110
 }
111 111
 
112 112
 int Kleo::GnuPGProcessBase::commSetupDoneP() {
113
-  if ( d->useStatusFD ) {
113
+  if ( d->usetStatusFD ) {
114 114
     ::close( d->statusFD[1] ); // close the input end of the pipe, we're the reader
115 115
     d->statnot = new TQSocketNotifier( d->statusFD[0], TQSocketNotifier::Read, this );
116 116
     connect( d->statnot, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChildStatus(int)) );
@@ -119,20 +119,20 @@ int Kleo::GnuPGProcessBase::commSetupDoneP() {
119 119
 }
120 120
 
121 121
 int Kleo::GnuPGProcessBase::commSetupDoneC() {
122
-  if ( d->useStatusFD )
122
+  if ( d->usetStatusFD )
123 123
     ::fcntl( d->statusFD[1], F_SETFD, 0 );
124 124
   return KProcess::commSetupDoneC();
125 125
 }
126 126
 
127 127
 void Kleo::GnuPGProcessBase::slotChildStatus( int fd ) {
128 128
   if ( !childStatus(fd) )
129
-    closeStatus();
129
+    closetStatus();
130 130
 }
131 131
 
132
-bool Kleo::GnuPGProcessBase::closeStatus() {
133
-  if ( !d->useStatusFD )
132
+bool Kleo::GnuPGProcessBase::closetStatus() {
133
+  if ( !d->usetStatusFD )
134 134
     return false;
135
-  d->useStatusFD = false;
135
+  d->usetStatusFD = false;
136 136
   delete d->statnot; d->statnot = 0;
137 137
   ::close( d->statusFD[0] ); d->statusFD[0] = -1;
138 138
   return true;
@@ -144,7 +144,7 @@ int Kleo::GnuPGProcessBase::childStatus( int fd ) {
144 144
   if ( len > 0 ) {
145 145
     buf[len] = 0;
146 146
     d->statusBuffer += buf;
147
-    parseStatusOutput();
147
+    parsetStatusOutput();
148 148
   }
149 149
   return len;
150 150
 }
@@ -153,7 +153,7 @@ static TQString fromHexEscapedUtf8( const TQCString & str ) {
153 153
   return KURL::decode_string( str.data(), 106 /* utf-8 */ );
154 154
 }
155 155
 
156
-void Kleo::GnuPGProcessBase::parseStatusOutput() {
156
+void Kleo::GnuPGProcessBase::parsetStatusOutput() {
157 157
   static const char startToken[] = "[GNUPG:] ";
158 158
   static const int startTokenLen = sizeof startToken / sizeof *startToken - 1;
159 159
 

+ 3
- 3
certmanager/lib/backends/qgpgme/gnupgprocessbase.h View File

@@ -52,12 +52,12 @@ namespace Kleo {
52 52
     GnuPGProcessBase( TQObject * parent=0, const char * name=0 );
53 53
     ~GnuPGProcessBase();
54 54
 
55
-    void setUseStatusFD( bool use );
55
+    void setUsetStatusFD( bool use );
56 56
 
57 57
     /*! reimplementation */
58 58
     bool start( RunMode runmode, Communication comm );
59 59
 
60
-    bool closeStatus();
60
+    bool closetStatus();
61 61
 
62 62