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

akregator/src/actionmanagerimpl.cpp

@@ -199,7 +199,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag)
 
     if (!d->tagActions.tqcontains(tag.id()))
     {
-        d->tagActions[tag.id()] = new TagAction(tag, d->view, TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
+        d->tagActions[tag.id()] = new TagAction(tag, TQT_TQOBJECT(d->view), TQT_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu);
         d->tagMenu->insert(d->tagActions[tag.id()]);
     }
 }
@@ -281,51 +281,51 @@ void ActionManagerImpl::initView(View* view)
         d->view = view;
 
     // tag actions
-    new KAction(i18n("&New Tag..."), "", "", d->view, TQT_SLOT(slotNewTag()), actionCollection(), "tag_new");
+    new KAction(i18n("&New Tag..."), "", "",  TQT_TQOBJECT(d->view), TQT_SLOT(slotNewTag()), actionCollection(), "tag_new");
 
     // Feed/Feed Group popup menu
-    new KAction(i18n("&Open Homepage"), "", "Ctrl+H", d->view, TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
-    new KAction(i18n("&Add Feed..."), "bookmark_add", "Insert", d->view, TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
-    new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", d->view, TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
-    new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", d->view, TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
-    new KAction(i18n("&Edit Feed..."), "edit", "F2", d->view, TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
+    new KAction(i18n("&Open Homepage"), "", "Ctrl+H",  TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage");
+    new KAction(i18n("&Add Feed..."), "bookmark_add", "Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add");
+    new KAction(i18n("Ne&w Folder..."), "folder_new", "Shift+Insert", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group");
+    new KAction(i18n("&Delete Feed"), "editdelete", "Alt+Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove");
+    new KAction(i18n("&Edit Feed..."), "edit", "F2", TQT_TQOBJECT(d->view), TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify");
         KActionMenu* vm = new KActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" );
 
-    KRadioAction *ra = new KRadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", d->view, TQT_SLOT(slotNormalView()), actionCollection(), "normal_view");
+    KRadioAction *ra = new KRadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", TQT_TQOBJECT(d->view), TQT_SLOT(slotNormalView()), actionCollection(), "normal_view");
     ra->setExclusiveGroup( "ViewMode" );
     vm->insert(ra);
 
-    ra = new KRadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", d->view, TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
+    ra = new KRadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", TQT_TQOBJECT(d->view), TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view");
     ra->setExclusiveGroup( "ViewMode" );
     vm->insert(ra);
 
-    ra = new KRadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", d->view, TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view");
+    ra = new KRadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", TQT_TQOBJECT(d->view), TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view");
     ra->setExclusiveGroup( "ViewMode" );
     vm->insert(ra);
 
     // toolbar / feed menu
-    new KAction(i18n("&Fetch Feed"), "down", KStdAccel::shortcut(KStdAccel::Reload), d->view, TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
-    new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", d->view, TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
+    new KAction(i18n("&Fetch Feed"), "down", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch");
+    new KAction(i18n("Fe&tch All Feeds"), "bottom", "Ctrl+L", TQT_TQOBJECT(d->view), TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all");
 
     KAction* stopAction = new KAction(i18n( "&Abort Fetches" ), "stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop");
     stopAction->setEnabled(false);
 
-    new KAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", d->view, TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
-    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");
+    new KAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", TQT_TQOBJECT(d->view), TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read");
+    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");
 
     // Settings menu
-    KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
+    KToggleAction* sqf = new KToggleAction(i18n("Show Quick Filter"), TQString(), 0, TQT_TQOBJECT(d->view), TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter");
     sqf->setChecked( Settings::showQuickFilter() );
 
-    new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
-    new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
-    new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
-    new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
+    new KAction( i18n("Open in Tab"), "tab_new", "Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" );
+    new KAction( i18n("Open in Background Tab"), TQString(), "tab_new", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" );
+    new KAction( i18n("Open in External Browser"), "window_new", "Ctrl+Shift+Return", TQT_TQOBJECT(d->view), TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" );
+    new KAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->view), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" );
 
-    new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
-    new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
+    new KAction(i18n("Pre&vious Unread Article"), "", Key_Minus, TQT_TQOBJECT(d->view), TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article");
+    new KAction(i18n("Ne&xt Unread Article"), "", Key_Plus, TQT_TQOBJECT(d->view), TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article");
 
-    new KAction(i18n("&Delete"), "editdelete", "Delete", d->view, TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
+    new KAction(i18n("&Delete"), "editdelete", "Delete", TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete");
 
     if (Settings::showTaggingGUI())
     {
@@ -335,7 +335,7 @@ void ActionManagerImpl::initView(View* view)
     KActionMenu* statusMenu = new KActionMenu ( i18n( "&Mark As" ),
                                     actionCollection(), "article_set_status" );
 
-    d->speakSelectedArticlesAction = new KAction(i18n("&Speak Selected Articles"), "kttsd", "", d->view, TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
+    d->speakSelectedArticlesAction = new KAction(i18n("&Speak Selected Articles"), "kttsd", "", TQT_TQOBJECT(d->view), TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech");
 
     KAction* abortTTS = new KAction(i18n( "&Stop Speaking" ), "player_stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech");
     abortTTS->setEnabled(false);
@@ -345,29 +345,29 @@ void ActionManagerImpl::initView(View* view)
 
     statusMenu->insert(new KAction(KGuiItem(i18n("as in: mark as read","&Read"), "",
                        i18n("Mark selected article as read")),
-    "Ctrl+E", d->view, TQT_SLOT(slotSetSelectedArticleRead()),
+    "Ctrl+E", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleRead()),
     actionCollection(), "article_set_status_read"));
 
     statusMenu->insert(new KAction(KGuiItem(i18n("&New"), "",
                         i18n("Mark selected article as new")),
-    "Ctrl+N", d->view, TQT_SLOT(slotSetSelectedArticleNew()),
+    "Ctrl+N", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleNew()),
     actionCollection(), "article_set_status_new" ));
 
 
     statusMenu->insert(new KAction(KGuiItem(i18n("&Unread"), "",
                        i18n("Mark selected article as unread")),
-    "Ctrl+U", d->view, TQT_SLOT(slotSetSelectedArticleUnread()),
+    "Ctrl+U", TQT_TQOBJECT(d->view), TQT_SLOT(slotSetSelectedArticleUnread()),
     actionCollection(), "article_set_status_unread"));
 
     KToggleAction* importantAction = new KToggleAction(i18n("&Mark as Important"), "flag", "Ctrl+I", actionCollection(), "article_set_status_important");
     importantAction->setCheckedState(i18n("Remove &Important Mark"));
-    connect(importantAction, TQT_SIGNAL(toggled(bool)), d->view, TQT_SLOT(slotArticleToggleKeepFlag(bool)));
+    connect(importantAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(d->view), TQT_SLOT(slotArticleToggleKeepFlag(bool)));
 
 
-    new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
-    new KAction( i18n("Move Node Down"), TQString(),  "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
-    new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
-    new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
+    new KAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" );
+    new KAction( i18n("Move Node Down"), TQString(),  "Shift+Alt+Down", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" );
+    new KAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" );
+    new KAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", TQT_TQOBJECT(view), TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right");
 }
 
 void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer)
@@ -385,8 +385,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList)
     else
         d->articleList = articleList;
 
-    new KAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
-    new KAction( i18n("&Next Article"), TQString(), "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
+    new KAction( i18n("&Previous Article"), TQString(), "Left", TQT_TQOBJECT(articleList), TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" );
+    new KAction( i18n("&Next Article"), TQString(), "Right", TQT_TQOBJECT(articleList), TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" );
 }
 
 void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
@@ -396,17 +396,17 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget)
     else
         d->listTabWidget = listTabWidget;
 
-    new KAction(i18n("&Previous Feed"), "", "P", listTabWidget,  TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
-    new KAction(i18n("&Next Feed"), "", "N", listTabWidget, TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
-    new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
-    new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
-
-    new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
-    new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
-    new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
-    new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
-    new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
-    new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
+    new KAction(i18n("&Previous Feed"), "", "P", TQT_TQOBJECT(listTabWidget),  TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed");
+    new KAction(i18n("&Next Feed"), "", "N", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed");
+    new KAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed");
+    new KAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed");
+
+    new KAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" );
+    new KAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" );
+    new KAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" );
+    new KAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" );
+    new KAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" );
+    new KAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", TQT_TQOBJECT(listTabWidget), TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" );
 }
 
 void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
@@ -416,11 +416,11 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget)
     else
         d->tabWidget = tabWidget;
 
-    new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
-    new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
-    new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
-    new KAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
-    new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), d->tabWidget, TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
+    new KAction(i18n("Select Next Tab"), "", "Ctrl+Period", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab");
+    new KAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab");
+    new KAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" );
+    new KAction( i18n("Copy Link Address"), TQString(), TQString(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" );
+    new KAction( i18n("&Close Tab"), "tab_remove", KStdAccel::close(), TQT_TQOBJECT(d->tabWidget), TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" );
 }
 
 TQWidget* ActionManagerImpl::container(const char* name)

akregator/src/addfeeddialog.cpp

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

akregator/src/akregator_part.cpp

@@ -54,7 +54,7 @@
 #include <tqstringlist.h>
 #include <tqtimer.h>
 #include <tqwidgetlist.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
 
 #include <cerrno>
 #include <sys/types.h>
@@ -146,7 +146,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
    
     TQStringList storageParams;
     
-    storageParams.append(TQString("taggingEnabled=%1").arg(Settings::showTaggingGUI() ? "true" : "false"));
+    storageParams.append(TQString("taggingEnabled=%1").tqarg(Settings::showTaggingGUI() ? "true" : "false"));
     
     if (factory != 0)
     {
@@ -168,7 +168,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
     {
         m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
 
-        KMessageBox::error(tqparentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").arg(Settings::archiveBackend()), i18n("Plugin error") );
+        KMessageBox::error(tqparentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
     }
 
     Filters::ArticleFilterList list;
@@ -232,7 +232,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
 
     initFonts();
 
-    RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").arg(AKREGATOR_VERSION));
+    RSS::FileRetriever::setUserAgent(TQString("Akregator/%1; librss/remnants").tqarg(AKREGATOR_VERSION));
 }
 
 void Part::loadPlugins()
@@ -432,7 +432,7 @@ bool Part::openFile()
         
                 copyFile(backup);
         
-                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") );
+                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") );
             }
 
             if (!doc.setContent(listBackup))
@@ -447,7 +447,7 @@ bool Part::openFile()
             TQString backup = m_file + "-backup." +  TQString::number(TQDateTime::tqcurrentDateTime().toTime_t());
             copyFile(backup);
 
-            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") );
+            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") );
         }
         m_view->loadFeeds(createDefaultFeedList());
     }
@@ -486,7 +486,7 @@ void Part::slotSaveFeedList()
     if (file.open(IO_WriteOnly) == false)
     {
         //FIXME: allow to save the feedlist into different location -tpr 20041118
-        KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").arg(m_file), i18n("Write error") );
+        KMessageBox::error(m_view, i18n("Access denied: cannot save feed list (%1)").tqarg(m_file), i18n("Write error") );
         return;
     }
 
@@ -522,7 +522,7 @@ bool Part::mergePart(KParts::Part* part)
         {
           if (m_mergedPart) {
             factory()->removeClient(m_mergedPart);
-            if (childClients()->containsRef(m_mergedPart))
+            if (childClients()->tqcontainsRef(m_mergedPart))
               removeChildClient(m_mergedPart);
           }
           if (part)
@@ -575,7 +575,7 @@ void Part::loadTagSet(const TQString& path)
     TQFile file(path);
     if (file.open(IO_ReadOnly))
     {
-        doc.setContent(file.readAll());
+        doc.setContent(TQByteArray(file.readAll()));
         file.close();
     }
     // 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)
     {
         // Read OPML feeds list and build TQDom tree.
         TQDomDocument doc;
-        if (doc.setContent(file.readAll()))
+        if (doc.setContent(TQByteArray(file.readAll())))
             m_view->importFeeds(doc);
         else
-            KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").arg(filename), i18n("OPML Parsing Error") );
+            KMessageBox::error(m_view, i18n("Could not import the file %1 (no valid OPML)").tqarg(filename), i18n("OPML Parsing Error") );
     }
     else
-        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"));
+        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"));
 
     if (isRemote)
         KIO::NetAccess::removeTempFile(filename);
@@ -656,7 +656,7 @@ void Part::exportFile(const KURL& url)
 
         if ( file.exists() &&
                 KMessageBox::questionYesNo(m_view,
-            i18n("The file %1 already exists; do you want to overwrite it?").arg(file.name()),
+            i18n("The file %1 already exists; do you want to overwrite it?").tqarg(file.name()),
             i18n("Export"),
             i18n("Overwrite"),
             KStdGuiItem::cancel()) == KMessageBox::No )
@@ -664,7 +664,7 @@ void Part::exportFile(const KURL& url)
 
         if ( !file.open(IO_WriteOnly) )
         {
-            KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").arg(file.name()), i18n("Write Error") );
+            KMessageBox::error(m_view, i18n("Access denied: cannot write to file %1").tqarg(file.name()), i18n("Write Error") );
             return;
         }
 
@@ -978,11 +978,11 @@ bool Part::tryToLock(const TQString& backendName)
                         "can cause the loss of archived articles and crashes at startup.</b> "
                         "You should disable the archive for now "
                         "unless you are sure that %2 is not already running.</qt>")
-                        .arg( programName, programName, backendName );
+                        .tqarg( programName, programName, backendName );
               // TQString::arg( st ) only replaces the first occurrence of %1
               // with st while TQString::arg( s1, s2 ) replacess all occurrences
               // of %1 with s1 and all occurrences of %2 with s2. So don't
-              // even think about changing the above to .arg( programName ).
+              // even think about changing the above to .tqarg( programName ).
             else
                 msg = i18n("<qt>%1 seems to be running on another display on this "
                         "machine. <b>Running %1 and %2 at the same "
@@ -990,7 +990,7 @@ bool Part::tryToLock(const TQString& backendName)
                         "the loss of archived articles and crashes at startup.</b> "
                         "You should disable the archive for now "
                         "unless you are sure that %2 is not already running.</qt>")
-                        .arg( oldProgramName, programName, backendName );
+                        .tqarg( oldProgramName, programName, backendName );
         }
         else
         {
@@ -1001,7 +1001,7 @@ bool Part::tryToLock(const TQString& backendName)
                         "You should disable the archive for now "
                         "unless you are sure that it is "
                         "not already running on %2.</qt>")
-                        .arg( programName, oldHostName, backendName );
+                        .tqarg( programName, oldHostName, backendName );
             else
                 msg = i18n("<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the "
                         "same time is not supported by the %4 backend and can cause "
@@ -1009,7 +1009,7 @@ bool Part::tryToLock(const TQString& backendName)
                         "You should disable the archive for now "
                         "unless you are sure that %1 is "
                         "not running on %3.</qt>")
-                        .arg( oldProgramName, programName, oldHostName, backendName );
+                        .tqarg( oldProgramName, programName, oldHostName, backendName );
         }
 
         KCursorSaver idle( KBusyPtr::idle() );

akregator/src/akregator_view.cpp

@@ -145,7 +145,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
 
         virtual bool visitTagNode(TagNode* node)
         {
-            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());
+            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());
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Tag"), KStdGuiItem::del()) == KMessageBox::Continue)
             {
                 Tag tag = node->tag();
@@ -166,7 +166,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
             if (node->title().isEmpty())
                 msg = i18n("<qt>Are you sure you want to delete this folder and its feeds and subfolders?</qt>");
             else
-                msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").arg(node->title());
+                msg = i18n("<qt>Are you sure you want to delete folder <b>%1</b> and its feeds and subfolders?</qt>").tqarg(node->title());
 
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Folder"), KStdGuiItem::del()) == KMessageBox::Continue)
             {
@@ -182,7 +182,7 @@ class View::DeleteNodeVisitor : public TreeNodeVisitor
             if (node->title().isEmpty())
                 msg = i18n("<qt>Are you sure you want to delete this feed?</qt>");
             else
-                msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").arg(node->title());
+                msg = i18n("<qt>Are you sure you want to delete feed <b>%1</b>?</qt>").tqarg(node->title());
 
             if (KMessageBox::warningContinueCancel(0, msg, i18n("Delete Feed"), KStdGuiItem::del()) == KMessageBox::Continue)
             {
@@ -222,11 +222,11 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co
     m_shuttingDown = false;
     m_displayingAboutPage = false;
     m_currentFrame = 0L;
-    setFocusPolicy(TQWidget::StrongFocus);
+    setFocusPolicy(Qt::StrongFocus);
 
     TQVBoxLayout *lt = new TQVBoxLayout( this );
 
-    m_horizontalSplitter = new TQSplitter(TQSplitter::Horizontal, this);
+    m_horizontalSplitter = new TQSplitter(Qt::Horizontal, this);
 
     m_horizontalSplitter->setOpaqueResize(true);
     lt->addWidget(m_horizontalSplitter);
@@ -285,7 +285,7 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co
 
     mainTabLayout->addWidget(m_searchBar);
 
-    m_articleSplitter = new TQSplitter(TQSplitter::Vertical, m_mainTab, "panner2");
+    m_articleSplitter = new TQSplitter(Qt::Vertical, m_mainTab, "panner2");
 
     m_articleList = new ArticleListView( m_articleSplitter, "articles" );
     m_actionManager->initArticleListView(m_articleList);
@@ -317,7 +317,7 @@ View::View( Part *part, TQWidget *tqparent, ActionManagerImpl* actionManager, co
     TQWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area."));
     mainTabLayout->addWidget( m_articleSplitter );
 
-    m_mainFrame=new Frame(this, m_part, m_mainTab, i18n("Articles"), false);
+    m_mainFrame=new Frame(TQT_TQOBJECT(this), m_part, m_mainTab, i18n("Articles"), false);
     connectFrame(m_mainFrame);
     m_tabs->addFrame(m_mainFrame);
 
@@ -431,7 +431,7 @@ void View::slotOpenNewTab(const KURL& url, bool background)
     connect( page, TQT_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)),
             this, TQT_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) );
 
-    Frame* frame = new Frame(this, page, page->widget(), i18n("Untitled"));
+    Frame* frame = new Frame(TQT_TQOBJECT(this), page, page->widget(), i18n("Untitled"));
     frame->setAutoDeletePart(true); // delete page viewer when removing the tab
 
     connect(page, TQT_SIGNAL(setWindowCaption (const TQString &)), frame, TQT_SLOT(setTitle (const TQString &)));
@@ -638,7 +638,7 @@ void View::slotNormalView()
             m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode());
     }
 
-    m_articleSplitter->setOrientation(TQSplitter::Vertical);
+    m_articleSplitter->setOrientation(Qt::Vertical);
     m_viewMode = NormalView;
 
     Settings::setViewMode( m_viewMode );
@@ -662,7 +662,7 @@ void View::slotWidescreenView()
             m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode());
     }
 
-    m_articleSplitter->setOrientation(TQSplitter::Horizontal);
+    m_articleSplitter->setOrientation(Qt::Horizontal);
     m_viewMode = WidescreenView;
 
     Settings::setViewMode( m_viewMode );
@@ -1100,7 +1100,7 @@ void View::slotFeedFetched(Feed *feed)
 
 void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int)
 {
-    if (button == TQt::MidButton)
+    if (button == Qt::MidButton)
     {
         KURL link = article.link();
         switch (Settings::mMBBehaviour())
@@ -1266,7 +1266,7 @@ void View::slotCopyLinkAddress()
             link = article.link().url();
         else
             link = article.guid();
-        TQClipboard *cb = TQApplication::clipboard();
+        TQClipboard *cb = TQApplication::tqclipboard();
         cb->setText(link, TQClipboard::Clipboard);
         cb->setText(link, TQClipboard::Selection);
     }
@@ -1312,7 +1312,7 @@ void View::slotArticleDelete()
         case 0:
             return;
         case 1:
-            msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").arg(TQStyleSheet::escape(articles.first().title()));
+            msg = i18n("<qt>Are you sure you want to delete article <b>%1</b>?</qt>").tqarg(TQStyleSheet::escape(articles.first().title()));
             break;
         default:
             msg = i18n("<qt>Are you sure you want to delete the selected article?</qt>",

akregator/src/articleviewer.cpp

@@ -72,9 +72,9 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
         m_view->m_link = TQString();
         
         TQString text;
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
         
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">").arg(directionOf(Utils::stripTags(node->title())));
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">").tqarg(directionOf(Utils::stripTags(node->title())));
         text += node->title();
         if(node->unread() == 0)
             text += i18n(" (no unread articles)");
@@ -90,26 +90,26 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
             TQString file = url.tqreplace("/", "_").tqreplace(":", "_");
             KURL u(m_view->m_imageDir);
             u.setFileName(file);
-            text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(node->htmlUrl()).arg(u.url());
+            text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(node->htmlUrl()).tqarg(u.url());
         }
         else text += "<div class=\"body\">";
         
         
         if( !node->description().isEmpty() )
         {
-            text += TQString("<div dir=\"%1\">").arg(Utils::stripTags(directionOf(node->description())));
-            text += i18n("<b>Description:</b> %1<br><br>").arg(node->description());
+            text += TQString("<div dir=\"%1\">").tqarg(Utils::stripTags(directionOf(node->description())));
+            text += i18n("<b>Description:</b> %1<br><br>").tqarg(node->description());
             text += "</div>\n"; // /description
         }
         
         if ( !node->htmlUrl().isEmpty() )
         {
-            text += TQString("<div dir=\"%1\">").arg(directionOf(node->htmlUrl()));
-            text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").arg(node->htmlUrl()).arg(node->htmlUrl());
+            text += TQString("<div dir=\"%1\">").tqarg(directionOf(node->htmlUrl()));
+            text += i18n("<b>Homepage:</b> <a href=\"%1\">%2</a>").tqarg(node->htmlUrl()).tqarg(node->htmlUrl());
             text += "</div>\n"; // / link
         }
         
-        //text += i18n("<b>Unread articles:</b> %1").arg(node->unread());
+        //text += i18n("<b>Unread articles:</b> %1").tqarg(node->unread());
         text += "</div>"; // /body
         
         m_view->renderContent(text);
@@ -121,8 +121,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
         m_view->m_link = TQString();
         
         TQString text;
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
         if(node->unread() == 0)
             text += i18n(" (no unread articles)");
         else
@@ -139,8 +139,8 @@ class ArticleViewer::ShowSummaryVisitor : public TreeNodeVisitor
         m_view->m_link = TQString();
         
         TQString text;
-        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").arg(directionOf(Utils::stripTags(node->title()))).arg(node->title());
+        text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">%2").tqarg(directionOf(Utils::stripTags(node->title()))).tqarg(node->title());
         if(node->unread() == 0)
             text += i18n(" (no unread articles)");
         else
@@ -188,7 +188,7 @@ ArticleViewer::~ArticleViewer()
 
 void ArticleViewer::generateNormalModeCSS()
 {
-    const TQColorGroup & cg = TQApplication::palette().active();
+    const TQColorGroup & cg = TQApplication::tqpalette().active();
     
     // from kmail::headerstyle.cpp
     m_normalModeCSS = TQString(
@@ -198,10 +198,10 @@ void ArticleViewer::generateNormalModeCSS()
             "  font-size: %2 ! important;\n"
             "  color: %3 ! important;\n"
             "  background: %4 ! important;\n"
-            "}\n\n").arg(Settings::standardFont())
-            .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
-            .arg(cg.text().name())
-            .arg(cg.base().name());
+            "}\n\n").tqarg(Settings::standardFont())
+            .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
+            .tqarg(cg.text().name())
+            .tqarg(cg.base().name());
     m_normalModeCSS += TQString(
     "a {\n"
     + TQString("  color: %1 ! important;\n")
@@ -214,18 +214,18 @@ void ArticleViewer::generateNormalModeCSS()
     +"  margin-bottom: 10pt;\n"
 //    +"  width: 99%;\n"
     +        "}\n\n")
-            .arg(cg.link().name())
-            .arg(cg.background().name())
-            .arg(cg.text().name());
+            .tqarg(cg.link().name())
+            .tqarg(cg.background().name())
+            .tqarg(cg.text().name());
 
     m_normalModeCSS += TQString(".headertitle a:link { color: %1  ! important; }\n"
     ".headertitle a:visited { color: %2 ! important; }\n"
     ".headertitle a:hover{ color: %3 ! important; }\n"
             ".headertitle a:active { color: %4 ! important; }\n")
-            .arg(cg.highlightedText().name())
-            .arg(cg.highlightedText().name())
-            .arg(cg.highlightedText().name())
-            .arg(cg.highlightedText().name());
+            .tqarg(cg.highlightedText().name())
+            .tqarg(cg.highlightedText().name())
+            .tqarg(cg.highlightedText().name())
+            .tqarg(cg.highlightedText().name());
     
     m_normalModeCSS += TQString(
     ".headertitle {\n"
@@ -244,8 +244,8 @@ void ArticleViewer::generateNormalModeCSS()
     ".headimage {\n"
     "  float: right;\n"
     "  margin-left: 5px;\n"
-            "}\n\n").arg(cg.highlight().name())
-            .arg(cg.highlightedText().name());
+            "}\n\n").tqarg(cg.highlight().name())
+            .tqarg(cg.highlightedText().name());
     
     m_normalModeCSS += TQString(
     "body { clear: none; }\n\n"
@@ -267,7 +267,7 @@ void ArticleViewer::generateNormalModeCSS()
 
 void ArticleViewer::generateCombinedModeCSS()
 {
-    const TQColorGroup & cg = TQApplication::palette().active();
+    const TQColorGroup & cg = TQApplication::tqpalette().active();
     
     // from kmail::headerstyle.cpp
     m_combinedModeCSS = TQString (
@@ -278,10 +278,10 @@ void ArticleViewer::generateCombinedModeCSS()
             "  font-size: %2 ! important;\n"
             "  color: %3 ! important;\n"
             "  background: %4 ! important;\n"
-            "}\n\n").arg(Settings::standardFont())
-            .arg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
-            .arg(cg.text().name())
-            .arg(cg.base().name());
+            "}\n\n").tqarg(Settings::standardFont())
+            .tqarg(TQString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
+            .tqarg(cg.text().name())
+            .tqarg(cg.base().name());
     m_combinedModeCSS += (
     "a {\n"
     + TQString("  color: %1 ! important;\n")
@@ -294,18 +294,18 @@ void ArticleViewer::generateCombinedModeCSS()
     +"  margin-bottom: 10pt;\n"
 //    +"  width: 99%;\n"
     +        "}\n\n")
-            .arg(cg.link().name())
-            .arg(cg.background().name())
-            .arg(cg.text().name());
+            .tqarg(cg.link().name())
+            .tqarg(cg.background().name())
+            .tqarg(cg.text().name());
 
     m_combinedModeCSS += TQString(".headertitle a:link { color: %1  ! important; }\n"
     ".headertitle a:visited { color: %2 ! important; }\n"
     ".headertitle a:hover{ color: %3 ! important; }\n"
             ".headertitle a:active { color: %4 ! important; }\n")
-            .arg(cg.highlightedText().name())
-            .arg(cg.highlightedText().name())
-            .arg(cg.highlightedText().name())
-            .arg(cg.highlightedText().name());
+            .tqarg(cg.highlightedText().name())
+            .tqarg(cg.highlightedText().name())
+            .tqarg(cg.highlightedText().name())
+            .tqarg(cg.highlightedText().name());
     m_combinedModeCSS += TQString(
     ".headertitle {\n"
     "  background: %1 ! important;\n"
@@ -323,8 +323,8 @@ void ArticleViewer::generateCombinedModeCSS()
     ".headimage {\n"
     "  float: right;\n"
     "  margin-left: 5px;\n"
-            "}\n\n").arg(cg.highlight().name())
-            .arg(cg.highlightedText().name());
+            "}\n\n").tqarg(cg.highlight().name())
+            .tqarg(cg.highlightedText().name());
     
     m_combinedModeCSS += TQString(
     "body { clear: none; }\n\n"
@@ -368,11 +368,11 @@ void ArticleViewer::displayAboutPage()
 {
     TQString location = locate("data", "akregator/about/main.html");
     TQString content = KPIM::kFileToString(location);
-    content = content.arg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
+    content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
     if ( kapp->reverseLayout() )
-        content = content.arg( "@import \"%1\";" ).arg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
+        content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
     else
-        content = content.arg( "" );
+        content = content.tqarg( "" );
 
     begin(KURL( location ));
     TQString info =
@@ -389,25 +389,25 @@ void ArticleViewer::displayAboutPage()
             "<p>We hope that you will enjoy Akregator.</p>\n"
             "<p>Thank you,</p>\n"
             "<p style='margin-bottom: 0px'>&nbsp; &nbsp; The Akregator Team</p>\n")
-            .arg(AKREGATOR_VERSION) // Akregator version
-            .arg("http://akregator.kde.org/"); // Akregator homepage URL
+            .tqarg(AKREGATOR_VERSION) // Akregator version
+            .tqarg("http://akregator.kde.org/"); // Akregator homepage URL
 
     TQString fontSize = TQString::number( pointsToPixel( Settings::mediumFontSize() ));
     TQString appTitle = i18n("Akregator");
     TQString catchPhrase = ""; //not enough space for a catch phrase at default window size i18n("Part of the Kontact Suite");
     TQString quickDescription = i18n("An RSS feed reader for the K Desktop Environment.");
-    write(content.arg(fontSize).arg(appTitle).arg(catchPhrase).arg(quickDescription).arg(info));
+    write(content.tqarg(fontSize).tqarg(appTitle).tqarg(catchPhrase).tqarg(quickDescription).tqarg(info));
     end();
 }
 
 TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& article)
 {
     TQString text;
-    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
 
     if (!article.title().isEmpty())
     {
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
         if (article.link().isValid())
             text += "<a href=\""+article.link().url()+"\">";
         text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
@@ -417,16 +417,16 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
     }
     if (article.pubDate().isValid())
     {
-        text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
-        text += TQString ("%1:").arg(i18n("Date"));
+        text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
+        text += TQString ("%1:").tqarg(i18n("Date"));
         text += "</span><span class=\"headertext\">";
         text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL?
     }
     TQString author = article.author();
     if (!author.isEmpty())
     {
-        text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
-        text += TQString ("%1:").arg(i18n("Author"));
+        text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
+        text += TQString ("%1:").tqarg(i18n("Author"));
         text += "</span><span class=\"headertext\">";
         text += author+"</span>\n"; // TODO: might need RTL?
     }
@@ -437,14 +437,14 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
         TQString file = Utils::fileNameForUrl(feed->xmlUrl());
         KURL u(m_imageDir);
         u.setFileName(file);
-        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
+        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
     }
 
     
 
     if (!article.description().isEmpty())
     {
-        text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
+        text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
         text += "<span class=\"content\">"+article.description()+"</span>";
         text += "</div>";
     }
@@ -486,7 +486,7 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
         //int length = article.enclosure().length();
         //TQString lengthStr = KIO::convertSize(length);
 
-        //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").arg(url).arg(url).arg(lengthStr).arg(type);
+        //text += TQString("<hr><div><a href=\"%1\">%2</a> (%3, %4)</div>").tqarg(url).tqarg(url).tqarg(lengthStr).tqarg(type);
     }
     //kdDebug() << text << endl;
     return text;
@@ -496,13 +496,13 @@ TQString ArticleViewer::formatArticleNormalMode(Feed* feed, const Article& artic
 TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& article)
 {
     TQString text;
-    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").arg(TQApplication::reverseLayout() ? "rtl" : "ltr");
+    text = TQString("<div class=\"headerbox\" dir=\"%1\">\n").tqarg(TQApplication::reverseLayout() ? "rtl" : "ltr");
 
     KURL link = article.link();
     
     if (!article.title().isEmpty())
     {
-        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").arg(directionOf(Utils::stripTags(article.title())));
+        text += TQString("<div class=\"headertitle\" dir=\"%1\">\n").tqarg(directionOf(Utils::stripTags(article.title())));
         if (link.isValid())
             text += "<a href=\""+link.url()+"\">";
         text += article.title().tqreplace("<", "&lt;").tqreplace(">", "&gt;"); // TODO: better leave things escaped in the parser
@@ -512,8 +512,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
     }
     if (article.pubDate().isValid())
     {
-        text += TQString("<span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Date")));
-        text += TQString ("%1:").arg(i18n("Date"));
+        text += TQString("<span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Date")));
+        text += TQString ("%1:").tqarg(i18n("Date"));
         text += "</span><span class=\"headertext\">";
         text += KGlobal::locale()->formatDateTime(article.pubDate(), false, false)+"</span>\n"; // TODO: might need RTL?
     }
@@ -521,8 +521,8 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
     TQString author = article.author();
     if (!author.isEmpty())
     {
-        text += TQString("<br/><span class=\"header\" dir=\"%1\">").arg(directionOf(i18n("Author")));
-        text += TQString ("%1:").arg(i18n("Author"));
+        text += TQString("<br/><span class=\"header\" dir=\"%1\">").tqarg(directionOf(i18n("Author")));
+        text += TQString ("%1:").tqarg(i18n("Author"));
         text += "</span><span class=\"headertext\">";
         text += author+"</span>\n"; // TODO: might need RTL?
     }
@@ -534,14 +534,14 @@ TQString ArticleViewer::formatArticleCombinedMode(Feed* feed, const Article& art
         TQString file = Utils::fileNameForUrl(feed->xmlUrl());
         KURL u(m_imageDir);
         u.setFileName(file);
-        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
+        text += TQString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").tqarg(feed->htmlUrl()).tqarg(u.url());
     }
 
     
 
     if (!article.description().isEmpty())
     {
-        text += TQString("<div dir=\"%1\">").arg(directionOf(Utils::stripTags(article.description())) );
+        text += TQString("<div dir=\"%1\">").tqarg(directionOf(Utils::stripTags(article.description())) );
         text += "<span class=\"content\">"+article.description()+"</span>";
         text += "</div>";
     }

akregator/src/dragobjects.h

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

akregator/src/feedlistview.cpp

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

akregator/src/folder.cpp

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

akregator/src/librss/feeddetector.cpp

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

akregator/src/librss/tools_p.cpp

@@ -69,8 +69,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
         return HTML;
     
     if (type == TQString::fromUtf8("text")
-        || (type.startsWith(TQString::fromUtf8("text/"), false)
-        && !type.startsWith(TQString::fromUtf8("text/xml"), false))
+        || (type.tqstartsWith(TQString::fromUtf8("text/"), false)
+        && !type.tqstartsWith(TQString::fromUtf8("text/xml"), false))
        )
         return Text;
     
@@ -85,8 +85,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type
     
     
     if (xmltypes.tqcontains(type)
-        || type.endsWith(TQString::fromUtf8("+xml"), false)
-        || type.endsWith(TQString::fromUtf8("/xml"), false))
+        || type.tqendsWith(TQString::fromUtf8("+xml"), false)
+        || type.tqendsWith(TQString::fromUtf8("/xml"), false))
         return XML;
     
     return Binary;
@@ -239,7 +239,7 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver
         name = email;
     
     if (!email.isNull())
-        return TQString("<a href=\"mailto:%1\">%2</a>").arg(email).arg(name);
+        return TQString("<a href=\"mailto:%1\">%2</a>").tqarg(email).tqarg(name);
     else
         return name;
 }

akregator/src/listtabwidget.cpp

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

akregator/src/mainwindow.cpp

@@ -55,14 +55,14 @@
 #include <tqmetaobject.h>
 #include <tqpen.h>
 #include <tqpainter.h>
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
 #include <tqtimer.h>
 
 
 namespace Akregator {
 
 BrowserInterface::BrowserInterface( MainWindow *shell, const char *name )
-    : KParts::BrowserInterface( shell, name )
+    : KParts::BrowserInterface( TQT_TQOBJECT(shell), name )
 {
     m_shell = shell;
 }
@@ -104,7 +104,7 @@ bool MainWindow::loadPart()
     {
         // now that the Part is loaded, we cast it to a Part to get
         // our hands on it
-        m_part = static_cast<Akregator::Part*>(factory->create(this, "akregator_part", "KParts::ReadOnlyPart" ));
+        m_part = static_cast<Akregator::Part*>(factory->create(TQT_TQOBJECT(this), "akregator_part", "KParts::ReadOnlyPart" ));
 
         if (m_part)
         {
@@ -154,13 +154,13 @@ void MainWindow::setupActions()
 {
     connectActionCollection(actionCollection());
 
-    KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
+    KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
 
     setStandardToolBarMenuEnabled(true);
     createStandardStatusBarAction();
 
-    KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-    KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+    KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
+    KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
 void MainWindow::saveProperties(KConfig* config)

akregator/src/notificationmanager.cpp

@@ -76,7 +76,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds)
     if (feeds.count() == 1)
     {
         KNotifyClient::Instance inst(m_instance);
-        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").arg(feeds[0]));
+        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").tqarg(feeds[0]));
     }
     else if (feeds.count() > 1)
     {
@@ -84,7 +84,7 @@ void NotificationManager::slotNotifyFeeds(const TQStringList& feeds)
         for (TQStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it)
             message += *it + "\n";
         KNotifyClient::Instance inst(m_instance);
-        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message));
+        KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").tqarg(message));
     }
 }
 
@@ -99,7 +99,7 @@ void NotificationManager::doNotify()
         if (feedTitle != (*it).feed()->title())
         {
             feedTitle = (*it).feed()->title();
-            message += TQString("<p><b>%1:</b></p>").arg(feedTitle);
+            message += TQString("<p><b>%1:</b></p>").tqarg(feedTitle);
         }
         message += (*it).title() + "<br>";
     }

akregator/src/pageviewer.cpp

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

akregator/src/pluginmanager.cpp

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

akregator/src/propertiesdialog.cpp

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

akregator/src/tabwidget.cpp

@@ -166,8 +166,8 @@ void TabWidget::removeFrame(Frame *f)
 uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
 {
     int hframe, overlap;
-    hframe = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
-    overlap = tabBar()->style().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+    hframe = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+    overlap = tabBar()->tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
 
     TQFontMetrics fm = tabBar()->fontMetrics();
     int x = 0;
@@ -183,7 +183,7 @@ uint TabWidget::tabBarWidthForMaxChars( uint maxLength )
         if ( tab->iconSet() )
             iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
 
-        x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this,                             TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
+        x += ( tabBar()->tqstyle().tqsizeFromContents( TQStyle::CT_TabBarTab, this,                             TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width();
     }
     return x;
 }
@@ -288,8 +288,8 @@ void TabWidget::slotCopyLinkAddress()
 
     url = view->part()->url();
     
-    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Selection);
-    kapp->clipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
+    kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Selection);
+    kapp->tqclipboard()->setText(url.prettyURL(), TQClipboard::Clipboard);
 }
 
 void TabWidget::slotCloseTab()

akregator/src/trayicon.cpp

@@ -74,7 +74,7 @@ TrayIcon::~TrayIcon()
 
 
 void TrayIcon::mousePressEvent(TQMouseEvent *e) {
-    if (e->button() == LeftButton) {
+    if (e->button() == Qt::LeftButton) {
         emit showPart();
     }
 
@@ -116,7 +116,7 @@ TQPixmap TrayIcon::takeScreenshot() const
     // Paint the border
     const int BORDER = 1;
     TQPixmap finalShot(w + 2*BORDER, h + 2*BORDER);
-    finalShot.fill(KApplication::palette().active().foreground());
+    finalShot.fill(KApplication::tqpalette().active().foreground());
     painter.begin(&finalShot);
     painter.drawPixmap(BORDER, BORDER, shot);
     painter.end();
@@ -177,7 +177,7 @@ void TrayIcon::slotSetUnread(int unread)
 
 void TrayIcon::viewButtonClicked()
 {
-	TQWidget *p=static_cast<TQWidget*>(tqparent());
+	TQWidget *p=TQT_TQWIDGET(tqparent());
 	KWin::forceActiveWindow(p->winId());
 }
 

akregator/src/treenode.cpp

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

akregator/src/viewer.cpp

@@ -130,7 +130,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
 {
     m_url = completeURL(url);
     browserExtension()->setURLArgs(args);
-    if (button == LeftButton)
+    if (button == Qt::LeftButton)
     {
         switch (Settings::lMBBehaviour())
         {
@@ -146,7 +146,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr
         }
         return;
     }
-    else if (button == MidButton)
+    else if (button == Qt::MidButton)
     {
         switch (Settings::mMBBehaviour())
         {
@@ -203,7 +203,7 @@ void Viewer::slotCopy()
 {
     TQString text = selectedText();
     text.tqreplace( TQChar( 0xa0 ), ' ' );
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
     cb->setText(text);
     connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) );
@@ -212,7 +212,7 @@ void Viewer::slotCopy()
 void Viewer::slotCopyLinkAddress()
 {
    if(m_url.isEmpty()) return;
-   TQClipboard *cb = TQApplication::clipboard();
+   TQClipboard *cb = TQApplication::tqclipboard();
    cb->setText(m_url.prettyURL(), TQClipboard::Clipboard);
    cb->setText(m_url.prettyURL(), TQClipboard::Selection);
 }

certmanager/certificateinfowidgetimpl.cpp

@@ -126,7 +126,7 @@ void CertificateInfoWidgetImpl::setKey( const GpgME::Key & key  ) {
 
   TQListViewItem * item = 0;
   item = new TQListViewItem( listView, item, i18n("Valid"), TQString("From %1 to %2")
-			    .arg( time_t2string( key.subkey(0).creationTime() ),
+			    .tqarg( time_t2string( key.subkey(0).creationTime() ),
 				  time_t2string( key.subkey(0).expirationTime() ) ) );
   item = new TQListViewItem( listView, item, i18n("Can be used for signing"),
 			    key.canSign() ? i18n("Yes") : i18n("No") );
@@ -187,7 +187,7 @@ static void showChainListError( TQWidget * tqparent, const GpgME::Error & err, c
   const TQString msg = i18n("<qt><p>An error occurred while fetching "
 			   "the certificate <b>%1</b> from the backend:</p>"
 			   "<p><b>%2</b></p></qt>")
-    .arg( subject ? TQString::fromUtf8( subject ) : TQString(),
+    .tqarg( subject ? TQString::fromUtf8( subject ) : TQString(),
 	  TQString::fromLocal8Bit( err.asString() ) );
   KMessageBox::error( tqparent, msg, i18n("Certificate Listing Failed" ) );
 }
@@ -253,7 +253,7 @@ void CertificateInfoWidgetImpl::startCertificateChainListing() {
 }
 
 void CertificateInfoWidgetImpl::startCertificateDump() {
-  KProcess* proc = new KProcess( this );
+  KProcess* proc = new KProcess( TQT_TQOBJECT(this) );
   (*proc) << "gpgsm"; // must be in the PATH
   (*proc) << "--dump-keys";
   (*proc) << mChain.front().primaryFingerprint();
@@ -266,7 +266,7 @@ void CertificateInfoWidgetImpl::startCertificateDump() {
                     this, TQT_SLOT( slotDumpProcessExited(KProcess*) ) );
 
   if ( !proc->start( KProcess::NotifyOnExit, (KProcess::Communication)(KProcess::Stdout | KProcess::Stderr) ) ) {
-    TQString wmsg = i18n("Failed to execute gpgsm:\n%1").arg( i18n( "program not found" ) );
+    TQString wmsg = i18n("Failed to execute gpgsm:\n%1").tqarg( i18n( "program not found" ) );
     dumpView->setText( TQStyleSheet::escape( wmsg ) );
     delete proc;
   }
@@ -294,9 +294,9 @@ void CertificateInfoWidgetImpl::slotDumpProcessExited(KProcess* proc) {
     {
       TQString wmsg = i18n("Failed to execute gpgsm:\n%1");
       if ( rc == -1 )
-        wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
+        wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
       else
-        wmsg = wmsg.arg( strerror(rc) );
+        wmsg = wmsg.tqarg( strerror(rc) );
       dumpView->setText( TQStyleSheet::escape( wmsg ) );
     }
   }
@@ -328,7 +328,7 @@ void CertificateInfoWidgetImpl::updateChainView() {
     item = new TQListViewItem( pathView, Kleo::DN( (*it++).userID(0).id() ).prettyDN() );
   else {
     item = new TQListViewItem( pathView, i18n("Issuer certificate not found ( %1)")
-			      .arg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
+			      .tqarg( Kleo::DN( (*it).issuerName() ).prettyDN() ) );
     item->setOpen( true ); // TQt bug: doesn't open after setEnabled( false ) :/
     item->setEnabled( false );
   }

certmanager/certificatewizardimpl.cpp

@@ -88,10 +88,10 @@ static TQString attributeLabel( const TQString & attr, bool required ) {
   if ( !label.isEmpty() )
     if ( required )
       return i18n("Format string for the labels in the \"Your Personal Data\" page - required field",
-		  "*%1 (%2):").arg( label, attr );
+		  "*%1 (%2):").tqarg( label, attr );
     else
       return i18n("Format string for the labels in the \"Your Personal Data\" page",
-		  "%1 (%2):").arg( label, attr );
+		  "%1 (%2):").tqarg( label, attr );
 
   else if ( required )
     return '*' + attr + ':';
@@ -196,7 +196,7 @@ void CertificateWizardImpl::slotGenerateCertificate()
     TQString certParms;
     certParms += "<GnupgKeyParms format=\"internal\">\n";
     certParms += "Key-Type: RSA\n";
-    certParms += TQString( "Key-Length: %1\n" ).arg( keyLengths[keyLengthCB->currentItem()] );
+    certParms += TQString( "Key-Length: %1\n" ).tqarg( keyLengths[keyLengthCB->currentItem()] );
     certParms += "Key-Usage: ";
     if ( signOnlyCB->isChecked() )
       certParms += "Sign";
@@ -255,7 +255,7 @@ void CertificateWizardImpl::slotGenerateCertificate()
     if ( err )
       KMessageBox::error( this,
 			  i18n( "Could not start certificate generation: %1" )
-			  .arg( TQString::fromLocal8Bit( err.asString() ) ),
+			  .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
 			  i18n( "Certificate Manager Error" ) );
     else {
       generatePB->setEnabled( false );
@@ -278,7 +278,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res,
 	  if ( !res.error().isCanceled() )
 	    KMessageBox::error( this,
 				i18n( "Could not generate certificate: %1" )
-				.arg( TQString::tqfromLatin1( res.error().asString() ) ),
+				.tqarg( TQString::tqfromLatin1( res.error().asString() ) ),
 				i18n( "Certificate Manager Error" ) );
     } else {
         // next will stay enabled until the user clicks Generate
@@ -362,7 +362,7 @@ void CertificateWizardImpl::createPersonalDataPage()
     if ( config.entryIsImmutable( attr ) )
       le->setEnabled( false );
 
-    _attrPairList.append(qMakePair(key, le));
+    _attrPairList.append(tqMakePair(key, le));
 
     connect( le, TQT_SIGNAL(textChanged(const TQString&)),
 	     TQT_SLOT(slotEnablePersonalDataPageExit()) );
@@ -391,7 +391,7 @@ void CertificateWizardImpl::slotURLSelected( const TQString& _url )
   // The application/pkcs10 mimetype didn't have a native extension,
   // so the filedialog didn't have the checkbox for auto-adding it.
   TQString fileName = url.fileName();
-  int pos = fileName.findRev( '.' );
+  int pos = fileName.tqfindRev( '.' );
   if ( pos < 0 ) // no extension
     url.setFileName( fileName + ".p10" );
 #endif
@@ -434,7 +434,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
   if ( result != 0 ) {
     kdDebug() << "Couldn't connect to KMail\n";
     KMessageBox::error( this,
-                        i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).arg( error ) );
+                        i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).tqarg( error ) );
     return;
   }
 
@@ -481,7 +481,7 @@ void CertificateWizardImpl::accept()
       if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(
                                                                      this,
                                                                      i18n( "A file named \"%1\" already exists. "
-                                                                           "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
+                                                                           "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
                                                                      i18n( "Overwrite File?" ),
                                                                      i18n( "&Overwrite" ) ) )
         return;

certmanager/certmanager.cpp

@@ -2,7 +2,7 @@
     certmanager.cpp
 
     This file is part of Kleopatra, the KDE keymanager
-    Copyright (c) 2001,2002,2004 Klarälvdalens Datakonsult AB
+    Copyright (c) 2001,2002,2004 Klar�lvdalens Datakonsult AB
 
     Kleopatra is free software; you can redistribute it and/or modify
     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 ) {
 void CertManager::createActions() {
   KAction * action = 0;
 
-  (void)KStdAction::quit( this, TQT_SLOT(close()), actionCollection() );
+  (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
 
-  action = KStdAction::redisplay( this, TQT_SLOT(slotRedisplay()), actionCollection() );
+  action = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(slotRedisplay()), actionCollection() );
   // work around the fact that the stdaction has no shortcut
   KShortcut reloadShortcut = KStdAccel::shortcut(KStdAccel::Reload);
   reloadShortcut.append(KKey(CTRL + Key_R));
   action->setShortcut( reloadShortcut );
 
-  connectEnableOperationSignal( this, action );
+  connectEnableOperationSignal( TQT_TQOBJECT(this), action );
 
   action = new KAction( i18n("Stop Operation"), "stop", Key_Escape,
-			this, TQT_SIGNAL(stopOperations()),
+			TQT_TQOBJECT(this), TQT_SIGNAL(stopOperations()),
 			actionCollection(), "view_stop_operations" );
   action->setEnabled( false );
 
   (void)   new KAction( i18n("New Key Pair..."), "filenew", 0,
-			this, TQT_SLOT(newCertificate()),
+			TQT_TQOBJECT(this), TQT_SLOT(newCertificate()),
 			actionCollection(), "file_new_certificate" );
 
   connect( new KToggleAction( i18n("Hierarchical Key List"), 0,
@@ -276,100 +276,100 @@ void CertManager::createActions() {
 	   TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleHierarchicalView(bool)) );
 
   action = new KAction( i18n("Expand All"), 0, CTRL+Key_Period,
-			this, TQT_SLOT(slotExpandAll()),
+			TQT_TQOBJECT(this), TQT_SLOT(slotExpandAll()),
 			actionCollection(), "view_expandall" );
   action = new KAction( i18n("Collapse All"), 0, CTRL+Key_Comma,
-			this, TQT_SLOT(slotCollapseAll()),
+			TQT_TQOBJECT(this), TQT_SLOT(slotCollapseAll()),
 			actionCollection(), "view_collapseall" );
 
   (void)   new KAction( i18n("Refresh CRLs"), 0, 0,
-			this, TQT_SLOT(slotRefreshKeys()),
+			TQT_TQOBJECT(this), TQT_SLOT(slotRefreshKeys()),
 			actionCollection(), "certificates_refresh_clr" );
 
 #ifdef NOT_IMPLEMENTED_ANYWAY
   mRevokeCertificateAction = new KAction( i18n("Revoke"), 0,
-                                          this, TQT_SLOT(revokeCertificate()),
+                                          TQT_TQOBJECT(this), TQT_SLOT(revokeCertificate()),
                                           actionCollection(), "edit_revoke_certificate" );
   connectEnableOperationSignal( this, mRevokeCertificateAction );
 
   mExtendCertificateAction = new KAction( i18n("Extend"), 0,
-                                          this, TQT_SLOT(extendCertificate()),
+                                          TQT_TQOBJECT(this), TQT_SLOT(extendCertificate()),
                                           actionCollection(), "edit_extend_certificate" );
   connectEnableOperationSignal( this, mExtendCertificateAction );
 #endif
 
   mDeleteCertificateAction = new KAction( i18n("Delete"), "editdelete", Key_Delete,
-                                    this, TQT_SLOT(slotDeleteCertificate()),
+                                    TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCertificate()),
                                     actionCollection(), "edit_delete_certificate" );
-  connectEnableOperationSignal( this, mDeleteCertificateAction );
+  connectEnableOperationSignal( TQT_TQOBJECT(this), mDeleteCertificateAction );
 
   mValidateCertificateAction = new KAction( i18n("Validate"), "reload", SHIFT + Key_F5,
-					    this, TQT_SLOT(slotValidate()),
+					    TQT_TQOBJECT(this), TQT_SLOT(slotValidate()),
 					    actionCollection(), "certificates_validate" );
-  connectEnableOperationSignal( this, mValidateCertificateAction );
+  connectEnableOperationSignal( TQT_TQOBJECT(this), mValidateCertificateAction );
 
   mImportCertFromFileAction = new KAction( i18n("Import Certificates..."), 0,
-					   this, TQT_SLOT(slotImportCertFromFile()),
+					   TQT_TQOBJECT(this), TQT_SLOT(slotImportCertFromFile()),
 					   actionCollection(), "file_import_certificates" );
-  connectEnableOperationSignal( this, mImportCertFromFileAction );
+  connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCertFromFileAction );
 
   mImportCRLFromFileAction = new KAction( i18n("Import CRLs..."), 0,
-					  this, TQT_SLOT(importCRLFromFile()),
+					  TQT_TQOBJECT(this), TQT_SLOT(importCRLFromFile()),
 					  actionCollection(), "file_import_crls" );
-  connectEnableOperationSignal( this, mImportCRLFromFileAction );
+  connectEnableOperationSignal( TQT_TQOBJECT(this), mImportCRLFromFileAction );
 
   mExportCertificateAction = new KAction( i18n("Export Certificates..."), "export", 0,
-					  this, TQT_SLOT(slotExportCertificate()),
+					  TQT_TQOBJECT(this), TQT_SLOT(slotExportCertificate()),
 					  actionCollection(), "file_export_certificate" );
 
   mExportSecretKeyAction = new KAction( i18n("Export Secret Key..."), "export", 0,
-                                        this, TQT_SLOT(slotExportSecretKey()),
+                                        TQT_TQOBJECT(this), TQT_SLOT(slotExportSecretKey()),
                                         actionCollection(), "file_export_secret_keys" );
-  connectEnableOperationSignal( this, mExportSecretKeyAction );
+  connectEnableOperationSignal( TQT_TQOBJECT(this), mExportSecretKeyAction );
 
   mViewCertDetailsAction = new KAction( i18n("Certificate Details..."), 0, 0,
-                                        this, TQT_SLOT(slotViewDetails()), actionCollection(),
+                                        TQT_TQOBJECT(this), TQT_SLOT(slotViewDetails()), actionCollection(),
                                         "view_certificate_details" );
   mDownloadCertificateAction = new KAction( i18n( "Download"), 0, 0,
-                                        this, TQT_SLOT(slotDownloadCertificate()), actionCollection(),
+                                        TQT_TQOBJECT(this), TQT_SLOT(slotDownloadCertificate()), actionCollection(),
                                         "download_certificate" );
 
   const TQString dirmngr = KStandardDirs::findExe( "gpgsm" );
   mDirMngrFound = !dirmngr.isEmpty();
 
   action = new KAction( i18n("Dump CRL Cache..."), 0,
-			this, TQT_SLOT(slotViewCRLs()),
+			TQT_TQOBJECT(this), TQT_SLOT(slotViewCRLs()),
 			actionCollection(), "crl_dump_crl_cache" );
   action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
 
   action = new KAction( i18n("Clear CRL Cache..."), 0,
-			this, TQT_SLOT(slotClearCRLs()),
+			TQT_TQOBJECT(this), TQT_SLOT(slotClearCRLs()),
 			actionCollection(), "crl_clear_crl_cache" );
   action->setEnabled( mDirMngrFound ); // we also need dirmngr for this
 
-  action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, this,
+  action = new KAction( i18n("GnuPG Log Viewer..."), "pgp-keys", 0, TQT_TQOBJECT(this),
                         TQT_SLOT(slotStartWatchGnuPG()), actionCollection(), "tools_start_kwatchgnupg");
   // disable action if no kwatchgnupg binary is around
   if (KStandardDirs::findExe("kwatchgnupg").isEmpty()) action->setEnabled(false);
 
   (void)new LabelAction( i18n("Search:"), actionCollection(), "label_action" );
 
-  mLineEditAction = new LineEditAction( TQString(), actionCollection(), this,
+  mLineEditAction = new LineEditAction( TQString(), actionCollection(), TQT_TQOBJECT(this),
 					TQT_SLOT(slotSearch()),
 					"query_lineedit_action");
 
   TQStringList lst;
   lst << i18n("In Local Certificates") << i18n("In External Certificates");
-  mComboAction = new ComboAction( lst, actionCollection(), this, TQT_SLOT( slotToggleRemote(int) ),
+  mComboAction = new ComboAction( lst, actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotToggleRemote(int) ),
                                   "location_combo_action", mNextFindRemote? 1 : 0 );
 
-  mFindAction = new KAction( i18n("Find"), "tqfind", 0, this, TQT_SLOT(slotSearch()),
+  mFindAction = new KAction( i18n("Find"), "tqfind", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearch()),
 			     actionCollection(), "tqfind" );
 
-  KStdAction::keyBindings( this, TQT_SLOT(slotEditKeybindings()), actionCollection() );
-  KStdAction::preferences( this, TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
+  KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotEditKeybindings()), actionCollection() );
+  KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotShowConfigurationDialog()), actionCollection() );
 
-  new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, this, TQT_SLOT(slotConfigureGpgME()),
+  new KAction( i18n( "Configure &GpgME Backend" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureGpgME()),
                actionCollection(), "configure_gpgme" );
 
   createStandardStatusBarAction();
@@ -523,7 +523,7 @@ void CertManager::slotRefreshKeysResult( const GpgME::Error & err ) {
     return;
   if ( err )
     KMessageBox::error( this, i18n("An error occurred while trying to refresh "
-				   "keys:\n%1").arg( TQString::fromLocal8Bit( err.asString() ) ),
+				   "keys:\n%1").tqarg( TQString::fromLocal8Bit( err.asString() ) ),
 			i18n("Refreshing Keys Failed") );
 }
 
@@ -532,7 +532,7 @@ static void showKeyListError( TQWidget * tqparent, const GpgME::Error & err ) {
   const TQString msg = i18n( "<qt><p>An error occurred while fetching "
 			    "the certificates from the backend:</p>"
 			    "<p><b>%1</b></p></qt>" )
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
 
   KMessageBox::error( tqparent, msg, i18n( "Certificate Listing Failed" ) );
 }
@@ -592,7 +592,7 @@ static void selectKeys( Kleo::KeyListView * lv, const std::set<std::string> & fp
   for  ( TQListViewItemIterator it( lv ) ; it.current() ; ++it )
     if ( Kleo::KeyListViewItem * item = Kleo::lvi_cast<Kleo::KeyListViewItem>( it.current() ) ) {
       const char * fpr = item->key().primaryFingerprint();
-      item->setSelected( fpr && fprs.tqfind( fpr ) != fprs.end() );
+      item->setSelected( fpr && fprs.find( fpr ) != fprs.end() );
     }
 }
 
@@ -705,8 +705,8 @@ static void showCertificateDownloadError( TQWidget * tqparent, const GpgME::Erro
   const TQString msg = i18n( "<qt><p>An error occurred while trying "
 			    "to download the certificate %1:</p>"
 			    "<p><b>%2</b></p></qt>" )
-                      .arg( certDisplayName )
-                      .arg( TQString::fromLocal8Bit( err.asString() ) );
+                      .tqarg( certDisplayName )
+                      .tqarg( TQString::fromLocal8Bit( err.asString() ) );
 
   KMessageBox::error( tqparent, msg, i18n( "Certificate Download Failed" ) );
 }
@@ -773,8 +773,8 @@ static void showCertificateImportError( TQWidget * tqparent, const GpgME::Error
   const TQString msg = i18n( "<qt><p>An error occurred while trying "
 			    "to import the certificate %1:</p>"
 			    "<p><b>%2</b></p></qt>" )
-                      .arg( certDisplayName )
-                      .arg( TQString::fromLocal8Bit( err.asString() ) );
+                      .tqarg( certDisplayName )
+                      .tqarg( TQString::fromLocal8Bit( err.asString() ) );
   KMessageBox::error( tqparent, msg, i18n( "Certificate Import Failed" ) );
 }
 
@@ -810,50 +810,50 @@ void CertManager::slotCertificateImportResult( const GpgME::ImportResult & res )
     const TQString boldLine = i18n("<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>");
 
     TQStringList lines;
-    lines.push_back( normalLine.arg( i18n("Total number processed:"),
+    lines.push_back( normalLine.tqarg( i18n("Total number processed:"),
 				     TQString::number( res.numConsidered() ) ) );
-    lines.push_back( normalLine.arg( i18n("Imported:"),
+    lines.push_back( normalLine.tqarg( i18n("Imported:"),
 				     TQString::number( res.numImported() ) ) );
     if ( res.newSignatures() )
-      lines.push_back( normalLine.arg( i18n("New signatures:"),
+      lines.push_back( normalLine.tqarg( i18n("New signatures:"),
 				       TQString::number( res.newSignatures() ) ) );
     if ( res.newUserIDs() )
-      lines.push_back( normalLine.arg( i18n("New user IDs:"),
+      lines.push_back( normalLine.tqarg( i18n("New user IDs:"),
 				       TQString::number( res.newUserIDs() ) ) );
     if ( res.numKeysWithoutUserID() )
-      lines.push_back( normalLine.arg( i18n("Keys without user IDs:"),
+      lines.push_back( normalLine.tqarg( i18n("Keys without user IDs:"),
 				       TQString::number( res.numKeysWithoutUserID() ) ) );
     if ( res.newSubkeys() )
-      lines.push_back( normalLine.arg( i18n("New subkeys:"),
+      lines.push_back( normalLine.tqarg( i18n("New subkeys:"),
 				       TQString::number( res.newSubkeys() ) ) );
     if ( res.newRevocations() )
-      lines.push_back( boldLine.arg( i18n("Newly revoked:"),
+      lines.push_back( boldLine.tqarg( i18n("Newly revoked:"),
 				     TQString::number( res.newRevocations() ) ) );
     if ( res.notImported() )
-      lines.push_back( boldLine.arg( i18n("Not imported:"),
+      lines.push_back( boldLine.tqarg( i18n("Not imported:"),
 				     TQString::number( res.notImported() ) ) );
     if ( res.numUnchanged() )
-      lines.push_back( normalLine.arg( i18n("Unchanged:"),
+      lines.push_back( normalLine.tqarg( i18n("Unchanged:"),
 				       TQString::number( res.numUnchanged() ) ) );
     if ( res.numSecretKeysConsidered() )
-      lines.push_back( normalLine.arg( i18n("Secret keys processed:"),
+      lines.push_back( normalLine.tqarg( i18n("Secret keys processed:"),
 				       TQString::number( res.numSecretKeysConsidered() ) ) );
     if ( res.numSecretKeysImported() )
-      lines.push_back( normalLine.arg( i18n("Secret keys imported:"),
+      lines.push_back( normalLine.tqarg( i18n("Secret keys imported:"),
 				       TQString::number( res.numSecretKeysImported() ) ) );
     if ( res.numSecretKeysConsidered() - res.numSecretKeysImported() - res.numSecretKeysUnchanged() > 0 )
-      lines.push_back( boldLine.arg( i18n("Secret keys <em>not</em> imported:"),
+      lines.push_back( boldLine.tqarg( i18n("Secret keys <em>not</em> imported:"),
 				     TQString::number( res.numSecretKeysConsidered()
 						      - res.numSecretKeysImported()
 						      - res.numSecretKeysUnchanged() ) ) );
     if ( res.numSecretKeysUnchanged() )
-      lines.push_back( normalLine.arg( i18n("Secret keys unchanged:"),
+      lines.push_back( normalLine.tqarg( i18n("Secret keys unchanged:"),
 				       TQString::number( res.numSecretKeysUnchanged() ) ) );
 
     KMessageBox::information( this,
 			      i18n( "<qt><p>Detailed results of importing %1:</p>"
 				    "<table>%2</table></qt>" )
-			      .arg( displayName ).arg( lines.join( TQString() ) ),
+			      .tqarg( displayName ).tqarg( lines.join( TQString() ) ),
 			      i18n( "Certificate Import Result" ) );
 
     disconnectJobFromStatusBarProgress( res.error() );
@@ -875,7 +875,7 @@ void CertManager::slotDirmngrExited() {
     if ( !mDirmngrProc->normalExit() )
         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" ) );
     else if ( mDirmngrProc->exitStatus() )
-      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" ) );
+      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" ) );
     else
       KMessageBox::information( this, i18n( "CRL file imported successfully." ), i18n( "Certificate Manager Information" ) );
 
@@ -935,7 +935,7 @@ bool CertManager::connectAndStartDirmngr( const char * slot, const char * proces
            this, TQT_SLOT(slotStderr(KProcess*,char*,int)) );
   if( !mDirmngrProc->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) {
     delete mDirmngrProc; mDirmngrProc = 0;
-    KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).arg( processname ), i18n( "Certificate Manager Error" ) );
+    KMessageBox::error( this, i18n( "Unable to start %1 process. Please check your installation." ).tqarg( processname ), i18n( "Certificate Manager Error" ) );
     return false;
   }
   return true;
@@ -992,7 +992,7 @@ void CertManager::slotClearCRLsResult() {
   if ( !mDirmngrProc->normalExit() )
     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" ) );
   else if ( mDirmngrProc->exitStatus() )
-    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" ) );
+    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" ) );
   else
     KMessageBox::information( this, i18n( "CRL cache cleared successfully." ), i18n( "Certificate Manager Information" ) );
   delete mDirmngrProc; mDirmngrProc = 0;
@@ -1003,7 +1003,7 @@ static void showDeleteError( TQWidget * tqparent, const GpgME::Error & err ) {
   const TQString msg = i18n("<qt><p>An error occurred while trying to delete "
 			   "the certificates:</p>"
 			   "<p><b>%1</b></p></qt>")
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
   KMessageBox::error( tqparent, msg, i18n("Certificate Deletion Failed") );
 }
 
@@ -1031,7 +1031,7 @@ void CertManager::slotDeleteCertificate() {
     return;
 
   if ( !mHierarchyAnalyser ) {
-    mHierarchyAnalyser = new HierarchyAnalyser( this, "mHierarchyAnalyser" );
+    mHierarchyAnalyser = new HierarchyAnalyser( TQT_TQOBJECT(this), "mHierarchyAnalyser" );
     Kleo::KeyListJob * job = Kleo::CryptoBackendFactory::instance()->smime()->keyListJob();
     assert( job );
     connect( job, TQT_SIGNAL(nextKey(const GpgME::Key&)),
@@ -1076,7 +1076,7 @@ void CertManager::slotDeleteCertificate() {
   const TQString msg = keysToDelete.size() > keys.size()
     ? i18n("Do you really want to delete this certificate and the %1 certificates it certified?",
 	   "Do you really want to delete these %n certificates and the %1 certificates they certified?",
-	   keys.size() ).arg( keysToDelete.size() - keys.size() )
+	   keys.size() ).tqarg( keysToDelete.size() - keys.size() )
     : i18n("Do you really want to delete this certificate?",
 	   "Do you really want to delete these %n certificates?", keys.size() ) ;
 
@@ -1098,7 +1098,7 @@ void CertManager::slotDeleteCertificate() {
                           "the certificates:</p>"
                           "<p><b>%1</b><p></qt>" );
     KMessageBox::error( this,
-			str.arg( i18n("Operation not supported by the backend.") ),
+			str.tqarg( i18n("Operation not supported by the backend.") ),
 			i18n("Certificate Deletion Failed") );
   }
 
@@ -1206,7 +1206,7 @@ static void showCertificateExportError( TQWidget * tqparent, const GpgME::Error
   const TQString msg = i18n("<qt><p>An error occurred while trying to export "
 			   "the certificate:</p>"
 			   "<p><b>%1</b></p></qt>")
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
   KMessageBox::error( tqparent, msg, i18n("Certificate Export Failed") );
 }
 
@@ -1239,7 +1239,7 @@ static bool checkOverwrite( const KURL& url, bool& overwrite, TQWidget* w )
          KMessageBox::warningContinueCancel(
                                             w,
                                             i18n( "A file named \"%1\" already exists. "
-                                                  "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
+                                                  "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
                                             i18n( "Overwrite File?" ),
                                             i18n( "&Overwrite" ) ) )
       return false;
@@ -1301,7 +1301,7 @@ static void showSecretKeyExportError( TQWidget * tqparent, const GpgME::Error &
   const TQString msg = i18n("<qt><p>An error occurred while trying to export "
 			   "the secret key:</p>"
 			   "<p><b>%1</b></p></qt>")
-    .arg( TQString::fromLocal8Bit( err.asString() ) );
+    .tqarg( TQString::fromLocal8Bit( err.asString() ) );
   KMessageBox::error( tqparent, msg, i18n("Secret-Key Export Failed") );
 }
 

certmanager/conf/appearanceconfigwidgetbase.ui

@@ -162,9 +162,9 @@
     </connection>
     <connection>
         <sender>categoriesLV</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>AppearanceConfigWidgetBase</receiver>
-        <slot>slotSelectionChanged(QListViewItem*)</slot>
+        <slot>slotSelectionChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>defaultLookPB</sender>
@@ -205,7 +205,7 @@
     <slot access="protected">slotForegroundClicked()</slot>
     <slot access="protected">slotBackgroundClicked()</slot>
     <slot access="protected">slotFontClicked()</slot>
-    <slot access="protected">slotSelectionChanged( QListViewItem * )</slot>
+    <slot access="protected">slotSelectionChanged( TQListViewItem * )</slot>
     <slot access="protected">slotDefaultClicked()</slot>
     <slot access="protected">slotItalicClicked()</slot>
     <slot access="protected">slotBoldClicked()</slot>

certmanager/conf/dirservconfigpage.cpp

@@ -283,11 +283,11 @@ Kleo::CryptoConfigEntry* DirectoryServicesConfigurationPage::configEntry( const
 {
     Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName );
     if ( !entry ) {
-        KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) );
+        KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) );
         return 0;
     }
     if( entry->argType() != argType || entry->isList() != isList ) {
-        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() ) );
+        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() ) );
         return 0;
     }
     return entry;

certmanager/hierarchyanalyser.cpp

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

certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp

@@ -90,20 +90,20 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow()
 void KWatchGnuPGMainWindow::slotClear()
 {
   mCentralWidget->clear();
-  mCentralWidget->append( tr("[%1] Log cleared").arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) );
+  mCentralWidget->append( tqtr("[%1] Log cleared").tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
 }
 
 void KWatchGnuPGMainWindow::createActions()
 {
   (void)new KAction( i18n("C&lear History"), "history_clear", CTRL+Key_L,
-		     this, TQT_SLOT( slotClear() ),
+		     TQT_TQOBJECT(this), TQT_SLOT( slotClear() ),
 		     actionCollection(), "clear_log" );
-  (void)KStdAction::saveAs( this, TQT_SLOT(slotSaveAs()), actionCollection() );
-  (void)KStdAction::close( this, TQT_SLOT(close()), actionCollection() );
-  (void)KStdAction::quit( this, TQT_SLOT(slotQuit()), actionCollection() );
-  (void)KStdAction::preferences( this, TQT_SLOT(slotConfigure()), actionCollection() );
-  ( void )KStdAction::keyBindings(this, TQT_SLOT(configureShortcuts()), actionCollection());
-  ( void )KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection());
+  (void)KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection() );
+  (void)KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
+  (void)KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection() );
+  (void)KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection() );
+  (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureShortcuts()), actionCollection());
+  (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
 
 #if 0
   (void)new KAction( i18n("Configure KWatchGnuPG..."), TQString::tqfromLatin1("configure"),
@@ -134,8 +134,8 @@ void KWatchGnuPGMainWindow::startWatcher()
 	while( mWatcher->isRunning() ) {
 	  kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);
 	}
-	mCentralWidget->append(tr("[%1] Log stopped")
-						   .arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate)));
+	mCentralWidget->append(tqtr("[%1] Log stopped")
+						   .tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)));
   }
   mWatcher->clearArguments();
   KConfig* config = kapp->config();
@@ -147,8 +147,8 @@ void KWatchGnuPGMainWindow::startWatcher()
   if( !mWatcher->start() ) {
 	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." ) );
   } else {
-	mCentralWidget->append( tr("[%1] Log started")
-							.arg( TQDateTime::tqcurrentDateTime().toString(TQt::ISODate) ) );
+	mCentralWidget->append( tqtr("[%1] Log started")
+							.tqarg( TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) ) );
   }
   connect( mWatcher, TQT_SIGNAL( processExited(KProcess*) ),
 		   this, TQT_SLOT( slotWatcherExited() ) );
@@ -176,7 +176,7 @@ void KWatchGnuPGMainWindow::setGnuPGConfig()
 		entry->setStringValue( TQString("socket://")+
 							   config->readEntry("Socket",
 												 WATCHGNUPGSOCKET ));
-		logclients << TQString("%1 (%2)").arg(*it).arg(comp->description());
+		logclients << TQString("%1 (%2)").tqarg(*it).tqarg(comp->description());
 	  }
 	  entry = group->entry("debug-level");
 	  if( entry ) {
@@ -237,7 +237,7 @@ void KWatchGnuPGMainWindow::slotSaveAs()
 	if( KMessageBox::Yes !=
 		KMessageBox::warningYesNo( this, i18n("The file named \"%1\" already "
 											  "exists. Are you sure you want "
-											  "to overwrite it?").arg(filename),
+											  "to overwrite it?").tqarg(filename),
 								   i18n("Overwrite File"), i18n("Overwrite"), KStdGuiItem::cancel() ) ) {
 	  return;
 	}

certmanager/lib/backends/chiasmus/chiasmusbackend.cpp

@@ -432,13 +432,13 @@ Kleo::CryptoBackend::Protocol * Kleo::ChiasmusBackend::protocol( const char * na
 
 bool Kleo::ChiasmusBackend::checkForOpenPGP( TQString * reason ) const {
   if ( reason )
-    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "OpenPGP" );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "OpenPGP" );
   return false;
 }
 
 bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const {
   if ( reason )
-    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "SMIME" );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "SMIME" );
   return false;
 }
 
@@ -454,7 +454,7 @@ bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const {
   const TQFileInfo fi( KShell::tildeExpand( chiasmus ) );
   if ( !fi.isExecutable() ) {
     if ( reason )
-      *reason = i18n( "File \"%1\" does not exist or is not executable." ).arg( chiasmus );
+      *reason = i18n( "File \"%1\" does not exist or is not executable." ).tqarg( chiasmus );
     return false;
   }
 
@@ -467,7 +467,7 @@ bool Kleo::ChiasmusBackend::checkForProtocol( const char * name, TQString * reas
   if ( qstricmp( name, "Chiasmus" ) == 0 )
     return checkForChiasmus( reason );
   if ( reason )
-    *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
+    *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name );
   return 0;
 }
 

certmanager/lib/backends/chiasmus/chiasmusjob.cpp

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

certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp

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

certmanager/lib/backends/chiasmus/obtainkeysjob.cpp

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

certmanager/lib/backends/qgpgme/qgpgmebackend.cpp

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

certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp

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

certmanager/lib/backends/qgpgme/qgpgmejob.cpp

@@ -276,21 +276,21 @@ char * Kleo::QGpgMEJob::getPassphrase( const char * useridHint, const char * /*d
   TQString msg = previousWasBad ?
                 i18n( "You need a passphrase to unlock the secret key for user:<br/> %1 (retry)" ) :
                 i18n( "You need a passphrase to unlock the secret key for user:<br/> %1" );
-  msg = msg.arg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
+  msg = msg.tqarg( TQString::fromUtf8( useridHint ) ) + "<br/><br/>";
   msg.prepend( "<qt>" );
   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/>";
   const TQString gpgAgent = KStandardDirs::findExe( "gpg-agent" );
   if ( !gpgAgent.isEmpty() ) {
     msg += i18n( "gpg-agent was found in %1, but does not appear to be running." )
-           .arg( gpgAgent );
+           .tqarg( gpgAgent );
   } else {
     msg += i18n( "gpg-agent is part of gnupg-%1, which you can download from %2" )
-           .arg( "1.9" )
-           .arg( "http://www.gnupg.org/download" );  // add #gnupg2 if you can make this a real link
+           .tqarg( "1.9" )
+           .tqarg( "http://www.gnupg.org/download" );  // add #gnupg2 if you can make this a real link
   }
   msg += "<br/>";
   msg += i18n( "For information on how to set up gpg-agent, see %1" )
-         .arg( "http://kmail.kde.org/kmail-pgpmime-howto.html" );
+         .tqarg( "http://kmail.kde.org/kmail-pgpmime-howto.html" );
   msg += "<br/><br/>";
   msg += i18n( "Enter passphrase:" );
   Kleo::PassphraseDialog dlg( msg, i18n("Passphrase Dialog") );

certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp

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

certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp

@@ -140,20 +140,20 @@ TQString Kleo::QGpgMEProgressTokenMapper::map( const TQString & token, int subto
 
   static const Map & tokenMap = makeMap();
 
-  const Map::const_iterator it1 = tokenMap.tqfind( token.lower() );
+  const Map::const_iterator it1 = tokenMap.find( token.lower() );
   if ( it1 == tokenMap.end() )
     return token;
-  std::map<int,Desc>::const_iterator it2 = it1->second.tqfind( subtoken );
+  std::map<int,Desc>::const_iterator it2 = it1->second.find( subtoken );
   if ( it2 == it1->second.end() )
-    it2 = it1->second.tqfind( 0 );
+    it2 = it1->second.find( 0 );
   if ( it2 == it1->second.end() )
     return token;
   const Desc & desc = it2->second;
   TQString result = i18n( desc.display );
   if ( desc.useCur )
-    result = result.arg( cur );
+    result = result.tqarg( cur );
   if ( desc.useTot )
-    result = result.arg( tot );
+    result = result.tqarg( tot );
   return result;
 }
 

certmanager/lib/cryptplugwrapper.cpp

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

certmanager/lib/kleo/cryptobackendfactory.cpp

@@ -111,7 +111,7 @@ Kleo::CryptoBackendFactory * Kleo::CryptoBackendFactory::instance() {
 // }
 
 const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const {
-  const BackendMap::const_iterator it = mBackends.tqfind( "SMIME" );
+  const BackendMap::const_iterator it = mBackends.find( "SMIME" );
   if ( it == mBackends.end() )
     return 0;
   if ( !it->second )
@@ -120,7 +120,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::smime() const
 }
 
 const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() const {
-  const BackendMap::const_iterator it = mBackends.tqfind( "OpenPGP" );
+  const BackendMap::const_iterator it = mBackends.find( "OpenPGP" );
   if ( it == mBackends.end() )
     return 0;
   if ( !it->second )
@@ -129,7 +129,7 @@ const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::openpgp() cons
 }
 
 const Kleo::CryptoBackend::Protocol * Kleo::CryptoBackendFactory::protocol( const char * name ) const {
-  const BackendMap::const_iterator it = mBackends.tqfind( name );
+  const BackendMap::const_iterator it = mBackends.find( name );
   if ( it == mBackends.end() )
     return 0;
   if ( !it->second )
@@ -154,7 +154,7 @@ void Kleo::CryptoBackendFactory::scanForBackends( TQStringList * reasons ) {
       if ( (*it)->supportsProtocol( protocol ) && !(*it)->checkForProtocol( protocol, &reason ) ) {
         if ( reasons ) {
           reasons->push_back( i18n("While scanning for %1 support in backend %2:")
-                              .arg( protocol, (*it)->displayName() ) );
+                              .tqarg( protocol, (*it)->displayName() ) );
           reasons->push_back( "  " + reason );
         }
       }
@@ -267,7 +267,7 @@ namespace {
 }
 
 bool Kleo::CryptoBackendFactory::knowsAboutProtocol( const char * name ) const {
-  return std::tqfind( mAvailableProtocols.begin(), mAvailableProtocols.end(),
+  return std::find( mAvailableProtocols.begin(), mAvailableProtocols.end(),
                     CaseInsensitiveString( name ) ) != mAvailableProtocols.end();
 }
 

certmanager/lib/kleo/dn.cpp

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

certmanager/lib/kleo/hierarchicalkeylistjob.cpp

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

certmanager/lib/kleo/multideletejob.cpp

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

certmanager/lib/tests/test_keygen.cpp

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

certmanager/lib/tests/test_keylister.cpp

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

certmanager/lib/ui/adddirectoryservicedialogimpl.cpp

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

certmanager/lib/ui/backendconfigwidget.cpp

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

certmanager/lib/ui/cryptoconfigmodule.cpp

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