Browse Source

Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tags/v3.5.13
tpearson 8 years ago
parent
commit
1c93fca14d
100 changed files with 530 additions and 522 deletions
  1. 49
    49
      akregator/src/actionmanagerimpl.cpp
  2. 2
    2
      akregator/src/addfeeddialog.cpp
  3. 19
    19
      akregator/src/akregator_part.cpp
  4. 13
    13
      akregator/src/akregator_view.cpp
  5. 63
    63
      akregator/src/articleviewer.cpp
  6. 1
    1
      akregator/src/dragobjects.h
  7. 1
    1
      akregator/src/feedlistview.cpp
  8. 1
    1
      akregator/src/folder.cpp
  9. 1
    1
      akregator/src/librss/feeddetector.cpp
  10. 5
    5
      akregator/src/librss/tools_p.cpp
  11. 1
    1
      akregator/src/listtabwidget.cpp
  12. 6
    6
      akregator/src/mainwindow.cpp
  13. 3
    3
      akregator/src/notificationmanager.cpp
  14. 5
    5
      akregator/src/pageviewer.cpp
  15. 8
    8
      akregator/src/pluginmanager.cpp
  16. 1
    1
      akregator/src/propertiesdialog.cpp
  17. 5
    5
      akregator/src/tabwidget.cpp
  18. 3
    3
      akregator/src/trayicon.cpp
  19. 2
    2
      akregator/src/treenode.cpp
  20. 4
    4
      akregator/src/viewer.cpp
  21. 7
    7
      certmanager/certificateinfowidgetimpl.cpp
  22. 9
    9
      certmanager/certificatewizardimpl.cpp
  23. 64
    64
      certmanager/certmanager.cpp
  24. 3
    3
      certmanager/conf/appearanceconfigwidgetbase.ui
  25. 2
    2
      certmanager/conf/dirservconfigpage.cpp
  26. 1
    1
      certmanager/hierarchyanalyser.cpp
  27. 14
    14
      certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
  28. 4
    4
      certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
  29. 2
    2
      certmanager/lib/backends/chiasmus/chiasmusjob.cpp
  30. 2
    2
      certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
  31. 1
    1
      certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
  32. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
  33. 4
    4
      certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
  34. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmejob.cpp
  35. 1
    1
      certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
  36. 5
    5
      certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
  37. 1
    1
      certmanager/lib/cryptplugwrapper.cpp
  38. 5
    5
      certmanager/lib/kleo/cryptobackendfactory.cpp
  39. 1
    1
      certmanager/lib/kleo/dn.cpp
  40. 2
    2
      certmanager/lib/kleo/hierarchicalkeylistjob.cpp
  41. 1
    1
      certmanager/lib/kleo/multideletejob.cpp
  42. 1
    1
      certmanager/lib/tests/test_keygen.cpp
  43. 1
    1
      certmanager/lib/tests/test_keylister.cpp
  44. 1
    1
      certmanager/lib/ui/adddirectoryservicedialogimpl.cpp
  45. 1
    1
      certmanager/lib/ui/backendconfigwidget.cpp
  46. 3
    3
      certmanager/lib/ui/cryptoconfigmodule.cpp
  47. 8
    8
      certmanager/lib/ui/directoryserviceswidgetbase.ui
  48. 5
    5
      certmanager/lib/ui/kdhorizontalline.cpp
  49. 1
    1
      certmanager/lib/ui/keyapprovaldialog.cpp
  50. 2
    2
      certmanager/lib/ui/keylistview.cpp
  51. 1
    1
      certmanager/lib/ui/keyrequester.cpp
  52. 4
    4
      certmanager/lib/ui/keyselectiondialog.cpp
  53. 4
    4
      certmanager/lib/ui/messagebox.cpp
  54. 1
    1
      certmanager/lib/ui/progressdialog.cpp
  55. 1
    1
      certmanager/storedtransferjob.cpp
  56. 1
    1
      dependency-graph.dot
  57. 8
    8
      kaddressbook/addresseditwidget.cpp
  58. 1
    1
      kaddressbook/addresseeeditordialog.cpp
  59. 7
    7
      kaddressbook/addresseeeditorwidget.cpp
  60. 1
    1
      kaddressbook/addviewdialog.cpp
  61. 4
    4
      kaddressbook/common/filter.cpp
  62. 1
    1
      kaddressbook/common/locationmap.cpp
  63. 1
    1
      kaddressbook/contacteditorwidgetmanager.cpp
  64. 7
    7
      kaddressbook/customfieldswidget.cpp
  65. 3
    3
      kaddressbook/distributionlisteditor.cpp
  66. 2
    2
      kaddressbook/distributionlistentryview.cpp
  67. 2
    2
      kaddressbook/distributionlistpicker.cpp
  68. 1
    1
      kaddressbook/editors/imaddresswidget.cpp
  69. 1
    1
      kaddressbook/editors/imeditorwidget.cpp
  70. 1
    1
      kaddressbook/emaileditwidget.cpp
  71. 2
    2
      kaddressbook/extensionmanager.cpp
  72. 1
    1
      kaddressbook/features/distributionlistwidget.cpp
  73. 4
    4
      kaddressbook/features/resourceselection.cpp
  74. 4
    4
      kaddressbook/filtereditdialog.cpp
  75. 6
    6
      kaddressbook/geowidget.cpp
  76. 2
    2
      kaddressbook/imagewidget.cpp
  77. 3
    3
      kaddressbook/jumpbuttonbar.cpp
  78. 18
    18
      kaddressbook/kabcore.cpp
  79. 1
    1
      kaddressbook/kabtools.cpp
  80. 1
    1
      kaddressbook/kaddressbook_part.cpp
  81. 4
    0
      kaddressbook/kaddressbook_part.h
  82. 3
    3
      kaddressbook/kaddressbookmain.cpp
  83. 4
    0
      kaddressbook/kaddressbookmain.h
  84. 5
    5
      kaddressbook/kcmconfigs/addresseewidget.cpp
  85. 4
    4
      kaddressbook/kcmconfigs/kabconfigwidget.cpp
  86. 3
    3
      kaddressbook/kcmconfigs/ldapoptionswidget.cpp
  87. 2
    2
      kaddressbook/keywidget.cpp
  88. 10
    10
      kaddressbook/ldapsearchdialog.cpp
  89. 4
    4
      kaddressbook/phoneeditwidget.cpp
  90. 1
    1
      kaddressbook/printing/mikesstyle.cpp
  91. 1
    1
      kaddressbook/printing/selectionpage.cpp
  92. 2
    2
      kaddressbook/printing/stylepage.cpp
  93. 4
    4
      kaddressbook/searchmanager.cpp
  94. 2
    2
      kaddressbook/typecombo.h
  95. 3
    3
      kaddressbook/undocmds.cpp
  96. 9
    9
      kaddressbook/viewmanager.cpp
  97. 16
    16
      kaddressbook/views/cardview.cpp
  98. 3
    3
      kaddressbook/views/configurecardviewdialog.cpp
  99. 1
    1
      kaddressbook/views/configuretableviewdialog.cpp
  100. 0
    0
      kaddressbook/views/contactlistview.cpp

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

@@ -199,7 +199,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag)
199 199
 
200 200
     if (!d->tagActions.tqcontains(tag.id()))
201 201
     {
202
-        d->tagActions[tag.id()] = new TagAction(tag, d->view, TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
202
+        d->tagActions[tag.id()] = new TagAction(tag, TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
203 203
         d->tagMenu->insert(d->tagActions[tag.id()]);
204 204
     }
205 205
 }
@@ -281,51 +281,51 @@ void ActionManagerImpl::initView(View* view)
281 281
         d->view = view;
282 282
 
283 283
     // tag actions
284
-    new KAction(i18n("&New Tag..."), "", "", d->view, TQT_SLOT(slotNewTag()), actionCollection(), "tag_new");
284
+    new KAction(i18n("&New Tag..."), "", "",  TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new");
285 285
 
286 286
     // Feed/Feed Group popup menu
287
-    new KAction(i18n("&Open Homepage"), "", "Ctrl+H", d->view, TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
288
-    new KAction(i18n("&Add Feed..."), "bookmark_add", "Insert", d->view, TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
289
-    new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", d->view, TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
290
-    new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", d->view, TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
291
-    new KAction(i18n("&Edit Feed..."), "edit", "F2", d->view, TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
287
+    new KAction(i18n("&Open Homepage"), "", "Ctrl+H",  TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
288
+    new KAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
289
+    new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
290
+    new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
291
+    new KAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
292 292
         KActionMenu* vm = new KActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" );
293 293
 
294
-    KRadioAction *ra = new KRadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", d->view, TQT_SLOT(slotNormalView()), actionCollection(), "normal_view");
294
+    KRadioAction *ra = new KRadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", TQT_TQOBJECT(d->view), TQT_SLOT(slotNormalView()), actionCollection(), "normal_view");
295 295
     ra->setExclusiveGroup( "ViewMode" );
296 296
     vm->insert(ra);
297 297
 
298
-    ra = new KRadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", d->view, TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
298
+    ra = new KRadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", TQT_TQOBJECT(d->view), TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
299 299
     ra->setExclusiveGroup( "ViewMode" );
300 300
     vm->insert(ra);
301 301
 
302
-    ra = new KRadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", d->view, TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view");
302
+    ra = new KRadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", TQT_TQOBJECT(d->view), TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view");
303 303
     ra->setExclusiveGroup( "ViewMode" );
304 304
     vm->insert(ra);
305 305
 
306 306
     // toolbar / feed menu
307
-    new KAction(i18n("&Fetch Feed"), "down", KStdAccel::shortcut(KStdAccel::Reload), d->view, TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
308
-    new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", d->view, TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
307
+    new KAction(i18n("&Fetch Feed"), "down", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
308
+    new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
309 309
 
310 310
     KAction* stopAction = new KAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop");
311 311
     stopAction->setEnabled(false);
312 312
 
313
-    new KAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", d->view, TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
314
-    new KAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
313
+    new KAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
314
+    new KAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read");
315 315
 
316 316
     // Settings menu
317
-    KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
317
+    KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
318 318
     sqf->setChecked( Settings::showQuickFilter() );
319 319
 
320
-    new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
321
-    new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
322
-    new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
323
-    new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
320
+    new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
321
+    new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
322
+    new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
323
+    new KAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->view), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
324 324
 
325
-    new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
326
-    new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
325
+    new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
326
+    new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
327 327
 
328
-    new KAction(i18n("&Delete"), "editdelete", "Delete", d->view, TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
328
+    new KAction(i18n("&Delete"), "editdelete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
329 329
 
330 330
     if (Settings::showTaggingGUI())
331 331
     {
@@ -335,7 +335,7 @@ void ActionManagerImpl::initView(View* view)
335 335
     KActionMenu* statusMenu = new KActionMenu ( i18n( "&Mark As" ),
336 336
                                     actionCollection(), "article_set_status" );
337 337
 
338
-    d->speakSelectedArticlesAction = new KAction(i18n("&Speak Selected Articles"), "kttsd", "", d->view, TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
338
+    d->speakSelectedArticlesAction = new KAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
339 339
 
340 340
     KAction* abortTTS = new KAction(i18n( "&Stop Speaking" ), "player_stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech");
341 341
     abortTTS->setEnabled(false);
@@ -345,29 +345,29 @@ void ActionManagerImpl::initView(View* view)
345 345
 
346 346
     statusMenu->insert(new KAction(KGuiItem(i18n("as in: mark as read","&Read"), "",
347 347
                        i18n("Mark selected article as read")),
348
-    "Ctrl+E", d->view, TQT_SLOT(slotSetSelectedArticleRead()),
348
+    "Ctrl+E", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleRead()),
349 349
     actionCollection(), "article_set_status_read"));
350 350
 
351 351
     statusMenu->insert(new KAction(KGuiItem(i18n("&New"), "",
352 352
                         i18n("Mark selected article as new")),
353
-    "Ctrl+N", d->view, TQT_SLOT(slotSetSelectedArticleNew()),
353
+    "Ctrl+N", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleNew()),
354 354
     actionCollection(), "article_set_status_new" ));
355 355
 
356 356
 
357 357
     statusMenu->insert(new KAction(KGuiItem(i18n("&Unread"), "",
358 358
                        i18n("Mark selected article as unread")),
359
-    "Ctrl+U", d->view, TQT_SLOT(slotSetSelectedArticleUnread()),
359
+    "Ctrl+U", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleUnread()),
360 360
     actionCollection(), "article_set_status_unread"));
361 361
 
362 362
     KToggleAction* importantAction = new KToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important");
363 363
     importantAction->setCheckedState(i18n("Remove &Important Mark"));
364
-    connect(importantAction, TQT_SIGNAL(toggled(bool)), d->view, TQT_SLOT(slotArticleToggleKeepFlag(bool)));
364
+    connect(importantAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleToggleKeepFlag(bool)));
365 365
 
366 366
 
367
-    new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
368
-    new KAction( i18n("Move Node Down"), TQString(),  "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
369
-    new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
370
-    new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
367
+    new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
368
+    new KAction( i18n("Move Node Down"), TQString(),  "Shift+Alt+Down", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
369
+    new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
370
+    new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
371 371
 }
372 372
 
373 373
 void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer)
@@ -385,8 +385,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList)
385 385
     else
386 386
         d->articleList = articleList;
387 387
 
388
-    new KAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
389
-    new KAction( i18n("&Next Article"), TQString(), "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
388
+    new KAction( i18n("&Previous Article"), TQString(), "Left", TQT_TQOBJECT(articleList), TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
389
+    new KAction( i18n("&Next Article"), TQString(), "Right", TQT_TQOBJECT(articleList), TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
390 390
 }
391 391
 
392 392
 void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
@@ -396,17 +396,17 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
396 396
     else
397 397
         d->listTabWidget = listTabWidget;
398 398
 
399
-    new KAction(i18n("&Previous Feed"), "", "P", listTabWidget,  TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
400
-    new KAction(i18n("&Next Feed"), "", "N", listTabWidget, TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
401
-    new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
402
-    new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
403
-
404
-    new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
405
-    new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
406
-    new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
407
-    new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
408
-    new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
409
-    new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
399
+    new KAction(i18n("&Previous Feed"), "", "P", TQT_TQOBJECT(listTabWidget),  TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
400
+    new KAction(i18n("&Next Feed"), "", "N", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
401
+    new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
402
+    new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
403
+
404
+    new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
405
+    new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
406
+    new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
407
+    new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
408
+    new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
409
+    new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
410 410
 }
411 411
 
412 412
 void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
@@ -416,11 +416,11 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
416 416
     else
417 417
         d->tabWidget = tabWidget;
418 418
 
419
-    new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
420
-    new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
421
-    new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
422
-    new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
423
-    new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), d->tabWidget, TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
419
+    new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
420
+    new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
421
+    new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
422
+    new KAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
423
+    new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
424 424
 }
425 425
 
426 426
 TQWidget* ActionManagerImpl::container(const char* name)

+ 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").arg(feedURL) );
86
+    widget->statusLabel->setText( i18n("Downloading %1").tqarg(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.").arg(feedURL));
105
+    KMessageBox::error(this, i18n("Feed not found from %1.").tqarg(feedURL));
106 106
     KDialogBase::slotCancel();
107 107
 }
108 108
 

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

@@ -54,7 +54,7 @@
54 54
 #include <tqstringlist.h>
55 55
 #include <tqtimer.h>
56 56
 #include <tqwidgetlist.h>
57
-#include <private/qucomextra_p.h>
57
+#include <private/tqucomextra_p.h>
58 58
 
59 59
 #include <cerrno>
60 60
 #include <sys/types.h>
@@ -146,7 +146,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
146 146
    
147 147
     TQStringList storageParams;
148 148
     
149
-    storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
149
+    storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false"));
150 150
     
151 151
     if (factory != 0)
152 152
     {
@@ -168,7 +168,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
168 168
     {
169 169
         m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
170 170
 
171
-        KMessageBox::error(tqparentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
171
+        KMessageBox::error(tqparentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
172 172
     }
173 173
 
174 174
     Filters::ArticleFilterList list;
@@ -232,7 +232,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
232 232
 
233 233
     initFonts();
234 234
 
235
-    RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
235
+    RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(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>").arg(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>").tqarg(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::tqcurrentDateTime().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>").arg(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>").tqarg(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)").arg(m_file), i18n("Write error") );
489
+        KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") );
490 490
         return;
491 491
     }
492 492
 
@@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part)
522 522
         {
523 523
           if (m_mergedPart) {
524 524
             factory()->removeClient(m_mergedPart);
525
-            if (childClients()->containsRef(m_mergedPart))
525
+            if (childClients()->tqcontainsRef(m_mergedPart))
526 526
               removeChildClient(m_mergedPart);
527 527
           }
528 528
           if (part)
@@ -575,7 +575,7 @@ void Part::loadTagSet(const TQString& path)
575 575
     TQFile file(path);
576 576
     if (file.open(IO_ReadOnly))
577 577
     {
578
-        doc.setContent(file.readAll());
578
+        doc.setContent(TQByteArray(file.readAll()));
579 579
         file.close();
580 580
     }
581 581
     // if we can't load the tagset from the xml file, check for the backup in the backend
@@ -636,13 +636,13 @@ void Part::importFile(const KURL& url)
636 636
     {
637 637
         // Read OPML feeds list and build TQDom tree.
638 638
         TQDomDocument doc;
639
-        if (doc.setContent(file.readAll()))
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)").arg(filename), i18n("OPML Parsing Error") );
642
+            KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(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.").arg(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.").tqarg(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?").arg(file.name()),
659
+            i18n("The file %1 already exists; do you want to overwrite it?").tqarg(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").arg(file.name()), i18n("Write Error") );
667
+            KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(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
-                        .arg( programName, programName, backendName );
981
+                        .tqarg( 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 .arg( programName ).
985
+              // even think about changing the above to .tqarg( 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
-                        .arg( oldProgramName, programName, backendName );
993
+                        .tqarg( 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
-                        .arg( programName, oldHostName, backendName );
1004
+                        .tqarg( 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
-                        .arg( oldProgramName, programName, oldHostName, backendName );
1012
+                        .tqarg( oldProgramName, programName, oldHostName, backendName );
1013 1013
         }
1014 1014
 
1015 1015
         KCursorSaver idle( KBusyPtr::idle() );

+ 13
- 13
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>").arg(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>").tqarg(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>").arg(node->title());
169
+                msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(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>").arg(node->title());
185
+                msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title());
186 186
 
187 187
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue)
188 188
             {
@@ -222,11 +222,11 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co
222 222
     m_shuttingDown = false;
223 223
     m_displayingAboutPage = false;
224 224
     m_currentFrame = 0L;
225
-    setFocusPolicy(TQWidget::StrongFocus);
225
+    setFocusPolicy(Qt::StrongFocus);
226 226
 
227 227
     TQVBoxLayout *lt = new TQVBoxLayout( this );
228 228
 
229
-    m_horizontalSplitter = new TQSplitter(TQSplitter::Horizontal, this);
229
+    m_horizontalSplitter = new TQSplitter(Qt::Horizontal, this);
230 230
 
231 231
     m_horizontalSplitter->setOpaqueResize(true);
232 232
     lt->addWidget(m_horizontalSplitter);
@@ -285,7 +285,7 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co
285 285
 
286 286
     mainTabLayout->addWidget(m_searchBar);
287 287
 
288
-    m_articleSplitter = new TQSplitter(TQSplitter::Vertical, m_mainTab, "panner2");
288
+    m_articleSplitter = new TQSplitter(Qt::Vertical, m_mainTab, "panner2");
289 289
 
290 290
     m_articleList = new ArticleListView( m_articleSplitter, "articles" );
291 291
     m_actionManager->initArticleListView(m_articleList);
@@ -317,7 +317,7 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co
317 317
     TQWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area."));
318 318
     mainTabLayout->addWidget( m_articleSplitter );
319 319
 
320
-    m_mainFrame=new Frame(this, m_part, m_mainTab, i18n("Articles"), false);
320
+    m_mainFrame=new Frame(TQT_TQOBJECT(this), m_part, m_mainTab, i18n("Articles"), false);
321 321
     connectFrame(m_mainFrame);
322 322
     m_tabs->addFrame(m_mainFrame);
323 323
 
@@ -431,7 +431,7 @@ void View::slotOpenNewTab(const KURL& url, bool background)
431 431
     connect( page, TQT_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)),
432 432
             this, TQT_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) );
433 433
 
434
-    Frame* frame = new Frame(this, page, page->widget(), i18n("Untitled"));
434
+    Frame* frame = new Frame(TQT_TQOBJECT(this), page, page->widget(), i18n("Untitled"));
435 435
     frame->setAutoDeletePart(true); // delete page viewer when removing the tab
436 436
 
437 437
     connect(page, TQT_SIGNAL(setWindowCaption (const TQString &)), frame, TQT_SLOT(setTitle (const TQString &)));
@@ -638,7 +638,7 @@ void View::slotNormalView()
638 638
             m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode());
639 639
     }
640 640
 
641
-    m_articleSplitter->setOrientation(TQSplitter::Vertical);
641
+    m_articleSplitter->setOrientation(Qt::Vertical);
642 642
     m_viewMode = NormalView;
643 643
 
644 644
     Settings::setViewMode( m_viewMode );
@@ -662,7 +662,7 @@ void View::slotWidescreenView()
662 662
             m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode());
663 663
     }
664 664
 
665
-    m_articleSplitter->setOrientation(TQSplitter::Horizontal);
665
+    m_articleSplitter->setOrientation(Qt::Horizontal);
666 666
     m_viewMode = WidescreenView;
667 667
 
668 668
     Settings::setViewMode( m_viewMode );
@@ -1100,7 +1100,7 @@ void View::slotFeedFetched(Feed *feed)
1100 1100
 
1101 1101
 void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int)
1102 1102
 {
1103
-    if (button == TQt::MidButton)
1103
+    if (button == Qt::MidButton)
1104 1104
     {
1105 1105
         KURL link = article.link();
1106 1106
         switch (Settings::mMBBehaviour())
@@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
1266 1266
             link = article.link().url();
1267 1267
         else
1268 1268
             link = article.guid();
1269
-        TQClipboard *cb = TQApplication::clipboard();
1269
+        TQClipboard *cb = TQApplication::tqclipboard();
1270 1270
         cb->setText(link, TQClipboard::Clipboard);
1271 1271
         cb->setText(link, TQClipboard::Selection);
1272 1272
     }
@@ -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>").arg(TQStyleSheet::escape(articles.first().title()));
1315
+            msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(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>",

+ 63
- 63
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").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
75
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
76 76
         
77
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title())));
77
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">").tqarg(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.tqreplace("/", "_").tqreplace(":", "_");
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").arg(node->htmlUrl()).arg(u.url());
93
+            text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(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\">").arg(Utils::stripTags(directionOf(node->description())));
101
-            text += i18n("<b>Description:</b> %1<br><br>").arg(node->description());
100
+            text += TQString("<div dir=\"%1\">").tqarg(Utils::stripTags(directionOf(node->description())));
101
+            text += i18n("<b>Description:</b> %1<br><br>").tqarg(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\">").arg(directionOf(node->htmlUrl()));
108
-            text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").arg(node->htmlUrl()).arg(node->htmlUrl());
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());
109 109
             text += "</div>\n"; // / link
110 110
         }
111 111
         
112
-        //text += i18n("<b>Unread articles:</b> %1").arg(node->unread());
112
+        //text += i18n("<b>Unread articles:</b> %1").tqarg(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").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
125
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
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());
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").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
143
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
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());
144 144
         if(node->unread() == 0)
145 145
             text += i18n(" (no unread articles)");
146 146
         else
@@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer()
188 188
 
189 189
 void ArticleViewer::generateNormalModeCSS()
190 190
 {
191
-    const TQColorGroup & cg = TQApplication::palette().active();
191
+    const TQColorGroup & cg = TQApplication::tqpalette().active();
192 192
     
193 193
     // from kmail::headerstyle.cpp
194 194
     m_normalModeCSS = TQString(
@@ -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").arg(Settings::standardFont())
202
-            .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
203
-            .arg(cg.text().name())
204
-            .arg(cg.base().name());
201
+            "}\n\n").tqarg(Settings::standardFont())
202
+            .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
203
+            .tqarg(cg.text().name())
204
+            .tqarg(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
-            .arg(cg.link().name())
218
-            .arg(cg.background().name())
219
-            .arg(cg.text().name());
217
+            .tqarg(cg.link().name())
218
+            .tqarg(cg.background().name())
219
+            .tqarg(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
-            .arg(cg.highlightedText().name())
226
-            .arg(cg.highlightedText().name())
227
-            .arg(cg.highlightedText().name())
228
-            .arg(cg.highlightedText().name());
225
+            .tqarg(cg.highlightedText().name())
226
+            .tqarg(cg.highlightedText().name())
227
+            .tqarg(cg.highlightedText().name())
228
+            .tqarg(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").arg(cg.highlight().name())
248
-            .arg(cg.highlightedText().name());
247
+            "}\n\n").tqarg(cg.highlight().name())
248
+            .tqarg(cg.highlightedText().name());
249 249
     
250 250
     m_normalModeCSS += TQString(
251 251
     "body { clear: none; }\n\n"
@@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS()
267 267
 
268 268
 void ArticleViewer::generateCombinedModeCSS()
269 269
 {
270
-    const TQColorGroup & cg = TQApplication::palette().active();
270
+    const TQColorGroup & cg = TQApplication::tqpalette().active();
271 271
     
272 272
     // from kmail::headerstyle.cpp
273 273
     m_combinedModeCSS = TQString (
@@ -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").arg(Settings::standardFont())
282
-            .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
283
-            .arg(cg.text().name())
284
-            .arg(cg.base().name());
281
+            "}\n\n").tqarg(Settings::standardFont())
282
+            .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
283
+            .tqarg(cg.text().name())
284
+            .tqarg(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
-            .arg(cg.link().name())
298
-            .arg(cg.background().name())
299
-            .arg(cg.text().name());
297
+            .tqarg(cg.link().name())
298
+            .tqarg(cg.background().name())
299
+            .tqarg(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
-            .arg(cg.highlightedText().name())
306
-            .arg(cg.highlightedText().name())
307
-            .arg(cg.highlightedText().name())
308
-            .arg(cg.highlightedText().name());
305
+            .tqarg(cg.highlightedText().name())
306
+            .tqarg(cg.highlightedText().name())
307
+            .tqarg(cg.highlightedText().name())
308
+            .tqarg(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").arg(cg.highlight().name())
327
-            .arg(cg.highlightedText().name());
326
+            "}\n\n").tqarg(cg.highlight().name())
327
+            .tqarg(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.arg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
371
+    content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
372 372
     if ( kapp->reverseLayout() )
373
-        content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
373
+        content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
374 374
     else
375
-        content = content.arg( "" );
375
+        content = content.tqarg( "" );
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
-            .arg(AKREGATOR_VERSION) // Akregator version
393
-            .arg("http://akregator.kde.org/"); // Akregator homepage URL
392
+            .tqarg(AKREGATOR_VERSION) // Akregator version
393
+            .tqarg("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.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info));
399
+    write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(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").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
406
+    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
407 407
 
408 408
     if (!article.title().isEmpty())
409 409
     {
410
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
410
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
411 411
         if (article.link().isValid())
412 412
             text += "<a href=\""+article.link().url()+"\">";
413 413
         text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&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\">").arg(directionOf(i18n("Date")));
421
-        text += TQString ("%1:").arg(i18n("Date"));
420
+        text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
421
+        text += TQString ("%1:").tqarg(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\">").arg(directionOf(i18n("Author")));
429
-        text += TQString ("%1:").arg(i18n("Author"));
428
+        text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
429
+        text += TQString ("%1:").tqarg(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").arg(feed->htmlUrl()).arg(u.url());
440
+        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
441 441
     }
442 442
 
443 443
     
444 444
 
445 445
     if (!article.description().isEmpty())
446 446
     {
447
-        text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
447
+        text += TQString("<div dir=\"%1\">").tqarg(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>").arg(url).arg(url).arg(lengthStr).arg(type);
489
+        //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").tqarg(url).tqarg(url).tqarg(lengthStr).tqarg(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").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
499
+    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(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").arg(directionOf(Utils::stripTags(article.title())));
505
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
506 506
         if (link.isValid())
507 507
             text += "<a href=\""+link.url()+"\">";
508 508
         text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&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\">").arg(directionOf(i18n("Date")));
516
-        text += TQString ("%1:").arg(i18n("Date"));
515
+        text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
516
+        text += TQString ("%1:").tqarg(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\">").arg(directionOf(i18n("Author")));
525
-        text += TQString ("%1:").arg(i18n("Author"));
524
+        text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
525
+        text += TQString ("%1:").tqarg(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").arg(feed->htmlUrl()).arg(u.url());
537
+        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
538 538
     }
539 539
 
540 540
     
541 541
 
542 542
     if (!article.description().isEmpty())
543 543
     {
544
-        text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
544
+        text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
545 545
         text += "<span class=\"content\">"+article.description()+"</span>";
546 546
         text += "</div>";
547 547
     }

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

@@ -33,7 +33,7 @@
33 33
 #include <tqstring.h>
34 34
 #include <tqvaluelist.h>
35 35
 
36
-typedef class TQMemArray<char> TQByteArray;
36
+#include <tqcstring.h>
37 37
 
38 38
 namespace Akregator {
39 39
 

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

@@ -462,7 +462,7 @@ TreeNodeItem* NodeListView::findNodeItem(TreeNode* node)
462 462
 
463 463
 TreeNodeItem* NodeListView::findItemByTitle(const TQString& text, int column, ComparisonFlags compare) const
464 464
 { 
465
-    return dynamic_cast<TreeNodeItem*> (KListView::findItem(text, column, compare)); 
465
+    return dynamic_cast<TreeNodeItem*> (KListView::tqfindItem(text, column, compare)); 
466 466
 }
467 467
 
468 468
 void NodeListView::ensureNodeVisible(TreeNode* node)

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

@@ -137,7 +137,7 @@ TQValueList<TreeNode*> Folder::tqchildren() const
137 137
 
138 138
 void Folder::insertChild(TreeNode* node, TreeNode* after)
139 139
 {
140
-    int pos = d->tqchildren.findIndex(after);
140
+    int pos = d->tqchildren.tqfindIndex(after);
141 141
     
142 142
     if (pos < 0)
143 143
         prependChild(node);

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

@@ -72,7 +72,7 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const TQString& s)
72 72
         TQString type;
73 73
         int pos = reType.search(*it, 0);
74 74
         if (pos != -1)
75
-            type = reType.cap(1).lower();
75
+            type = TQString(reType.cap(1)).lower();
76 76
 
77 77
         // we accept only type attributes indicating a feed
78 78
         if ( type != "application/rss+xml" && type != "application/rdf+xml"

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

@@ -69,8 +69,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
69 69
         return HTML;
70 70
     
71 71
     if (type == TQString::fromUtf8("text")
72
-        || (type.startsWith(TQString::fromUtf8("text/"), false)
73
-        && !type.startsWith(TQString::fromUtf8("text/xml"), false))
72
+        || (type.tqstartsWith(TQString::fromUtf8("text/"), false)
73
+        && !type.tqstartsWith(TQString::fromUtf8("text/xml"), false))
74 74
        )
75 75
         return Text;
76 76
     
@@ -85,8 +85,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
85 85
     
86 86
     
87 87
     if (xmltypes.tqcontains(type)
88
-        || type.endsWith(TQString::fromUtf8("+xml"), false)
89
-        || type.endsWith(TQString::fromUtf8("/xml"), false))
88
+        || type.tqendsWith(TQString::fromUtf8("+xml"), false)
89
+        || type.tqendsWith(TQString::fromUtf8("/xml"), false))
90 90
         return XML;
91 91
     
92 92
     return Binary;
@@ -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>").arg(email).arg(name);
242
+        return TQString("<a href=\"mailto:%1\">%2</a>").tqarg(email).tqarg(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)").arg(d->captions[view]).arg(node->unread()));
128
+        //d->tabWidget->changeTab(view,  TQString("<qt>%1 (%2)").tqarg(d->captions[view]).tqarg(node->unread()));
129 129
         d->tabWidget->changeTab(view, d->captions[view]);
130 130
     }
131 131
     else

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

@@ -55,14 +55,14 @@
55 55
 #include <tqmetaobject.h>
56 56
 #include <tqpen.h>
57 57
 #include <tqpainter.h>
58
-#include <private/qucomextra_p.h>
58
+#include <private/tqucomextra_p.h>
59 59
 #include <tqtimer.h>
60 60
 
61 61
 
62 62
 namespace Akregator {
63 63
 
64 64
 BrowserInterface::BrowserInterface( MainWindow *shell, const char *name )
65
-    : KParts::BrowserInterface( shell, name )
65
+    : KParts::BrowserInterface( TQT_TQOBJECT(shell), name )
66 66
 {
67 67
     m_shell = shell;
68 68
 }
@@ -104,7 +104,7 @@ bool MainWindow::loadPart()
104 104
     {
105 105
         // now that the Part is loaded, we cast it to a Part to get
106 106
         // our hands on it
107
-        m_part = static_cast<Akregator::Part*>(factory->create(this, "akregator_part", "KParts::ReadOnlyPart" ));
107
+        m_part = static_cast<Akregator::Part*>(factory->create(TQT_TQOBJECT(this), "akregator_part", "KParts::ReadOnlyPart" ));
108 108
 
109 109
         if (m_part)
110 110
         {
@@ -154,13 +154,13 @@ void MainWindow::setupActions()
154 154
 {
155 155
     connectActionCollection(actionCollection());
156 156
 
157
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
157
+    KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
158 158
 
159 159
     setStandardToolBarMenuEnabled(true);
160 160
     createStandardStatusBarAction();
161 161
 
162
-    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
163
-    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
162
+    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
163
+    KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
164 164
 }
165 165
 
166 166
 void MainWindow::saveProperties(KConfig* config)

+ 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").arg(feeds[0]));
79
+        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").tqarg(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").arg(message));
87
+        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").tqarg(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>").arg(feedTitle);
102
+            message += TQString("<p><b>%1:</b></p>").tqarg(feedTitle);
103 103
         }
104 104
         message += (*it).title() + "<br>";
105 105
     }

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

@@ -53,7 +53,7 @@
53 53
 #include <tqscrollview.h>
54 54
 #include <tqstring.h>
55 55
 #include <tqvaluelist.h>
56
-#include <private/qucomextra_p.h>
56
+#include <private/tqucomextra_p.h>
57 57
 
58 58
 #include <cstdlib>
59 59
 using std::abs;
@@ -356,13 +356,13 @@ void PageViewer::slotCancelled( const TQString & /*errMsg*/ )
356 356
 
357 357
 void PageViewer::urlSelected(const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args)
358 358
 {
359
-    if (url.startsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
359
+    if (url.tqstartsWith(TQString::tqfromLatin1( "javascript:" ), /*case-sensitive=*/false) )
360 360
     {
361 361
         KHTMLPart::urlSelected(url,button,state,_target,args);
362 362
     }
363 363
     else
364 364
     {
365
-        if (button == LeftButton)
365
+        if (button == Qt::LeftButton)
366 366
         {
367 367
             m_url = completeURL(url);
368 368
             browserExtension()->setURLArgs(args); 
@@ -390,7 +390,7 @@ void PageViewer::slotPaletteOrFontChanged()
390 390
     if ( !obj ) // not all views have a browser extension !
391 391
         return;
392 392
     
393
-    int id = obj->tqmetaObject()->findSlot("reparseConfiguration()");
393
+    int id = obj->tqmetaObject()->tqfindSlot("reparseConfiguration()");
394 394
     if (id == -1)
395 395
         return;
396 396
     TQUObject o[1];
@@ -430,7 +430,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur
430 430
     if (isLink)
431 431
     {
432 432
         idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab()));
433
-        popup.setWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
433
+        popup.tqsetWhatsThis(idNewWindow, i18n("<b>Open Link in New Tab</b><p>Opens current link in a new tab."));
434 434
         popup.insertItem(SmallIcon("window_new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser()));
435 435
                 
436 436
         popup.insertSeparator();

+ 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
-                               .arg( service->library() )
96
-                               .arg( loader->lastErrorMessage() ) );
95
+                               .tqarg( service->library() )
96
+                               .tqarg( 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.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() );
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() );
176 176
 
177 177
     str += "</table></body></html>";
178 178
 

+ 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").arg(c));
105
+        setCaption(i18n("Properties of %1").tqarg(c));
106 106
 
107 107
 }
108 108
 

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

@@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f)
166 166
 uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
167 167
 {
168 168
     int hframe, overlap;
169
-    hframe = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
170
-    overlap = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
169
+    hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
170
+    overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
171 171
 
172 172
     TQFontMetrics fm = tabBar()->fontMetrics();
173 173
     int x = 0;
@@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
183 183
         if ( tab->iconSet() )
184 184
             iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
185 185
 
186
-        x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this,                             TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
186
+        x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this,                             TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
187 187
     }
188 188
     return x;
189 189
 }
@@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress()
288 288
 
289 289
     url = view->part()->url();
290 290
     
291
-    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
292
-    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
291
+    kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Selection);
292
+    kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
293 293
 }
294 294
 
295 295
 void TabWidget::slotCloseTab()

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

@@ -74,7 +74,7 @@ TrayIcon::~TrayIcon()
74 74
 
75 75
 
76 76
 void TrayIcon::mousePressEvent(TQMouseEvent *e) {
77
-    if (e->button() == LeftButton) {
77
+    if (e->button() == Qt::LeftButton) {
78 78
         emit showPart();
79 79
     }
80 80
 
@@ -116,7 +116,7 @@ TQPixmap TrayIcon::takeScreenshot() const
116 116
     // Paint the border
117 117
     const int BORDER = 1;
118 118
     TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER);
119
-    finalShot.fill(KApplication::palette().active().foreground());
119
+    finalShot.fill(KApplication::tqpalette().active().foreground());
120 120
     painter.begin(&finalShot);
121 121
     painter.drawPixmap(BORDER, BORDER, shot);
122 122
     painter.end();
@@ -177,7 +177,7 @@ void TrayIcon::slotSetUnread(int unread)
177 177
 
178 178
 void TrayIcon::viewButtonClicked()
179 179
 {
180
-	TQWidget *p=static_cast<TQWidget*>(tqparent());
180
+	TQWidget *p=TQT_TQWIDGET(tqparent());
181 181
 	KWin::forceActiveWindow(p->winId());
182 182
 }
183 183
 

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

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

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

@@ -130,7 +130,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
130 130
 {
131 131
     m_url = completeURL(url);
132 132
     browserExtension()->setURLArgs(args);
133
-    if (button == LeftButton)
133
+    if (button == Qt::LeftButton)
134 134
     {
135 135
         switch (Settings::lMBBehaviour())
136 136
         {
@@ -146,7 +146,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
146 146
         }
147 147
         return;
148 148
     }
149
-    else if (button == MidButton)
149
+    else if (button == Qt::MidButton)
150 150
     {
151 151
         switch (Settings::mMBBehaviour())
152 152
         {
@@ -203,7 +203,7 @@ void Viewer::slotCopy()
203 203
 {
204 204
     TQString text = selectedText();
205 205
     text.tqreplace( TQChar( 0xa0 ), ' ' );
206
-    TQClipboard *cb = TQApplication::clipboard();
206
+    TQClipboard *cb = TQApplication::tqclipboard();
207 207
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
208 208
     cb->setText(text);
209 209
     connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
@@ -212,7 +212,7 @@ void Viewer::slotCopy()
212 212
 void Viewer::slotCopyLinkAddress()
213 213
 {
214 214
    if(m_url.isEmpty()) return;
215
-   TQClipboard *cb = TQApplication::clipboard();
215
+   TQClipboard *cb = TQApplication::tqclipboard();
216 216
    cb->setText(m_url.prettyURL(), TQClipboard::Clipboard);
217 217
    cb->setText(m_url.prettyURL(), TQClipboard::Selection);
218 218
 }

+ 7
- 7
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
-			    .arg( time_t2string( key.subkey(0).creationTime() ),
129
+			    .tqarg( 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 * tqparent, const GpgME::Error & err, c
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
-    .arg( subject ? TQString::fromUtf8( subject ) : TQString(),
190
+    .tqarg( subject ? TQString::fromUtf8( subject ) : TQString(),
191 191
 	  TQString::fromLocal8Bit( err.asString() ) );
192 192
   KMessageBox::error( tqparent, msg, i18n("Certificate Listing Failed" ) );
193 193
 }
@@ -253,7 +253,7 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() {
253 253
 }
254 254
 
255 255
 void CertificateInfoWidgetImpl::startCertificateDump() {
256
-  KProcess* proc = new KProcess( this );
256
+  KProcess* proc = new KProcess( TQT_TQOBJECT(this) );
257 257
   (*proc) << "gpgsm"; // must be in the PATH
258 258
   (*proc) << "--dump-keys";
259 259
   (*proc) << mChain.front().primaryFingerprint();
@@ -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").arg( i18n( "program not found" ) );
269
+    TQString wmsg = i18n("Failed to execute gpgsm:\n%1").tqarg( 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.arg( i18n( "program cannot be executed" ) );
297
+        wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
298 298
       else
299
-        wmsg = wmsg.arg( strerror(rc) );
299
+        wmsg = wmsg.tqarg( 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
-			      .arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
331
+			      .tqarg( 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
   }

+ 9
- 9
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):").arg( label, attr );
91
+		  "*%1 (%2):").tqarg( label, attr );
92 92
     else
93 93
       return i18n("Format string for the labels in the \"Your Personal Data\" page",
94
-		  "%1 (%2):").arg( label, attr );
94
+		  "%1 (%2):").tqarg( 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" ).arg( keyLengths[keyLengthCB->currentItem()] );
199
+    certParms += TQString( "Key-Length: %1\n" ).tqarg( 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
-			  .arg( TQString::fromLocal8Bit( err.asString() ) ),
258
+			  .tqarg( 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
-				.arg( TQString::tqfromLatin1( res.error().asString() ) ),
281
+				.tqarg( TQString::tqfromLatin1( res.error().asString() ) ),
282 282
 				i18n( "Certificate Manager Error" ) );
283 283
     } else {
284 284
         // next will stay enabled until the user clicks Generate
@@ -362,7 +362,7 @@ void CertificateWizardImpl::createPersonalDataPage()
362 362
     if ( config.entryIsImmutable( attr ) )
363 363
       le->setEnabled( false );
364 364
 
365
-    _attrPairList.append(qMakePair(key, le));
365
+    _attrPairList.append(tqMakePair(key, le));
366 366
 
367 367
     connect( le, TQT_SIGNAL(textChanged(const TQString&)),
368 368
 	     TQT_SLOT(slotEnablePersonalDataPageExit()) );
@@ -391,7 +391,7 @@ void CertificateWizardImpl::slotURLSelected( const TQString& _url )
391 391
   // The application/pkcs10 mimetype didn't have a native extension,
392 392
   // so the filedialog didn't have the checkbox for auto-adding it.
393 393
   TQString fileName = url.fileName();
394
-  int pos = fileName.findRev( '.' );
394
+  int pos = fileName.tqfindRev( '.' );
395 395
   if ( pos < 0 ) // no extension
396 396
     url.setFileName( fileName + ".p10" );
397 397
 #endif
@@ -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" ).arg( error ) );
437
+                        i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).tqarg( 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?" ).arg( url.prettyURL() ),
484
+                                                                           "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
485 485
                                                                      i18n( "Overwrite File?" ),
486 486
                                                                      i18n( "&Overwrite" ) ) )
487 487
         return;

+ 64
- 64
certmanager/certmanager.cpp View File

@@ -2,7 +2,7 @@
2 2
     certmanager.cpp
3 3
 
4 4
     This file is part of Kleopatra, the KDE keymanager
5
-    Copyright (c) 2001,2002,2004 Klarälvdalens Datakonsult AB
5
+    Copyright (c) 2001,2002,2004 Klar�lvdalens Datakonsult AB
6 6
 
7 7
     Kleopatra is free software; you can redistribute it and/or modify
8 8
     it under the terms of the GNU General Public License as published by
@@ -252,23 +252,23 @@ static inline void connectEnableOperationSignal( TQObject * s, TQObject * d ) {
252 252
 void CertManager::createActions() {
253 253
   KAction * action = 0;
254 254
 
255
-  (void)KStdAction::quit( this, TQT_SLOT(close()), actionCollection() );
255
+  (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
256 256
 
257
-  action = KStdAction::redisplay( this, TQT_SLOT(slotRedisplay()), actionCollection() );
257
+  action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() );
258 258
   // work around the fact that the stdaction has no shortcut
259 259
   KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload);
260 260
   reloadShortcut.append(KKey(CTRL + Key_R));
261 261
   action->setShortcut( reloadShortcut );
262 262
 
263
-  connectEnableOperationSignal( this, action );
263
+  connectEnableOperationSignal( TQT_TQOBJECT(this), action );
264 264
 
265 265
   action = new KAction( i18n("Stop Operation"), "stop", Key_Escape,
266
-			this, TQT_SIGNAL(stopOperations()),
266
+			TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()),
267 267
 			actionCollection(), "view_stop_operations" );
268 268
   action->setEnabled( false );
269 269
 
270 270
   (void)   new KAction( i18n("New Key Pair..."), "filenew", 0,
271
-			this, TQT_SLOT(newCertificate()),
271
+			TQT_TQOBJECT(this), TQT_SLOT(newCertificate()),
272 272
 			actionCollection(), "file_new_certificate" );
273 273
 
274 274
   connect( new KToggleAction( i18n("Hierarchical Key List"), 0,
@@ -276,100 +276,100 @@ void CertManager::createActions() {
276 276
 	   TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) );
277 277
 
278 278
   action = new KAction( i18n("Expand All"), 0, CTRL+Key_Period,
279
-			this, TQT_SLOT(slotExpandAll()),
279
+			TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()),
280 280
 			actionCollection(), "view_expandall" );
281 281
   action = new KAction( i18n("Collapse All"), 0, CTRL+Key_Comma,
282
-			this, TQT_SLOT(slotCollapseAll()),
282
+			TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()),
283 283
 			actionCollection(), "view_collapseall" );
284 284
 
285 285
   (void)   new KAction( i18n("Refresh CRLs"), 0, 0,
286
-			this, TQT_SLOT(slotRefreshKeys()),
286
+			TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()),
287 287
 			actionCollection(), "certificates_refresh_clr" );
288 288
 
289 289
 #ifdef NOT_IMPLEMENTED_ANYWAY
290 290
   mRevokeCertificateAction = new KAction( i18n("Revoke"), 0,
291
-                                          this, TQT_SLOT(revokeCertificate()),
291
+                                          TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()),
292 292
                                           actionCollection(), "edit_revoke_certificate" );
293 293
   connectEnableOperationSignal( this, mRevokeCertificateAction );
294 294
 
295 295
   mExtendCertificateAction = new KAction( i18n("Extend"), 0,
296
-                                          this, TQT_SLOT(extendCertificate()),
296
+                                          TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()),
297 297
                                           actionCollection(), "edit_extend_certificate" );
298 298
   connectEnableOperationSignal( this, mExtendCertificateAction );
299 299
 #endif
300 300
 
301 301
   mDeleteCertificateAction = new KAction( i18n("Delete"), "editdelete", Key_Delete,
302
-                                    this, TQT_SLOT(slotDeleteCertificate()),
302
+                                    TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()),
303 303
                                     actionCollection(), "edit_delete_certificate" );
304
-  connectEnableOperationSignal( this, mDeleteCertificateAction );
304
+  connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction );
305 305
 
306 306
   mValidateCertificateAction = new KAction( i18n("Validate"), "reload", SHIFT + Key_F5,
307
-					    this, TQT_SLOT(slotValidate()),
307
+					    TQT_TQOBJECT(this), TQT_SLOT(slotValidate()),
308 308
 					    actionCollection(), "certificates_validate" );
309
-  connectEnableOperationSignal( this, mValidateCertificateAction );
309
+  connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction );
310 310
 
311 311
   mImportCertFromFileAction = new KAction( i18n("Import Certificates..."), 0,
312
-					   this, TQT_SLOT(slotImportCertFromFile()),
312
+					   TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()),
313 313
 					   actionCollection(), "file_import_certificates" );
314
-  connectEnableOperationSignal( this, mImportCertFromFileAction );
314
+  connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction );
315 315
 
316 316
   mImportCRLFromFileAction = new KAction( i18n("Import CRLs..."), 0,
317
-					  this, TQT_SLOT(importCRLFromFile()),
317
+					  TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()),
318 318
 					  actionCollection(), "file_import_crls" );
319
-  connectEnableOperationSignal( this, mImportCRLFromFileAction );
319
+  connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction );
320 320
 
321 321
   mExportCertificateAction = new KAction( i18n("Export Certificates..."), "export", 0,
322
-					  this, TQT_SLOT(slotExportCertificate()),
322
+					  TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()),
323 323
 					  actionCollection(), "file_export_certificate" );
324 324
 
325 325
   mExportSecretKeyAction = new KAction( i18n("Export Secret Key..."), "export", 0,
326
-                                        this, TQT_SLOT(slotExportSecretKey()),
326
+                                        TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()),
327 327
                                         actionCollection(), "file_export_secret_keys" );
328
-  connectEnableOperationSignal( this, mExportSecretKeyAction );
328
+  connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction );
329 329
 
330 330
   mViewCertDetailsAction = new KAction( i18n("Certificate Details..."), 0, 0,
331
-                                        this, TQT_SLOT(slotViewDetails()), actionCollection(),
331
+                                        TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(),
332 332
                                         "view_certificate_details" );
333 333
   mDownloadCertificateAction = new KAction( i18n( "Download"), 0, 0,
334
-                                        this, TQT_SLOT(slotDownloadCertificate()), actionCollection(),
334
+                                        TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(),
335 335
                                         "download_certificate" );
336 336
 
337 337
   const TQString dirmngr = KStandardDirs::findExe( "gpgsm" );
338 338
   mDirMngrFound = !dirmngr.isEmpty();
339 339
 
340 340
   action = new KAction( i18n("Dump CRL Cache..."), 0,
341
-			this, TQT_SLOT(slotViewCRLs()),
341
+			TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()),
342 342
 			actionCollection(), "crl_dump_crl_cache" );
343 343
   action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
344 344
 
345 345
   action = new KAction( i18n("Clear CRL Cache..."), 0,
346
-			this, TQT_SLOT(slotClearCRLs()),
346
+			TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()),
347 347
 			actionCollection(), "crl_clear_crl_cache" );
348 348
   action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
349 349
 
350
-  action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this,
350
+  action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
351 351
                         TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
352 352
   // disable action if no kwatchgnupg binary is around
353 353
   if (KStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false);
354 354
 
355 355
   (void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" );
356 356
 
357
-  mLineEditAction = new LineEditAction( TQString(), actionCollection(), this,
357
+  mLineEditAction = new LineEditAction( TQString(), actionCollection(), TQT_TQOBJECT(this),
358 358
 					TQT_SLOT(slotSearch()),
359 359
 					"query_lineedit_action");
360 360
 
361 361
   TQStringList lst;
362 362
   lst << i18n("In Local Certificates") << i18n("In External Certificates");
363
-  mComboAction = new ComboAction( lst, actionCollection(), this, TQT_SLOT( slotToggleRemote(int) ),
363
+  mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ),
364 364
                                   "location_combo_action", mNextFindRemote? 1 : 0 );
365 365
 
366
-  mFindAction = new KAction( i18n("Find"), "tqfind", 0, this, TQT_SLOT(slotSearch()),
366
+  mFindAction = new KAction( i18n("Find"), "tqfind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
367 367
 			     actionCollection(), "tqfind" );
368 368
 
369
-  KStdAction::keyBindings( this, TQT_SLOT(slotEditKeybindings()), actionCollection() );
370
-  KStdAction::preferences( this, TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
369
+  KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() );
370
+  KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
371 371
 
372
-  new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, this, TQT_SLOT(slotConfigureGpgME()),
372
+  new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()),
373 373
                actionCollection(), "configure_gpgme" );
374 374
 
375 375
   createStandardStatusBarAction();
@@ -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").arg( TQString::fromLocal8Bit( err.asString() ) ),
526
+				   "keys:\n%1").tqarg( TQString::fromLocal8Bit( err.asString() ) ),
527 527
 			i18n("Refreshing Keys Failed") );
528 528
 }
529 529
 
@@ -532,7 +532,7 @@ static void showKeyListError( TQWidget * tqparent, 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
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
535
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
536 536
 
537 537
   KMessageBox::error( tqparent, msg, i18n( "Certificate Listing Failed" ) );
538 538
 }
@@ -592,7 +592,7 @@ static void selectKeys( Kleo::KeyListView * lv, const std::set<std::string> & fp
592 592
   for  ( TQListViewItemIterator it( lv ) ; it.current() ; ++it )
593 593
     if ( Kleo::KeyListViewItem * item = Kleo::lvi_cast<Kleo::KeyListViewItem>( it.current() ) ) {
594 594
       const char * fpr = item->key().primaryFingerprint();
595
-      item->setSelected( fpr && fprs.tqfind( fpr ) != fprs.end() );
595
+      item->setSelected( fpr && fprs.find( fpr ) != fprs.end() );
596 596
     }
597 597
 }
598 598
 
@@ -705,8 +705,8 @@ static void showCertificateDownloadError( TQWidget * tqparent, const GpgME::Erro
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
-                      .arg( certDisplayName )
709
-                      .arg( TQString::fromLocal8Bit( err.asString() ) );
708
+                      .tqarg( certDisplayName )
709
+                      .tqarg( TQString::fromLocal8Bit( err.asString() ) );
710 710
 
711 711
   KMessageBox::error( tqparent, msg, i18n( "Certificate Download Failed" ) );
712 712
 }
@@ -773,8 +773,8 @@ static void showCertificateImportError( TQWidget * tqparent, 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
-                      .arg( certDisplayName )
777
-                      .arg( TQString::fromLocal8Bit( err.asString() ) );
776
+                      .tqarg( certDisplayName )
777
+                      .tqarg( TQString::fromLocal8Bit( err.asString() ) );
778 778
   KMessageBox::error( tqparent, 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.arg( i18n("Total number processed:"),
813
+    lines.push_back( normalLine.tqarg( i18n("Total number processed:"),
814 814
 				     TQString::number( res.numConsidered() ) ) );
815
-    lines.push_back( normalLine.arg( i18n("Imported:"),
815
+    lines.push_back( normalLine.tqarg( i18n("Imported:"),
816 816
 				     TQString::number( res.numImported() ) ) );
817 817
     if ( res.newSignatures() )
818
-      lines.push_back( normalLine.arg( i18n("New signatures:"),
818
+      lines.push_back( normalLine.tqarg( i18n("New signatures:"),
819 819
 				       TQString::number( res.newSignatures() ) ) );
820 820
     if ( res.newUserIDs() )
821
-      lines.push_back( normalLine.arg( i18n("New user IDs:"),
821
+      lines.push_back( normalLine.tqarg( i18n("New user IDs:"),
822 822
 				       TQString::number( res.newUserIDs() ) ) );
823 823
     if ( res.numKeysWithoutUserID() )
824
-      lines.push_back( normalLine.arg( i18n("Keys without user IDs:"),
824
+      lines.push_back( normalLine.tqarg( i18n("Keys without user IDs:"),
825 825
 				       TQString::number( res.numKeysWithoutUserID() ) ) );
826 826
     if ( res.newSubkeys() )
827
-      lines.push_back( normalLine.arg( i18n("New subkeys:"),
827
+      lines.push_back( normalLine.tqarg( i18n("New subkeys:"),
828 828
 				       TQString::number( res.newSubkeys() ) ) );
829 829
     if ( res.newRevocations() )
830
-      lines.push_back( boldLine.arg( i18n("Newly revoked:"),
830
+      lines.push_back( boldLine.tqarg( i18n("Newly revoked:"),
831 831
 				     TQString::number( res.newRevocations() ) ) );
832 832
     if ( res.notImported() )
833
-      lines.push_back( boldLine.arg( i18n("Not imported:"),
833
+      lines.push_back( boldLine.tqarg( i18n("Not imported:"),
834 834
 				     TQString::number( res.notImported() ) ) );
835 835
     if ( res.numUnchanged() )
836
-      lines.push_back( normalLine.arg( i18n("Unchanged:"),
836
+      lines.push_back( normalLine.tqarg( i18n("Unchanged:"),
837 837
 				       TQString::number( res.numUnchanged() ) ) );
838 838
     if ( res.numSecretKeysConsidered() )
839
-      lines.push_back( normalLine.arg( i18n("Secret keys processed:"),
839
+      lines.push_back( normalLine.tqarg( i18n("Secret keys processed:"),
840 840
 				       TQString::number( res.numSecretKeysConsidered() ) ) );
841 841
     if ( res.numSecretKeysImported() )
842
-      lines.push_back( normalLine.arg( i18n("Secret keys imported:"),
842
+      lines.push_back( normalLine.tqarg( 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.arg( i18n("Secret keys <em>not</em> imported:"),
845
+      lines.push_back( boldLine.tqarg( 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.arg( i18n("Secret keys unchanged:"),
850
+      lines.push_back( normalLine.tqarg( 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
-			      .arg( displayName ).arg( lines.join( TQString() ) ),
856
+			      .tqarg( displayName ).tqarg( 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").arg( 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").tqarg( 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." ).arg( processname ), i18n( "Certificate Manager Error" ) );
938
+    KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).tqarg( 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").arg( 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").tqarg( 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 * tqparent, 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
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
1006
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
1007 1007
   KMessageBox::error( tqparent, msg, i18n("Certificate Deletion Failed") );
1008 1008
 }
1009 1009
 
@@ -1031,7 +1031,7 @@ void CertManager::slotDeleteCertificate() {
1031 1031
     return;
1032 1032
 
1033 1033
   if ( !mHierarchyAnalyser ) {
1034
-    mHierarchyAnalyser = new HierarchyAnalyser( this, "mHierarchyAnalyser" );
1034
+    mHierarchyAnalyser = new HierarchyAnalyser( TQT_TQOBJECT(this), "mHierarchyAnalyser" );
1035 1035
     Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob();
1036 1036
     assert( job );
1037 1037
     connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
@@ -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() ).arg( keysToDelete.size() - keys.size() )
1079
+	   keys.size() ).tqarg( 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.arg( i18n("Operation not supported by the backend.") ),
1101
+			str.tqarg( 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 * tqparent, 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
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
1209
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
1210 1210
   KMessageBox::error( tqparent, 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?" ).arg( url.prettyURL() ),
1242
+                                                  "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
1243 1243
                                             i18n( "Overwrite File?" ),
1244 1244
                                             i18n( "&Overwrite" ) ) )
1245 1245
       return false;
@@ -1301,7 +1301,7 @@ static void showSecretKeyExportError( TQWidget * tqparent, const GpgME::Error &
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
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
1304
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
1305 1305
   KMessageBox::error( tqparent, msg, i18n("Secret-Key Export Failed") );
1306 1306
 }
1307 1307
 

+ 3
- 3
certmanager/conf/appearanceconfigwidgetbase.ui View File

@@ -162,9 +162,9 @@
162 162
     </connection>
163 163
     <connection>
164 164
         <sender>categoriesLV</sender>
165
-        <signal>selectionChanged(QListViewItem*)</signal>
165
+        <signal>selectionChanged(TQListViewItem*)</signal>
166 166
         <receiver>AppearanceConfigWidgetBase</receiver>
167
-        <slot>slotSelectionChanged(QListViewItem*)</slot>
167
+        <slot>slotSelectionChanged(TQListViewItem*)</slot>
168 168
     </connection>
169 169
     <connection>
170 170
         <sender>defaultLookPB</sender>
@@ -205,7 +205,7 @@
205 205
     <slot access="protected">slotForegroundClicked()</slot>
206 206
     <slot access="protected">slotBackgroundClicked()</slot>
207 207
     <slot access="protected">slotFontClicked()</slot>
208
-    <slot access="protected">slotSelectionChanged( QListViewItem * )</slot>
208
+    <slot access="protected">slotSelectionChanged( TQListViewItem * )</slot>
209 209
     <slot access="protected">slotDefaultClicked()</slot>
210 210
     <slot access="protected">slotItalicClicked()</slot>
211 211
     <slot access="protected">slotBoldClicked()</slot>

+ 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" ).arg( componentName, groupName, entryName ) );
286
+        KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).tqarg( 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" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->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() ) );
291 291
         return 0;
292 292
     }
293 293
     return entry;

+ 1
- 1
certmanager/hierarchyanalyser.cpp View File

@@ -63,7 +63,7 @@ void HierarchyAnalyser::slotNextKey( const GpgME::Key & key ) {
63 63
 const std::vector<GpgME::Key> & HierarchyAnalyser::subjectsForIssuer( const char * issuer_dn ) const {
64 64
   static const std::vector<GpgME::Key> empty;
65 65
   std::map< TQCString, std::vector<GpgME::Key> >::const_iterator it =
66
-    mSubjectsByIssuer.tqfind( issuer_dn );
66
+    mSubjectsByIssuer.find( issuer_dn );
67 67
   return it == mSubjectsByIssuer.end() ? empty : it->second ;
68 68
 }
69 69
 

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

@@ -90,20 +90,20 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
90 90
 void KWatchGnuPGMainWindow::slotClear()
91 91
 {
92 92
   mCentralWidget->clear();
93
-  mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) );
93
+  mCentralWidget->append( tqtr("[%1] Log cleared").tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
94 94
 }
95 95
 
96 96
 void KWatchGnuPGMainWindow::createActions()
97 97
 {
98 98
   (void)new KAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
99
-		     this, TQT_SLOT( slotClear() ),
99
+		     TQT_TQOBJECT(this), TQT_SLOT( slotClear() ),
100 100
 		     actionCollection(), "clear_log" );
101
-  (void)KStdAction::saveAs( this, TQT_SLOT(slotSaveAs()), actionCollection() );
102
-  (void)KStdAction::close( this, TQT_SLOT(close()), actionCollection() );
103
-  (void)KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() );
104
-  (void)KStdAction::preferences( this, TQT_SLOT(slotConfigure()), actionCollection() );
105
-  ( void )KStdAction::keyBindings(this, TQT_SLOT(configureShortcuts()), actionCollection());
106
-  ( void )KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
101
+  (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() );
102
+  (void)KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
103
+  (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() );
104
+  (void)KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection() );
105
+  (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureShortcuts()), actionCollection());
106
+  (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
107 107
 
108 108
 #if 0
109 109
   (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::tqfromLatin1("configure"),
@@ -134,8 +134,8 @@ void KWatchGnuPGMainWindow::startWatcher()
134 134
 	while( mWatcher->isRunning() ) {
135 135
 	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
136 136
 	}
137
-	mCentralWidget->append(tr("[%1] Log stopped")
138
-						   .arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate)));
137
+	mCentralWidget->append(tqtr("[%1] Log stopped")
138
+						   .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)));
139 139
   }
140 140
   mWatcher->clearArguments();
141 141
   KConfig* config = kapp->config();
@@ -147,8 +147,8 @@ void KWatchGnuPGMainWindow::startWatcher()
147 147
   if( !mWatcher->start() ) {
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
-	mCentralWidget->append( tr("[%1] Log started")
151
-							.arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) );
150
+	mCentralWidget->append( tqtr("[%1] Log started")
151
+							.tqarg( TQDateTime::tqcurrentDateTime().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)").arg(*it).arg(comp->description());
179
+		logclients << TQString("%1 (%2)").tqarg(*it).tqarg(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?").arg(filename),
240
+											  "to overwrite it?").tqarg(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\"" ).arg( "OpenPGP" );
435
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "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\"" ).arg( "SMIME" );
441
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "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." ).arg( chiasmus );
457
+      *reason = i18n( "File \"%1\" does not exist or is not executable." ).tqarg( 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\"" ).arg( name );
470
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( 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 * tqparent, const TQString & c
208 208
   const TQString msg = ( mMode == Encrypt
209 209
                         ? i18n( "Encryption failed: %1" )
210 210
                         : i18n( "Decryption failed: %1" ) )
211
-    .arg( TQString::fromLocal8Bit( mError.asString() ) );
211
+    .tqarg( TQString::fromLocal8Bit( mError.asString() ) );
212 212
   if ( !mStderr.isEmpty() ) {
213
-    const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( mStderr );
213
+    const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr );
214 214
     KMessageBox::detailedError( tqparent, msg, details, caption );
215 215
   } else {
216 216
     KMessageBox::error( tqparent, 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
-                .arg( libfile,KLibLoader::self()->lastErrorMessage() );
74
+                .tqarg( 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
-                .arg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
82
+                .tqarg( 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..." ).arg( mKeyPaths[mIndex] ),
99
+  emit progress( i18n( "Scanning directory %1..." ).tqarg( mKeyPaths[mIndex] ),
100 100
                  mIndex, mKeyPaths.size() );
101 101
 
102 102
   const TQDir dir( KShell::tildeExpand( mKeyPaths[mIndex] ) );

+ 5
- 5
certmanager/lib/backends/qgpgme/qgpgmebackend.cpp View File

@@ -88,15 +88,15 @@ static bool check( GpgME::Context::Protocol proto, TQString * reason ) {
88 88
   // error, check why:
89 89
   const GpgME::EngineInfo ei = GpgME::engineInfo( proto );
90 90
   if ( ei.isNull() )
91
-    *reason = i18n("GPGME was compiled without support for %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
91
+    *reason = i18n("GPGME was compiled without support for %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
92 92
   else if ( ei.fileName() && !ei.version() )
93
-    *reason = i18n("Engine %1 is not installed properly.").arg( TQFile::decodeName( ei.fileName() ) );
93
+    *reason = i18n("Engine %1 is not installed properly.").tqarg( TQFile::decodeName( ei.fileName() ) );
94 94
   else if ( ei.fileName() && ei.version() && ei.requiredVersion() )
95 95
     *reason = i18n("Engine %1 version %2 installed, "
96 96
 		   "but at least version %3 is required.")
97
-      .arg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() );
97
+      .tqarg( TQFile::decodeName( ei.fileName() ), ei.version(), ei.requiredVersion() );
98 98
   else
99
-    *reason = i18n("Unknown problem with engine for protocol %1.").arg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
99
+    *reason = i18n("Unknown problem with engine for protocol %1.").tqarg( proto == GpgME::Context::CMS ? "S/MIME" : "OpenPGP" );
100 100
   return false;
101 101
 }
102 102
 
@@ -114,7 +114,7 @@ bool Kleo::QGpgMEBackend::checkForProtocol( const char * name, TQString * reason
114 114
   if ( qstricmp( name, SMIME ) == 0 )
115 115
     return check( GpgME::Context::CMS, reason );
116 116
   if ( reason )
117
-    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
117
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name );
118 118
   return false;
119 119
 }
120 120
 

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

@@ -89,11 +89,11 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
89 89
   if ( showErrors && rc != 0 ) {
90 90
     TQString wmsg = i18n("<qt>Failed to execute gpgconf:<br>%1</qt>");
91 91
     if ( rc == -1 )
92
-        wmsg = wmsg.arg( i18n( "program not found" ) );
92
+        wmsg = wmsg.tqarg( i18n( "program not found" ) );
93 93
     else if ( rc == -2 )
94
-        wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
94
+        wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
95 95
     else
96
-        wmsg = wmsg.arg( strerror(rc) );
96
+        wmsg = wmsg.tqarg( strerror(rc) );
97 97
     kdWarning(5150) << wmsg << endl; // to see it from test_cryptoconfig.cpp
98 98
     KMessageBox::error(0, wmsg);
99 99
   }
@@ -306,7 +306,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
306 306
   }
307 307
   else if( rc != 0 ) // Happens due to bugs in gpgconf (e.g. issues 104/115)
308 308
   {
309
-    TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( TQString::fromLocal8Bit( strerror( rc ) ) );
309
+    TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).tqarg( TQString::fromLocal8Bit( strerror( rc ) ) );
310 310
     kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl;
311 311
     KMessageBox::error(0, wmsg);
312 312
   }

+ 5
- 5
certmanager/lib/backends/qgpgme/qgpgmejob.cpp View File

@@ -276,21 +276,21 @@ char * Kleo::QGpgMEJob::getPassphrase( const char * useridHint, const char * /*d
276 276
   TQString msg = previousWasBad ?
277 277
                 i18n( "You need a passphrase to unlock the secret key for user:<br/> %1 (retry)" ) :
278 278
                 i18n( "You need a passphrase to unlock the secret key for user:<br/> %1" );
279
-  msg = msg.arg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
279
+  msg = msg.tqarg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
280 280
   msg.prepend( "<qt>" );
281 281
   msg += i18n( "This dialog will reappear every time the passphrase is needed. For a more secure solution that also allows caching the passphrase, use gpg-agent." ) + "<br/>";
282 282
   const TQString gpgAgent = KStandardDirs::findExe( "gpg-agent" );
283 283
   if ( !gpgAgent.isEmpty() ) {
284 284
     msg += i18n( "gpg-agent was found in %1, but does not appear to be running." )
285
-           .arg( gpgAgent );
285
+           .tqarg( gpgAgent );
286 286
   } else {
287 287
     msg += i18n( "gpg-agent is part of gnupg-%1, which you can download from %2" )
288
-           .arg( "1.9" )
289
-           .arg( "http://www.gnupg.org/download" );  // add #gnupg2 if you can make this a real link
288
+           .tqarg( "1.9" )
289
+           .tqarg( "http://www.gnupg.org/download" );  // add #gnupg2 if you can make this a real link
290 290
   }
291 291
   msg += "<br/>";
292 292
   msg += i18n( "For information on how to set up gpg-agent, see %1" )
293
-         .arg( "http://kmail.kde.org/kmail-pgpmime-howto.html" );
293
+         .tqarg( "http://kmail.kde.org/kmail-pgpmime-howto.html" );
294 294
   msg += "<br/><br/>";
295 295
   msg += i18n( "Enter passphrase:" );
296 296
   Kleo::PassphraseDialog dlg( msg, i18n("Passphrase Dialog") );

+ 1
- 1
certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp View File

@@ -196,7 +196,7 @@ void Kleo::QGpgMEKeyListJob::showErrorDialog( TQWidget * tqparent, const TQStrin
196 196
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
197 197
 			    "the keys from the backend:</p>"
198 198
 			    "<p><b>%1</b></p></qt>" )
199
-    .arg( TQString::fromLocal8Bit( mResult.error().asString() ) );
199
+    .tqarg( TQString::fromLocal8Bit( mResult.error().asString() ) );
200 200
   KMessageBox::error( tqparent, msg, caption );
201 201
 }
202 202
 

+ 5
- 5
certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp View File

@@ -140,20 +140,20 @@ TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subto
140 140
 
141 141
   static const Map & tokenMap = makeMap();
142 142
 
143
-  const Map::const_iterator it1 = tokenMap.tqfind( token.lower() );
143
+  const Map::const_iterator it1 = tokenMap.find( token.lower() );
144 144
   if ( it1 == tokenMap.end() )
145 145
     return token;
146
-  std::map<int,Desc>::const_iterator it2 = it1->second.tqfind( subtoken );
146
+  std::map<int,Desc>::const_iterator it2 = it1->second.find( subtoken );
147 147
   if ( it2 == it1->second.end() )
148
-    it2 = it1->second.tqfind( 0 );
148
+    it2 = it1->second.find( 0 );
149 149
   if ( it2 == it1->second.end() )
150 150
     return token;
151 151
   const Desc & desc = it2->second;
152 152
   TQString result = i18n( desc.display );
153 153
   if ( desc.useCur )
154
-    result = result.arg( cur );
154
+    result = result.tqarg( cur );
155 155
   if ( desc.useTot )
156
-    result = result.arg( tot );
156
+    result = result.tqarg( tot );
157 157
   return result;
158 158
 }
159 159
 

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

@@ -522,7 +522,7 @@ bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg
522 522
 	if( !_cp->initialize() ) {
523 523
 	  _initqStatus = IniStatus_InitError;
524 524
 	  kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl;
525
-	  _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName );
525
+	  _lastError = i18n("Error while initializing plugin \"%1\"").tqarg( _libName );
526 526
 	  if ( errorMsg )
527 527
 	    *errorMsg = _lastError;
528 528
 	  delete _cp; _cp = 0;

+ 5
- 5
certmanager/lib/kleo/cryptobackendfactory.cpp View File

@@ -111,7 +111,7 @@ Kleo::CryptoBackendFactory * Kleo::CryptoBackendFactory::instance() {
111 111
 // }
112 112
 
113 113
 const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const {
114
-  const BackendMap::const_iterator it = mBackends.tqfind( "SMIME" );
114
+  const BackendMap::const_iterator it = mBackends.find( "SMIME" );
115 115
   if ( it == mBackends.end() )
116 116
     return 0;
117 117
   if ( !it->second )
@@ -120,7 +120,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const
120 120
 }
121 121
 
122 122
 const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() const {
123
-  const BackendMap::const_iterator it = mBackends.tqfind( "OpenPGP" );
123
+  const BackendMap::const_iterator it = mBackends.find( "OpenPGP" );
124 124
   if ( it == mBackends.end() )
125 125
     return 0;
126 126
   if ( !it->second )
@@ -129,7 +129,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() cons
129 129
 }
130 130
 
131 131
 const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::protocol( const char * name ) const {
132
-  const BackendMap::const_iterator it = mBackends.tqfind( name );
132
+  const BackendMap::const_iterator it = mBackends.find( name );
133 133
   if ( it == mBackends.end() )
134 134
     return 0;
135 135
   if ( !it->second )
@@ -154,7 +154,7 @@ void Kleo::CryptoBackendFactory::scanForBackends( TQStringList * reasons ) {
154 154
       if ( (*it)->supportsProtocol( protocol ) && !(*it)->checkForProtocol( protocol, &reason ) ) {
155 155
         if ( reasons ) {
156 156
           reasons->push_back( i18n("While scanning for %1 support in backend %2:")
157
-                              .arg( protocol, (*it)->displayName() ) );
157
+                              .tqarg( protocol, (*it)->displayName() ) );
158 158
           reasons->push_back( "  " + reason );
159 159
         }
160 160
       }
@@ -267,7 +267,7 @@ namespace {
267 267
 }
268 268
 
269 269
 bool Kleo::CryptoBackendFactory::knowsAboutProtocol( const char * name ) const {
270
-  return std::tqfind( mAvailableProtocols.begin(), mAvailableProtocols.end(),
270
+  return std::find( mAvailableProtocols.begin(), mAvailableProtocols.end(),
271 271
                     CaseInsensitiveString( name ) ) != mAvailableProtocols.end();
272 272
 }
273 273
 

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

@@ -507,7 +507,7 @@ const Kleo::DNAttributeMapper * Kleo::DNAttributeMapper::instance() {
507 507
 
508 508
 TQString Kleo::DNAttributeMapper::name2label( const TQString & s ) const {
509 509
   const std::map<const char*,const char*,ltstr>::const_iterator it
510
-    = d->map.tqfind( s.stripWhiteSpace().upper().latin1() );
510
+    = d->map.find( s.stripWhiteSpace().upper().latin1() );
511 511
   if ( it == d->map.end() )
512 512
     return TQString();
513 513
   return i18n( it->second );

+ 2
- 2
certmanager/lib/kleo/hierarchicalkeylistjob.cpp View File

@@ -93,7 +93,7 @@ void Kleo::HierarchicalKeyListJob::slotNextKey( const GpgME::Key & key ) {
93 93
   if ( const char * chain_id = key.chainID() )
94 94
     mNextSet.insert( chain_id );
95 95
   if ( const char * fpr = key.primaryFingerprint() )
96
-    if ( mSentSet.tqfind( fpr ) == mSentSet.end() ) {
96
+    if ( mSentSet.find( fpr ) == mSentSet.end() ) {
97 97
       mSentSet.insert( fpr );
98 98
       emit nextKey( key );
99 99
     }
@@ -131,7 +131,7 @@ void Kleo::HierarchicalKeyListJob::slotResult( const GpgME::KeyListResult & res
131 131
 #if 0 // FIXME
132 132
   const int current = mIt - mKeys.begin();
133 133
   const int total = mKeys.size();
134
-  emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total );
134
+  emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total );
135 135
 #endif
136 136
 }
137 137
 

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

@@ -92,7 +92,7 @@ void Kleo::MultiDeleteJob::slotResult( const GpgME::Error & err ) {
92 92
 
93 93
   const int current = mIt - mKeys.begin();
94 94
   const int total = mKeys.size();
95
-  emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").arg( current ).arg( total ), current, total );
95
+  emit progress( i18n("progress info: \"%1 of %2\"","%1/%2").tqarg( current ).tqarg( total ), current, total );
96 96
 }
97 97
 
98 98
 GpgME::Error Kleo::MultiDeleteJob::startAJob() {

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

@@ -137,7 +137,7 @@ void KeyGenerator::slotResult( const GpgME::KeyGenerationResult & res, const TQB
137 137
   if ( res.error() )
138 138
     showError( res.error() );
139 139
   else
140
-    KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").arg( keyData.size() ),
140
+    KMessageBox::information( this, TQString("Key generated successfully, %1 bytes long").tqarg( keyData.size() ),
141 141
 			      "Key Generation Finished" );
142 142
 }
143 143
   

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

@@ -104,7 +104,7 @@ void CertListView::slotResult( const GpgME::KeyListResult & result ) {
104 104
     TQMessageBox::information( this, "Key Listing Result", "KeyListResult is null!" );
105 105
   else if ( result.error() )
106 106
     TQMessageBox::critical( this, "Key Listing Result",
107
-			   TQString("KeyListResult Error: %1").arg( result.error().asString() ) );
107
+			   TQString("KeyListResult Error: %1").tqarg( result.error().asString() ) );
108 108
   else if ( result.isTruncated() )
109 109
     TQMessageBox::information( this, "Key Listing Result", "KeyListResult is truncated!" );
110 110
   else

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

@@ -49,7 +49,7 @@
49 49
 AddDirectoryServiceDialogImpl::AddDirectoryServiceDialogImpl( TQWidget* tqparent,  const char* name, bool modal, WFlags fl )
50 50
     : AddDirectoryServiceDialog( tqparent, name, modal, fl )
51 51
 {
52
-    portED->setValidator( new TQIntValidator( 0, 65535, portED ) );
52
+    portED->setValidator( new TQIntValidator( 0, 65535, TQT_TQOBJECT(portED) ) );
53 53
 }
54 54
 
55 55
 /*

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

@@ -150,7 +150,7 @@ private:
150 150
     // second one is implementation name (gpg, gpgsm...)
151 151
     const TQString impName = protocol ? protocol->displayName() : i18n( "failed" );
152 152
     return i18n( "Items in Kleo::BackendConfigWidget listview (1: protocol; 2: implementation name)",
153
-                 "%1 (%2)" ).arg( protoName, impName );
153
+                 "%1 (%2)" ).tqarg( protoName, impName );
154 154
   }
155 155
 
156 156
   const CryptoBackend::Protocol* mProtocol; // can be 0

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

@@ -124,7 +124,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
124 124
       dialogHeight = 400;
125 125
     TQSize sz = scrollView->tqsizeHint();
126 126
     scrollView->setMinimumSize( sz.width()
127
-                                + scrollView->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
127
+                                + scrollView->tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent),
128 128
                                 TQMIN( compGUI->tqsizeHint().height(), dialogHeight ) );
129 129
   }
130 130
   if ( mComponentGUIs.empty() ) {
@@ -134,7 +134,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg
134 134
                                "properly. It did not return any components. "
135 135
                                "Try running \"%1\" on the command line for more "
136 136
                                "information.")
137
-          .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
137
+          .tqarg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" );
138 138
       TQLabel * label = new TQLabel( msg, vbox );
139 139
       label->tqsetAlignment( TQt::WordBreak );
140 140
       label->setMinimumHeight( fontMetrics().lineSpacing() * 5 );
@@ -356,7 +356,7 @@ TQString Kleo::CryptoConfigEntryGUI::description() const
356 356
 {
357 357
   TQString descr = mEntry->description();
358 358
   if ( descr.isEmpty() ) // shouldn't happen
359
-    descr = TQString( "<%1>" ).arg( mName );
359
+    descr = TQString( "<%1>" ).tqarg( mName );
360 360
   return descr;
361 361
 }