diff options
Diffstat (limited to 'akregator')
35 files changed, 356 insertions, 356 deletions
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp index 9376024f3..6c7b3cee9 100644 --- a/akregator/src/actionmanagerimpl.cpp +++ b/akregator/src/actionmanagerimpl.cpp @@ -161,16 +161,16 @@ void ActionManagerImpl::setTagSet(TagSet* tagSet) if (d->tagSet != 0) { - disconnect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&))); - disconnect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&))); + disconnect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&))); + disconnect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); } d->tagSet = tagSet; if (tagSet != 0) { - connect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&))); - connect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); } TQValueList<TagAction*> actions = d->tagActions.values(); @@ -200,7 +200,7 @@ void ActionManagerImpl::slotTagAdded(const Tag& tag) if (!d->tagActions.contains(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, d->view, TQ_SLOT(slotAssignTag(const Tag&, bool)), d->tagMenu); d->tagMenu->insert(d->tagActions[tag.id()]); } } @@ -263,15 +263,15 @@ void ActionManagerImpl::initTrayIcon(TrayIcon* trayIcon) void ActionManagerImpl::initPart() { - new TDEAction(i18n("&Import Feeds..."), "", "", d->part, TQT_SLOT(fileImport()), d->actionCollection, "file_import"); - new TDEAction(i18n("&Export Feeds..."), "", "", d->part, TQT_SLOT(fileExport()), d->actionCollection, "file_export"); - //new TDEAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQT_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb"); + new TDEAction(i18n("&Import Feeds..."), "", "", d->part, TQ_SLOT(fileImport()), d->actionCollection, "file_import"); + new TDEAction(i18n("&Export Feeds..."), "", "", d->part, TQ_SLOT(fileExport()), d->actionCollection, "file_export"); + //new TDEAction(i18n("&Get Feeds From Web..."), "", "", d->part, TQ_SLOT(fileGetFeeds()), d->actionCollection, "file_getfromweb"); - new TDEAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQT_SLOT(fileSendLink()), d->actionCollection, "file_sendlink"); - new TDEAction(i18n("Send &File..."), "mail_generic", "", d->part, TQT_SLOT(fileSendFile()), d->actionCollection, "file_sendfile"); + new TDEAction(i18n("Send &Link Address..."), "mail_generic", "", d->part, TQ_SLOT(fileSendLink()), d->actionCollection, "file_sendlink"); + new TDEAction(i18n("Send &File..."), "mail_generic", "", d->part, TQ_SLOT(fileSendFile()), d->actionCollection, "file_sendfile"); - KStdAction::configureNotifications(d->part, TQT_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications - new TDEAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQT_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" ); + KStdAction::configureNotifications(d->part, TQ_SLOT(showKNotifyOptions()), d->actionCollection); // options_configure_notifications + new TDEAction( i18n("Configure &Akregator..."), "configure", "", d->part, TQ_SLOT(showOptions()), d->actionCollection, "akregator_configure_akregator" ); } void ActionManagerImpl::initView(View* view) @@ -282,51 +282,51 @@ void ActionManagerImpl::initView(View* view) d->view = view; // tag actions - new TDEAction(i18n("&New Tag..."), "", "", d->view, TQT_SLOT(slotNewTag()), actionCollection(), "tag_new"); + new TDEAction(i18n("&New Tag..."), "", "", d->view, TQ_SLOT(slotNewTag()), actionCollection(), "tag_new"); // Feed/Feed Group popup menu - new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", d->view, TQT_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage"); - new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", d->view, TQT_SLOT(slotFeedAdd()), actionCollection(), "feed_add"); - new TDEAction(i18n("Ne&w Folder..."), "folder-new", "Shift+Insert", d->view, TQT_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group"); - new TDEAction(i18n("&Delete Feed"), "edit-delete", "Alt+Delete", d->view, TQT_SLOT(slotFeedRemove()), actionCollection(), "feed_remove"); - new TDEAction(i18n("&Edit Feed..."), "edit", "F2", d->view, TQT_SLOT(slotFeedModify()), actionCollection(), "feed_modify"); + new TDEAction(i18n("&Open Homepage"), "", "Ctrl+H", d->view, TQ_SLOT(slotOpenHomepage()), actionCollection(), "feed_homepage"); + new TDEAction(i18n("&Add Feed..."), "bookmark_add", "Insert", d->view, TQ_SLOT(slotFeedAdd()), actionCollection(), "feed_add"); + new TDEAction(i18n("Ne&w Folder..."), "folder-new", "Shift+Insert", d->view, TQ_SLOT(slotFeedAddGroup()), actionCollection(), "feed_add_group"); + new TDEAction(i18n("&Delete Feed"), "edit-delete", "Alt+Delete", d->view, TQ_SLOT(slotFeedRemove()), actionCollection(), "feed_remove"); + new TDEAction(i18n("&Edit Feed..."), "edit", "F2", d->view, TQ_SLOT(slotFeedModify()), actionCollection(), "feed_modify"); TDEActionMenu* vm = new TDEActionMenu( i18n( "&View Mode" ), actionCollection(), "view_mode" ); - TDERadioAction *ra = new TDERadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", d->view, TQT_SLOT(slotNormalView()), actionCollection(), "normal_view"); + TDERadioAction *ra = new TDERadioAction(i18n("&Normal View"), "view_top_bottom", "Ctrl+Shift+1", d->view, TQ_SLOT(slotNormalView()), actionCollection(), "normal_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); - ra = new TDERadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", d->view, TQT_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view"); + ra = new TDERadioAction(i18n("&Widescreen View"), "view_left_right", "Ctrl+Shift+2", d->view, TQ_SLOT(slotWidescreenView()), actionCollection(), "widescreen_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); - ra = new TDERadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", d->view, TQT_SLOT(slotCombinedView()), actionCollection(), "combined_view"); + ra = new TDERadioAction(i18n("C&ombined View"), "view_text", "Ctrl+Shift+3", d->view, TQ_SLOT(slotCombinedView()), actionCollection(), "combined_view"); ra->setExclusiveGroup( "ViewMode" ); vm->insert(ra); // toolbar / feed menu - new TDEAction(i18n("&Fetch Feed"), "go-down", TDEStdAccel::shortcut(TDEStdAccel::Reload), d->view, TQT_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch"); - new TDEAction(i18n("Fe&tch All Feeds"), "go-bottom", "Ctrl+L", d->view, TQT_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all"); + new TDEAction(i18n("&Fetch Feed"), "go-down", TDEStdAccel::shortcut(TDEStdAccel::Reload), d->view, TQ_SLOT(slotFetchCurrentFeed()), actionCollection(), "feed_fetch"); + new TDEAction(i18n("Fe&tch All Feeds"), "go-bottom", "Ctrl+L", d->view, TQ_SLOT(slotFetchAllFeeds()), actionCollection(), "feed_fetch_all"); - TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "process-stop", Key_Escape, Kernel::self()->fetchQueue(), TQT_SLOT(slotAbort()), actionCollection(), "feed_stop"); + TDEAction* stopAction = new TDEAction(i18n( "&Abort Fetches" ), "process-stop", Key_Escape, Kernel::self()->fetchQueue(), TQ_SLOT(slotAbort()), actionCollection(), "feed_stop"); stopAction->setEnabled(false); - new TDEAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", d->view, TQT_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read"); - new TDEAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQT_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read"); + new TDEAction(i18n("&Mark Feed as Read"), "goto", "Ctrl+R", d->view, TQ_SLOT(slotMarkAllRead()), actionCollection(), "feed_mark_all_as_read"); + new TDEAction(i18n("Ma&rk All Feeds as Read"), "goto", "Ctrl+Shift+R", d->view, TQ_SLOT(slotMarkAllFeedsRead()), actionCollection(), "feed_mark_all_feeds_as_read"); // Settings menu - TDEToggleAction* sqf = new TDEToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQT_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter"); + TDEToggleAction* sqf = new TDEToggleAction(i18n("Show Quick Filter"), TQString(), 0, d->view, TQ_SLOT(slotToggleShowQuickFilter()), actionCollection(), "show_quick_filter"); sqf->setChecked( Settings::showQuickFilter() ); - new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" ); - new TDEAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQT_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" ); - new TDEAction( i18n("Open in External Browser"), "window-new", "Ctrl+Shift+Return", d->view, TQT_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" ); - new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" ); + new TDEAction( i18n("Open in Tab"), "tab_new", "Shift+Return", d->view, TQ_SLOT(slotOpenCurrentArticle()), actionCollection(), "article_open" ); + new TDEAction( i18n("Open in Background Tab"), TQString(), "tab_new", d->view, TQ_SLOT(slotOpenCurrentArticleBackgroundTab()), actionCollection(), "article_open_background_tab" ); + new TDEAction( i18n("Open in External Browser"), "window-new", "Ctrl+Shift+Return", d->view, TQ_SLOT(slotOpenCurrentArticleExternal()), actionCollection(), "article_open_external" ); + new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), d->view, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "article_copy_link_address" ); - new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQT_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article"); - new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQT_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article"); + new TDEAction(i18n("Pre&vious Unread Article"), "", Key_Minus, d->view, TQ_SLOT(slotPrevUnreadArticle()),actionCollection(), "go_prev_unread_article"); + new TDEAction(i18n("Ne&xt Unread Article"), "", Key_Plus, d->view, TQ_SLOT(slotNextUnreadArticle()),actionCollection(), "go_next_unread_article"); - new TDEAction(i18n("&Delete"), "edit-delete", "Delete", d->view, TQT_SLOT(slotArticleDelete()), actionCollection(), "article_delete"); + new TDEAction(i18n("&Delete"), "edit-delete", "Delete", d->view, TQ_SLOT(slotArticleDelete()), actionCollection(), "article_delete"); if (Settings::showTaggingGUI()) { @@ -336,39 +336,39 @@ void ActionManagerImpl::initView(View* view) TDEActionMenu* statusMenu = new TDEActionMenu ( i18n( "&Mark As" ), actionCollection(), "article_set_status" ); - d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", d->view, TQT_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech"); + d->speakSelectedArticlesAction = new TDEAction(i18n("&Speak Selected Articles"), "kttsd", "", d->view, TQ_SLOT(slotTextToSpeechRequest()), actionCollection(), "akr_texttospeech"); - TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "media-playback-stop", Key_Escape, SpeechClient::self(), TQT_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech"); + TDEAction* abortTTS = new TDEAction(i18n( "&Stop Speaking" ), "media-playback-stop", Key_Escape, SpeechClient::self(), TQ_SLOT(slotAbortJobs()), actionCollection(), "akr_aborttexttospeech"); abortTTS->setEnabled(false); - connect(SpeechClient::self(), TQT_SIGNAL(signalActivated(bool)), - abortTTS, TQT_SLOT(setEnabled(bool))); + connect(SpeechClient::self(), TQ_SIGNAL(signalActivated(bool)), + abortTTS, TQ_SLOT(setEnabled(bool))); statusMenu->insert(new TDEAction(KGuiItem(i18n("as in: mark as read","&Read"), "", i18n("Mark selected article as read")), - "Ctrl+E", d->view, TQT_SLOT(slotSetSelectedArticleRead()), + "Ctrl+E", d->view, TQ_SLOT(slotSetSelectedArticleRead()), actionCollection(), "article_set_status_read")); statusMenu->insert(new TDEAction(KGuiItem(i18n("&New"), "", i18n("Mark selected article as new")), - "Ctrl+N", d->view, TQT_SLOT(slotSetSelectedArticleNew()), + "Ctrl+N", d->view, TQ_SLOT(slotSetSelectedArticleNew()), actionCollection(), "article_set_status_new" )); statusMenu->insert(new TDEAction(KGuiItem(i18n("&Unread"), "", i18n("Mark selected article as unread")), - "Ctrl+U", d->view, TQT_SLOT(slotSetSelectedArticleUnread()), + "Ctrl+U", d->view, TQ_SLOT(slotSetSelectedArticleUnread()), actionCollection(), "article_set_status_unread")); TDEToggleAction* importantAction = new TDEToggleAction(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, TQ_SIGNAL(toggled(bool)), d->view, TQ_SLOT(slotArticleToggleKeepFlag(bool))); - new TDEAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQT_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" ); - new TDEAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", view, TQT_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" ); - new TDEAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQT_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" ); - new TDEAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQT_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right"); + new TDEAction( i18n("Move Node Up"), TQString(), "Shift+Alt+Up", view, TQ_SLOT(slotMoveCurrentNodeUp()), d->actionCollection, "feedstree_move_up" ); + new TDEAction( i18n("Move Node Down"), TQString(), "Shift+Alt+Down", view, TQ_SLOT(slotMoveCurrentNodeDown()), d->actionCollection, "feedstree_move_down" ); + new TDEAction( i18n("Move Node Left"), TQString(), "Shift+Alt+Left", view, TQ_SLOT(slotMoveCurrentNodeLeft()), d->actionCollection, "feedstree_move_left" ); + new TDEAction( i18n("Move Node Right"), TQString(), "Shift+Alt+Right", view, TQ_SLOT(slotMoveCurrentNodeRight()), d->actionCollection, "feedstree_move_right"); } void ActionManagerImpl::initArticleViewer(ArticleViewer* articleViewer) @@ -386,8 +386,8 @@ void ActionManagerImpl::initArticleListView(ArticleListView* articleList) else d->articleList = articleList; - new TDEAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQT_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" ); - new TDEAction( i18n("&Next Article"), TQString(), "Right", articleList, TQT_SLOT(slotNextArticle()), actionCollection(), "go_next_article" ); + new TDEAction( i18n("&Previous Article"), TQString(), "Left", articleList, TQ_SLOT(slotPreviousArticle()), actionCollection(), "go_previous_article" ); + new TDEAction( i18n("&Next Article"), TQString(), "Right", articleList, TQ_SLOT(slotNextArticle()), actionCollection(), "go_next_article" ); } void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget) @@ -397,17 +397,17 @@ void ActionManagerImpl::initListTabWidget(ListTabWidget* listTabWidget) else d->listTabWidget = listTabWidget; - new TDEAction(i18n("&Previous Feed"), "", "P", listTabWidget, TQT_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed"); - new TDEAction(i18n("&Next Feed"), "", "N", listTabWidget, TQT_SLOT(slotNextFeed()),actionCollection(), "go_next_feed"); - new TDEAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQT_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed"); - new TDEAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQT_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed"); - - new TDEAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQT_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" ); - new TDEAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQT_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" ); - new TDEAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQT_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" ); - new TDEAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQT_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" ); - new TDEAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQT_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" ); - new TDEAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQT_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" ); + new TDEAction(i18n("&Previous Feed"), "", "P", listTabWidget, TQ_SLOT(slotPrevFeed()),actionCollection(), "go_prev_feed"); + new TDEAction(i18n("&Next Feed"), "", "N", listTabWidget, TQ_SLOT(slotNextFeed()),actionCollection(), "go_next_feed"); + new TDEAction(i18n("N&ext Unread Feed"), "", "Alt+Plus", listTabWidget, TQ_SLOT(slotNextUnreadFeed()),actionCollection(), "go_next_unread_feed"); + new TDEAction(i18n("Prev&ious Unread Feed"), "", "Alt+Minus", listTabWidget, TQ_SLOT(slotPrevUnreadFeed()),actionCollection(), "go_prev_unread_feed"); + + new TDEAction( i18n("Go to Top of Tree"), TQString(), "Ctrl+Home", listTabWidget, TQ_SLOT(slotItemBegin()), d->actionCollection, "feedstree_home" ); + new TDEAction( i18n("Go to Bottom of Tree"), TQString(), "Ctrl+End", listTabWidget, TQ_SLOT(slotItemEnd()), d->actionCollection, "feedstree_end" ); + new TDEAction( i18n("Go Left in Tree"), TQString(), "Ctrl+Left", listTabWidget, TQ_SLOT(slotItemLeft()), d->actionCollection, "feedstree_left" ); + new TDEAction( i18n("Go Right in Tree"), TQString(), "Ctrl+Right", listTabWidget, TQ_SLOT(slotItemRight()), d->actionCollection, "feedstree_right" ); + new TDEAction( i18n("Go Up in Tree"), TQString(), "Ctrl+Up", listTabWidget, TQ_SLOT(slotItemUp()), d->actionCollection, "feedstree_up" ); + new TDEAction( i18n("Go Down in Tree"), TQString(), "Ctrl+Down", listTabWidget, TQ_SLOT(slotItemDown()), d->actionCollection, "feedstree_down" ); } void ActionManagerImpl::initTabWidget(TabWidget* tabWidget) @@ -417,11 +417,11 @@ void ActionManagerImpl::initTabWidget(TabWidget* tabWidget) else d->tabWidget = tabWidget; - new TDEAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQT_SLOT(slotNextTab()),actionCollection(), "select_next_tab"); - new TDEAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQT_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab"); - new TDEAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQT_SLOT(slotDetachTab()), actionCollection(), "tab_detach" ); - new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQT_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" ); - new TDEAction( i18n("&Close Tab"), "tab_remove", TDEStdAccel::close(), d->tabWidget, TQT_SLOT(slotCloseTab()), actionCollection(), "tab_remove" ); + new TDEAction(i18n("Select Next Tab"), "", "Ctrl+Period", d->tabWidget, TQ_SLOT(slotNextTab()),actionCollection(), "select_next_tab"); + new TDEAction(i18n("Select Previous Tab"), "", "Ctrl+Comma", d->tabWidget, TQ_SLOT(slotPreviousTab()),actionCollection(), "select_previous_tab"); + new TDEAction( i18n("Detach Tab"), "tab_breakoff", CTRL+SHIFT+Key_B, d->tabWidget, TQ_SLOT(slotDetachTab()), actionCollection(), "tab_detach" ); + new TDEAction( i18n("Copy Link Address"), TQString(), TQString(), d->tabWidget, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "tab_copylinkaddress" ); + new TDEAction( i18n("&Close Tab"), "tab_remove", TDEStdAccel::close(), d->tabWidget, TQ_SLOT(slotCloseTab()), actionCollection(), "tab_remove" ); } TQWidget* ActionManagerImpl::container(const char* name) diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp index 24dc8b49b..a7b88a11f 100644 --- a/akregator/src/addfeeddialog.cpp +++ b/akregator/src/addfeeddialog.cpp @@ -53,7 +53,7 @@ AddFeedDialog::AddFeedDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow, TQt::WStyle_DialogBorder, parent, name, true, i18n("Add Feed"), KDialogBase::Ok|KDialogBase::Cancel) { widget = new AddFeedWidget(this); - connect(widget->urlEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(textChanged(const TQString&))); + connect(widget->urlEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(textChanged(const TQString&))); enableButtonOK(false); setMainWidget(widget); } @@ -85,12 +85,12 @@ void AddFeedDialog::slotOk( ) widget->statusLabel->setText( i18n("Downloading %1").arg(feedURL) ); - connect( feed, TQT_SIGNAL(fetched(Feed* )), - this, TQT_SLOT(fetchCompleted(Feed *)) ); - connect( feed, TQT_SIGNAL(fetchError(Feed* )), - this, TQT_SLOT(fetchError(Feed *)) ); - connect( feed, TQT_SIGNAL(fetchDiscovery(Feed* )), - this, TQT_SLOT(fetchDiscovery(Feed *)) ); + connect( feed, TQ_SIGNAL(fetched(Feed* )), + this, TQ_SLOT(fetchCompleted(Feed *)) ); + connect( feed, TQ_SIGNAL(fetchError(Feed* )), + this, TQ_SLOT(fetchError(Feed *)) ); + connect( feed, TQ_SIGNAL(fetchDiscovery(Feed* )), + this, TQ_SLOT(fetchDiscovery(Feed *)) ); f->fetch(true); } diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index d7ca0d442..b69d0736c 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -195,12 +195,12 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, m_extension = new BrowserExtension(this, "ak_extension"); - connect(m_view, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SIGNAL(setWindowCaption(const TQString&))); - connect(m_view, TQT_SIGNAL(setStatusBarText(const TQString&)), this, TQT_SIGNAL(setStatusBarText(const TQString&))); - connect(m_view, TQT_SIGNAL(setProgress(int)), m_extension, TQT_SIGNAL(loadingProgress(int))); - connect(m_view, TQT_SIGNAL(signalCanceled(const TQString&)), this, TQT_SIGNAL(canceled(const TQString&))); - connect(m_view, TQT_SIGNAL(signalStarted(TDEIO::Job*)), this, TQT_SIGNAL(started(TDEIO::Job*))); - connect(m_view, TQT_SIGNAL(signalCompleted()), this, TQT_SIGNAL(completed())); + connect(m_view, TQ_SIGNAL(setWindowCaption(const TQString&)), this, TQ_SIGNAL(setWindowCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(setStatusBarText(const TQString&)), this, TQ_SIGNAL(setStatusBarText(const TQString&))); + connect(m_view, TQ_SIGNAL(setProgress(int)), m_extension, TQ_SIGNAL(loadingProgress(int))); + connect(m_view, TQ_SIGNAL(signalCanceled(const TQString&)), this, TQ_SIGNAL(canceled(const TQString&))); + connect(m_view, TQ_SIGNAL(signalStarted(TDEIO::Job*)), this, TQ_SIGNAL(started(TDEIO::Job*))); + connect(m_view, TQ_SIGNAL(signalCompleted()), this, TQ_SIGNAL(completed())); // notify the part that this is our internal widget setWidget(m_view); @@ -209,7 +209,7 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, TrayIcon::setInstance(trayIcon); m_actionManager->initTrayIcon(trayIcon); - connect(trayIcon, TQT_SIGNAL(showPart()), this, TQT_SIGNAL(showPart())); + connect(trayIcon, TQ_SIGNAL(showPart()), this, TQ_SIGNAL(showPart())); if ( isTrayIconEnabled() ) { @@ -219,15 +219,15 @@ Part::Part( TQWidget *parentWidget, const char * /*widgetName*/, else NotificationManager::self()->setWidget(getMainWindow(), instance()); - connect( trayIcon, TQT_SIGNAL(quitSelected()), - kapp, TQT_SLOT(quit())) ; + connect( trayIcon, TQ_SIGNAL(quitSelected()), + kapp, TQ_SLOT(quit())) ; - connect( m_view, TQT_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQT_SLOT(slotSetUnread(int)) ); + connect( m_view, TQ_SIGNAL(signalUnreadCountChanged(int)), trayIcon, TQ_SLOT(slotSetUnread(int)) ); - connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(slotOnShutdown())); + connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(slotOnShutdown())); m_autosaveTimer = new TQTimer(this); - connect(m_autosaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSaveFeedList())); + connect(m_autosaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSaveFeedList())); m_autosaveTimer->start(5*60*1000); // 5 minutes setXMLFile("akregator_part.rc", true); @@ -782,10 +782,10 @@ void Part::showOptions() TDEConfigDialog* dialog = new ConfigDialog( m_view, "settings", Settings::self() ); - connect( dialog, TQT_SIGNAL(settingsChanged()), - this, TQT_SLOT(slotSettingsChanged()) ); - connect( dialog, TQT_SIGNAL(settingsChanged()), - TrayIcon::getInstance(), TQT_SLOT(settingsChanged()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), + this, TQ_SLOT(slotSettingsChanged()) ); + connect( dialog, TQ_SIGNAL(settingsChanged()), + TrayIcon::getInstance(), TQ_SLOT(settingsChanged()) ); dialog->show(); } diff --git a/akregator/src/akregator_run.cpp b/akregator/src/akregator_run.cpp index 89bb190a4..d22f2f613 100644 --- a/akregator/src/akregator_run.cpp +++ b/akregator/src/akregator_run.cpp @@ -38,7 +38,7 @@ BrowserRun::BrowserRun(TQWidget* mainWindow, Viewer* currentViewer, const KURL& if (mode == CURRENT_TAB) { - connect(m_currentViewer, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotViewerDeleted())); + connect(m_currentViewer, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotViewerDeleted())); } setEnableExternalBrowser(false); } diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 645b42c18..bcda5d161 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -233,17 +233,17 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_horizontalSplitter->setOpaqueResize(true); lt->addWidget(m_horizontalSplitter); - connect (Kernel::self()->fetchQueue(), TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*))); - connect (Kernel::self()->fetchQueue(), TQT_SIGNAL(signalStarted()), this, TQT_SLOT(slotFetchingStarted())); - connect (Kernel::self()->fetchQueue(), TQT_SIGNAL(signalStopped()), this, TQT_SLOT(slotFetchingStopped())); + connect (Kernel::self()->fetchQueue(), TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFeedFetched(Feed*))); + connect (Kernel::self()->fetchQueue(), TQ_SIGNAL(signalStarted()), this, TQ_SLOT(slotFetchingStarted())); + connect (Kernel::self()->fetchQueue(), TQ_SIGNAL(signalStopped()), this, TQ_SLOT(slotFetchingStopped())); - connect(Kernel::self()->tagSet(), TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagCreated(const Tag&))); - connect(Kernel::self()->tagSet(), TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&))); + connect(Kernel::self()->tagSet(), TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagCreated(const Tag&))); + connect(Kernel::self()->tagSet(), TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); m_listTabWidget = new ListTabWidget(m_horizontalSplitter); m_actionManager->initListTabWidget(m_listTabWidget); - connect(m_listTabWidget, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SLOT(slotNodeSelected(TreeNode*))); + connect(m_listTabWidget, TQ_SIGNAL(signalNodeSelected(TreeNode*)), this, TQ_SLOT(slotNodeSelected(TreeNode*))); if (!Settings::showTaggingGUI()) m_listTabWidget->setViewMode(ListTabWidget::single); @@ -251,16 +251,16 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_feedListView = new NodeListView( this, "feedtree" ); m_listTabWidget->addView(m_feedListView, i18n("Feeds"), TDEGlobal::iconLoader()->loadIcon("folder", TDEIcon::Small)); - connect(m_feedListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&))); + connect(m_feedListView, TQ_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQ_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&))); - connect(m_feedListView, TQT_SIGNAL(signalDropped (KURL::List &, TreeNode*, - Folder*)), this, TQT_SLOT(slotFeedURLDropped (KURL::List &, + connect(m_feedListView, TQ_SIGNAL(signalDropped (KURL::List &, TreeNode*, + Folder*)), this, TQ_SLOT(slotFeedURLDropped (KURL::List &, TreeNode*, Folder*))); m_tagNodeListView = new NodeListView(this); m_listTabWidget->addView(m_tagNodeListView, i18n("Tags"), TDEGlobal::iconLoader()->loadIcon("rss_tag", TDEIcon::Small)); - connect(m_tagNodeListView, TQT_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQT_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&))); + connect(m_tagNodeListView, TQ_SIGNAL(signalContextMenu(TDEListView*, TreeNode*, const TQPoint&)), this, TQ_SLOT(slotFeedTreeContextMenu(TDEListView*, TreeNode*, const TQPoint&))); ProgressManager::self()->setFeedList(m_feedList); @@ -268,10 +268,10 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_tabs = new TabWidget(m_horizontalSplitter); m_actionManager->initTabWidget(m_tabs); - connect( m_part, TQT_SIGNAL(signalSettingsChanged()), m_tabs, TQT_SLOT(slotSettingsChanged())); + connect( m_part, TQ_SIGNAL(signalSettingsChanged()), m_tabs, TQ_SLOT(slotSettingsChanged())); - connect( m_tabs, TQT_SIGNAL( currentFrameChanged(Frame *) ), this, - TQT_SLOT( slotFrameChanged(Frame *) ) ); + connect( m_tabs, TQ_SIGNAL( currentFrameChanged(Frame *) ), this, + TQ_SLOT( slotFrameChanged(Frame *) ) ); TQWhatsThis::add(m_tabs, i18n("You can view multiple articles in several open tabs.")); @@ -292,30 +292,30 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_articleList = new ArticleListView( m_articleSplitter, "articles" ); m_actionManager->initArticleListView(m_articleList); - connect( m_articleList, TQT_SIGNAL(signalMouseButtonPressed(int, const Article&, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, const Article&, const TQPoint &, int))); + connect( m_articleList, TQ_SIGNAL(signalMouseButtonPressed(int, const Article&, const TQPoint &, int)), this, TQ_SLOT(slotMouseButtonPressed(int, const Article&, const TQPoint &, int))); // use selectionChanged instead of clicked - connect( m_articleList, TQT_SIGNAL(signalArticleChosen(const Article&)), - this, TQT_SLOT( slotArticleSelected(const Article&)) ); - connect( m_articleList, TQT_SIGNAL(signalDoubleClicked(const Article&, const TQPoint&, int)), - this, TQT_SLOT( slotOpenArticleExternal(const Article&, const TQPoint&, int)) ); + connect( m_articleList, TQ_SIGNAL(signalArticleChosen(const Article&)), + this, TQ_SLOT( slotArticleSelected(const Article&)) ); + connect( m_articleList, TQ_SIGNAL(signalDoubleClicked(const Article&, const TQPoint&, int)), + this, TQ_SLOT( slotOpenArticleExternal(const Article&, const TQPoint&, int)) ); m_articleViewer = new ArticleViewer(m_articleSplitter, "article_viewer"); m_articleViewer->setSafeMode(); // disable JS, Java, etc... m_actionManager->initArticleViewer(m_articleViewer); - connect(m_searchBar, TQT_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleList, TQT_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&))); + connect(m_searchBar, TQ_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleList, TQ_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&))); - connect(m_searchBar, TQT_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleViewer, TQT_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&))); + connect(m_searchBar, TQ_SIGNAL(signalSearch(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&)), m_articleViewer, TQ_SLOT(slotSetFilter(const Akregator::Filters::ArticleMatcher&, const Akregator::Filters::ArticleMatcher&))); - connect( m_articleViewer, TQT_SIGNAL(urlClicked(const KURL&, Viewer*, bool, bool)), - this, TQT_SLOT(slotUrlClickedInViewer(const KURL&, Viewer*, bool, bool)) ); + connect( m_articleViewer, TQ_SIGNAL(urlClicked(const KURL&, Viewer*, bool, bool)), + this, TQ_SLOT(slotUrlClickedInViewer(const KURL&, Viewer*, bool, bool)) ); - connect( m_articleViewer->browserExtension(), TQT_SIGNAL(mouseOverInfo(const KFileItem *)), - this, TQT_SLOT(slotMouseOverInfo(const KFileItem *)) ); + connect( m_articleViewer->browserExtension(), TQ_SIGNAL(mouseOverInfo(const KFileItem *)), + this, TQ_SLOT(slotMouseOverInfo(const KFileItem *)) ); - connect( m_part, TQT_SIGNAL(signalSettingsChanged()), m_articleViewer, TQT_SLOT(slotPaletteOrFontChanged())); + connect( m_part, TQ_SIGNAL(signalSettingsChanged()), m_articleViewer, TQ_SLOT(slotPaletteOrFontChanged())); TQWhatsThis::add(m_articleViewer->widget(), i18n("Browsing area.")); mainTabLayout->addWidget( m_articleSplitter ); @@ -342,17 +342,17 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons } m_fetchTimer = new TQTimer(this); - connect( m_fetchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDoIntervalFetches()) ); + connect( m_fetchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDoIntervalFetches()) ); m_fetchTimer->start(1000*60); // delete expired articles once per hour m_expiryTimer = new TQTimer(this); - connect(m_expiryTimer, TQT_SIGNAL(timeout()), this, - TQT_SLOT(slotDeleteExpiredArticles()) ); + connect(m_expiryTimer, TQ_SIGNAL(timeout()), this, + TQ_SLOT(slotDeleteExpiredArticles()) ); m_expiryTimer->start(3600*1000); m_markReadTimer = new TQTimer(this); - connect(m_markReadTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSetCurrentArticleReadDelayed()) ); + connect(m_markReadTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSetCurrentArticleReadDelayed()) ); switch (Settings::viewMode()) { @@ -372,7 +372,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons m_searchBar->slotSetText(Settings::textFilter()); } - TQTimer::singleShot(1000, this, TQT_SLOT(slotDeleteExpiredArticles()) ); + TQTimer::singleShot(1000, this, TQ_SLOT(slotDeleteExpiredArticles()) ); m_part->mergePart(m_articleViewer); } @@ -433,17 +433,17 @@ void View::slotOpenNewTab(const KURL& url, bool background) { PageViewer* page = new PageViewer(this, "page"); - connect( m_part, TQT_SIGNAL(signalSettingsChanged()), page, TQT_SLOT(slotPaletteOrFontChanged())); + connect( m_part, TQ_SIGNAL(signalSettingsChanged()), page, TQ_SLOT(slotPaletteOrFontChanged())); - connect( page, TQT_SIGNAL(setTabIcon(const TQPixmap&)), - this, TQT_SLOT(setTabIcon(const TQPixmap&))); - connect( page, TQT_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)), - this, TQT_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) ); + connect( page, TQ_SIGNAL(setTabIcon(const TQPixmap&)), + this, TQ_SLOT(setTabIcon(const TQPixmap&))); + connect( page, TQ_SIGNAL(urlClicked(const KURL &, Viewer*, bool, bool)), + this, TQ_SLOT(slotUrlClickedInViewer(const KURL &, Viewer*, bool, bool)) ); Frame* frame = new Frame(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 &))); + connect(page, TQ_SIGNAL(setWindowCaption (const TQString &)), frame, TQ_SLOT(setTitle (const TQString &))); connectFrame(frame); m_tabs->addFrame(frame); @@ -466,12 +466,12 @@ void View::setTabIcon(const TQPixmap& icon) void View::connectFrame(Frame *f) { - connect(f, TQT_SIGNAL(statusText(const TQString &)), this, TQT_SLOT(slotStatusText(const TQString&))); - connect(f, TQT_SIGNAL(captionChanged (const TQString &)), this, TQT_SLOT(slotCaptionChanged (const TQString &))); - connect(f, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(slotLoadingProgress(int)) ); - connect(f, TQT_SIGNAL(started()), this, TQT_SLOT(slotStarted())); - connect(f, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); - connect(f, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCanceled(const TQString&))); + connect(f, TQ_SIGNAL(statusText(const TQString &)), this, TQ_SLOT(slotStatusText(const TQString&))); + connect(f, TQ_SIGNAL(captionChanged (const TQString &)), this, TQ_SLOT(slotCaptionChanged (const TQString &))); + connect(f, TQ_SIGNAL(loadingProgress(int)), this, TQ_SLOT(slotLoadingProgress(int)) ); + connect(f, TQ_SIGNAL(started()), this, TQ_SLOT(slotStarted())); + connect(f, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted())); + connect(f, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCanceled(const TQString&))); } void View::slotStatusText(const TQString &c) @@ -841,8 +841,8 @@ void View::slotOpenURL(const KURL& url, Viewer* currentViewer, BrowserRun::Openi KParts::URLArgs args = currentViewer ? currentViewer->browserExtension()->urlArgs() : KParts::URLArgs(); BrowserRun* r = new BrowserRun(this, currentViewer, url, args, mode); - connect(r, TQT_SIGNAL(signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)), - this, TQT_SLOT(slotOpenURLReply(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode))); + connect(r, TQ_SIGNAL(signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode)), + this, TQ_SLOT(slotOpenURLReply(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode))); } } @@ -1518,13 +1518,13 @@ void View::saveProperties(TDEConfig* config) void View::connectToFeedList(FeedList* feedList) { - connect(feedList->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotSetTotalUnread())); + connect(feedList->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotSetTotalUnread())); slotSetTotalUnread(); } void View::disconnectFromFeedList(FeedList* feedList) { - disconnect(feedList->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotSetTotalUnread())); + disconnect(feedList->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotSetTotalUnread())); } void View::updateTagActions() diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp index 48114f975..7731c7683 100644 --- a/akregator/src/articlelistview.cpp +++ b/akregator/src/articlelistview.cpp @@ -271,13 +271,13 @@ ArticleListView::ArticleListView(TQWidget *parent, const char *name) "You can also manage articles, as marking them as persistent (\"Keep Article\") or delete them, using the right mouse button menu." "To view the web page of the article, you can open the article internally in a tab or in an external browser window.")); - connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem* ))); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int)) ); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem* ))); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(slotDoubleClicked(TQListViewItem*, const TQPoint&, int)) ); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(slotMouseButtonPressed(int, TQListViewItem *, const TQPoint &, int))); } Article ArticleListView::currentArticle() const @@ -482,18 +482,18 @@ void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const TQValueList< void ArticleListView::connectToNode(TreeNode* node) { - connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) ); - connect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); - connect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); - connect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear()) ); + connect(node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + connect(node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); } void ArticleListView::disconnectFromNode(TreeNode* node) { - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear()) ); - disconnect(node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); - disconnect(node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); - disconnect(node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear()) ); + disconnect(node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + disconnect(node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); } void ArticleListView::applyFilters() diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index 8067b7326..8da540967 100644 --- a/akregator/src/articleviewer.cpp +++ b/akregator/src/articleviewer.cpp @@ -170,13 +170,13 @@ ArticleViewer::ArticleViewer(TQWidget *parent, const char *name) generateNormalModeCSS(); generateCombinedModeCSS(); - new TDEAction( i18n("&Scroll Up"), TQString(), "Up", this, TQT_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); - new TDEAction( i18n("&Scroll Down"), TQString(), "Down", this, TQT_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); + new TDEAction( i18n("&Scroll Up"), TQString(), "Up", this, TQ_SLOT(slotScrollUp()), actionCollection(), "articleviewer_scroll_up" ); + new TDEAction( i18n("&Scroll Down"), TQString(), "Down", this, TQ_SLOT(slotScrollDown()), actionCollection(), "articleviewer_scroll_down" ); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) ); - connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotPaletteOrFontChanged()) ); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); + connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotPaletteOrFontChanged()) ); m_imageDir.setPath(TDEGlobal::dirs()->saveLocation("cache", "akregator/Media/")); m_htmlFooter = "</body></html>"; @@ -767,15 +767,15 @@ void ArticleViewer::connectToNode(TreeNode* node) { if (m_viewMode == CombinedView) { -// connect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotUpdateCombinedView() ) ); - connect( node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); - connect( node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); - connect( node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); +// connect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotUpdateCombinedView() ) ); + connect( node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); + connect( node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + connect( node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } if (m_viewMode == SummaryView) - connect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotShowSummary(TreeNode*) ) ); + connect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotShowSummary(TreeNode*) ) ); - connect( node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear() ) ); + connect( node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear() ) ); } } @@ -783,12 +783,12 @@ void ArticleViewer::disconnectFromNode(TreeNode* node) { if (node) { -// disconnect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotUpdateCombinedView() ) ); - disconnect( node, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotClear() ) ); - disconnect( node, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotShowSummary(TreeNode*) ) ); - disconnect( node, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); - disconnect( node, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); - disconnect( node, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); +// disconnect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotUpdateCombinedView() ) ); + disconnect( node, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotClear() ) ); + disconnect( node, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotShowSummary(TreeNode*) ) ); + disconnect( node, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&))); + disconnect( node, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + disconnect( node, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } } diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp index 7e7f59e80..53b38f659 100644 --- a/akregator/src/feed.cpp +++ b/akregator/src/feed.cpp @@ -579,8 +579,8 @@ void Feed::tryFetch() { d->fetchError = false; - d->loader = RSS::Loader::create( this, TQT_SLOT(fetchCompleted(Loader *, Document, Status)) ); - //connect(d->loader, TQT_SIGNAL(progress(unsigned long)), this, TQT_SLOT(slotSetProgress(unsigned long))); + d->loader = RSS::Loader::create( this, TQ_SLOT(fetchCompleted(Loader *, Document, Status)) ); + //connect(d->loader, TQ_SIGNAL(progress(unsigned long)), this, TQ_SLOT(slotSetProgress(unsigned long))); d->loader->loadFrom( d->xmlUrl, new RSS::FileRetriever ); } @@ -635,7 +635,7 @@ void Feed::fetchCompleted(RSS::Loader *l, RSS::Document doc, RSS::Status status) if (doc.image() && d->imagePixmap.isNull()) { d->image = *doc.image(); - connect(&d->image, TQT_SIGNAL(gotPixmap(const TQPixmap&)), this, TQT_SLOT(slotImageFetched(const TQPixmap&))); + connect(&d->image, TQ_SIGNAL(gotPixmap(const TQPixmap&)), this, TQ_SLOT(slotImageFetched(const TQPixmap&))); d->image.getPixmap(); } diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp index 61d2ad823..513f845fa 100644 --- a/akregator/src/feediconmanager.cpp +++ b/akregator/src/feediconmanager.cpp @@ -62,7 +62,7 @@ void FeedIconManager::fetchIcon(Feed* feed) if (!d->registeredFeeds.contains(feed)) { d->registeredFeeds.append(feed); - connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotFeedDestroyed(TreeNode*))); + connect(feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotFeedDestroyed(TreeNode*))); } TQString iconURL = getIconURL(KURL(feed->xmlUrl())); d->urlDict.insert(iconURL, feed); diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp index f0a373632..34aa68255 100644 --- a/akregator/src/feedlistview.cpp +++ b/akregator/src/feedlistview.cpp @@ -82,16 +82,16 @@ class NodeListView::ConnectNodeVisitor : public TreeNodeVisitor virtual bool visitTreeNode(TreeNode* node) { - connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); - connect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); + connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); + connect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) )); return true; } virtual bool visitFolder(Folder* node) { visitTreeNode(node); - connect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQT_SLOT(slotNodeAdded(TreeNode*) )); - connect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + connect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQ_SLOT(slotNodeAdded(TreeNode*) )); + connect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); return true; } @@ -99,10 +99,10 @@ class NodeListView::ConnectNodeVisitor : public TreeNodeVisitor { visitTreeNode(node); - connect(node, TQT_SIGNAL(fetchStarted(Feed*)), m_view, TQT_SLOT(slotFeedFetchStarted(Feed*))); - connect(node, TQT_SIGNAL(fetchAborted(Feed*)), m_view, TQT_SLOT(slotFeedFetchAborted(Feed*))); - connect(node, TQT_SIGNAL(fetchError(Feed*)), m_view, TQT_SLOT(slotFeedFetchError(Feed*))); - connect(node, TQT_SIGNAL(fetched(Feed*)), m_view, TQT_SLOT(slotFeedFetchCompleted(Feed*))); + connect(node, TQ_SIGNAL(fetchStarted(Feed*)), m_view, TQ_SLOT(slotFeedFetchStarted(Feed*))); + connect(node, TQ_SIGNAL(fetchAborted(Feed*)), m_view, TQ_SLOT(slotFeedFetchAborted(Feed*))); + connect(node, TQ_SIGNAL(fetchError(Feed*)), m_view, TQ_SLOT(slotFeedFetchError(Feed*))); + connect(node, TQ_SIGNAL(fetched(Feed*)), m_view, TQ_SLOT(slotFeedFetchCompleted(Feed*))); return true; } private: @@ -119,30 +119,30 @@ class NodeListView::DisconnectNodeVisitor : public TreeNodeVisitor virtual bool visitTagNode(TagNode* node) { - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) )); return true; } virtual bool visitFolder(Folder* node) { - disconnect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQT_SLOT(slotNodeAdded(TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_view, TQ_SLOT(slotNodeAdded(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_view, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) )); return true; } virtual bool visitFeed(Feed* node) { - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalChanged(TreeNode*)), m_view, TQT_SLOT(slotNodeChanged(TreeNode*) )); - disconnect(node, TQT_SIGNAL(fetchStarted(Feed*)), m_view, TQT_SLOT(slotFeedFetchStarted(Feed*))); - disconnect(node, TQT_SIGNAL(fetchAborted(Feed*)), m_view, TQT_SLOT(slotFeedFetchAborted(Feed*))); - disconnect(node, TQT_SIGNAL(fetchError(Feed*)), m_view, TQT_SLOT(slotFeedFetchError(Feed*))); - disconnect(node, TQT_SIGNAL(fetched(Feed*)), m_view, TQT_SLOT(slotFeedFetchCompleted(Feed*))); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChanged(TreeNode*)), m_view, TQ_SLOT(slotNodeChanged(TreeNode*) )); + disconnect(node, TQ_SIGNAL(fetchStarted(Feed*)), m_view, TQ_SLOT(slotFeedFetchStarted(Feed*))); + disconnect(node, TQ_SIGNAL(fetchAborted(Feed*)), m_view, TQ_SLOT(slotFeedFetchAborted(Feed*))); + disconnect(node, TQ_SIGNAL(fetchError(Feed*)), m_view, TQ_SLOT(slotFeedFetchError(Feed*))); + disconnect(node, TQ_SIGNAL(fetched(Feed*)), m_view, TQ_SLOT(slotFeedFetchCompleted(Feed*))); return true; } private: @@ -381,11 +381,11 @@ NodeListView::NodeListView( TQWidget *parent, const char *name) setAcceptDrops(true); setItemsMovable(true); - connect( this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)) ); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, TQT_SLOT(slotItemRenamed(TQListViewItem*, int, const TQString&)) ); - connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); - connect( &(d->autoopentimer), TQT_SIGNAL( timeout() ), this, TQT_SLOT( openFolder() ) ); + connect( this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), this, TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*)) ); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, TQ_SLOT(slotItemRenamed(TQListViewItem*, int, const TQString&)) ); + connect( this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( &(d->autoopentimer), TQ_SIGNAL( timeout() ), this, TQ_SLOT( openFolder() ) ); clear(); @@ -948,8 +948,8 @@ void NodeListView::connectToNodeList(NodeList* list) if (!list) return; - connect(list, TQT_SIGNAL(signalDestroyed(NodeList*)), this, TQT_SLOT(slotNodeListDestroyed(NodeList*)) ); - connect(list->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(TreeNode*))); + connect(list, TQ_SIGNAL(signalDestroyed(NodeList*)), this, TQ_SLOT(slotNodeListDestroyed(NodeList*)) ); + connect(list->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotRootNodeChanged(TreeNode*))); } void NodeListView::disconnectFromNodeList(NodeList* list) @@ -957,8 +957,8 @@ void NodeListView::disconnectFromNodeList(NodeList* list) if (!list) return; - disconnect(list, TQT_SIGNAL(signalDestroyed(NodeList*)), this, TQT_SLOT(slotNodeListDestroyed(NodeList*)) ); - disconnect(list->rootNode(), TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(TreeNode*))); + disconnect(list, TQ_SIGNAL(signalDestroyed(NodeList*)), this, TQ_SLOT(slotNodeListDestroyed(NodeList*)) ); + disconnect(list->rootNode(), TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotRootNodeChanged(TreeNode*))); } void NodeListView::disconnectFromNode(TreeNode* node) diff --git a/akregator/src/fetchqueue.cpp b/akregator/src/fetchqueue.cpp index c78d9a487..0bc7b38e3 100644 --- a/akregator/src/fetchqueue.cpp +++ b/akregator/src/fetchqueue.cpp @@ -129,18 +129,18 @@ void FetchQueue::feedDone(Feed *f) void FetchQueue::connectToFeed(Feed* feed) { - connect (feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*))); - connect (feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError(Feed*))); - connect (feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted(Feed*))); - connect (feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); + connect (feed, TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFeedFetched(Feed*))); + connect (feed, TQ_SIGNAL(fetchError(Feed*)), this, TQ_SLOT(slotFetchError(Feed*))); + connect (feed, TQ_SIGNAL(fetchAborted(Feed*)), this, TQ_SLOT(slotFetchAborted(Feed*))); + connect (feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*))); } void FetchQueue::disconnectFromFeed(Feed* feed) { - disconnect (feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFeedFetched(Feed*))); - disconnect (feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError(Feed*))); - disconnect (feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted(Feed*))); - disconnect (feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); + disconnect (feed, TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFeedFetched(Feed*))); + disconnect (feed, TQ_SIGNAL(fetchError(Feed*)), this, TQ_SLOT(slotFetchError(Feed*))); + disconnect (feed, TQ_SIGNAL(fetchAborted(Feed*)), this, TQ_SLOT(slotFetchAborted(Feed*))); + disconnect (feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*))); } diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp index 739b0cf19..57105f4fa 100644 --- a/akregator/src/folder.cpp +++ b/akregator/src/folder.cpp @@ -308,20 +308,20 @@ void Folder::doArticleNotification() void Folder::connectToNode(TreeNode* child) { - connect(child, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotChildChanged(TreeNode*))); - connect(child, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotChildDestroyed(TreeNode*))); - connect(child, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&))); - connect(child, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&))); - connect(child, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&))); + connect(child, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotChildChanged(TreeNode*))); + connect(child, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotChildDestroyed(TreeNode*))); + connect(child, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&))); + connect(child, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + connect(child, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } void Folder::disconnectFromNode(TreeNode* child) { - disconnect(child, TQT_SIGNAL(signalChanged(TreeNode*)), this, TQT_SLOT(slotChildChanged(TreeNode*))); - disconnect(child, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotChildDestroyed(TreeNode*))); - disconnect(child, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&))); - disconnect(child, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&))); - disconnect(child, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&))); + disconnect(child, TQ_SIGNAL(signalChanged(TreeNode*)), this, TQ_SLOT(slotChildChanged(TreeNode*))); + disconnect(child, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotChildDestroyed(TreeNode*))); + disconnect(child, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&))); + disconnect(child, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&))); + disconnect(child, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&))); } TreeNode* Folder::next() diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp index 6e27b9155..64e0e37f6 100644 --- a/akregator/src/frame.cpp +++ b/akregator/src/frame.cpp @@ -50,25 +50,25 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co if (watchSignals) // e.g, articles tab has no part { - connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &))); - connect(m_part, TQT_SIGNAL(setStatusBarText (const TQString &)), this, TQT_SLOT(setStatusText (const TQString &))); + connect(m_part, TQ_SIGNAL(setWindowCaption (const TQString &)), this, TQ_SLOT(setCaption (const TQString &))); + connect(m_part, TQ_SIGNAL(setStatusBarText (const TQString &)), this, TQ_SLOT(setStatusText (const TQString &))); KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p ); if (ext) - connect( ext, TQT_SIGNAL(loadingProgress(int)), this, TQT_SLOT(setProgress(int)) ); + connect( ext, TQ_SIGNAL(loadingProgress(int)), this, TQ_SLOT(setProgress(int)) ); - connect(p, TQT_SIGNAL(started(TDEIO::Job*)), this, TQT_SLOT(setStarted())); - connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(setCompleted())); - connect(p, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(setCanceled(const TQString&))); - connect(p, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(setCompleted())); + connect(p, TQ_SIGNAL(started(TDEIO::Job*)), this, TQ_SLOT(setStarted())); + connect(p, TQ_SIGNAL(completed()), this, TQ_SLOT(setCompleted())); + connect(p, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(setCanceled(const TQString&))); + connect(p, TQ_SIGNAL(completed(bool)), this, TQ_SLOT(setCompleted())); /* TDEActionCollection *coll=p->actionCollection(); if (coll) { - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } */ } @@ -176,7 +176,7 @@ void Frame::setStarted() if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID(); m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, TQStyleSheet::escape( title() ), TQString(), false); m_progressItem->setStatus(i18n("Loading...")); - //connect(m_progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotAbortFetch())); + //connect(m_progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQ_SLOT(slotAbortFetch())); m_state=Started; emit started(); } diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 174a105b5..65aaf5392 100644 --- a/akregator/src/librss/image.cpp +++ b/akregator/src/librss/image.cpp @@ -112,9 +112,9 @@ void Image::getPixmap() d->pixmapBuffer->open(IO_WriteOnly); d->job = TDEIO::get(d->url, false, false); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); } void Image::slotData(TDEIO::Job *, const TQByteArray &data) diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index 8e2967b7b..5cc6aa22a 100644 --- a/akregator/src/librss/loader.cpp +++ b/akregator/src/librss/loader.cpp @@ -111,13 +111,13 @@ void FileRetriever::retrieveData(const KURL &url) d->job->addMetaData("UserAgent", ua); - TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000*90, this, TQ_SLOT(slotTimeout())); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), - TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), + TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); } void FileRetriever::slotTimeout() @@ -207,10 +207,10 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotExited(TDEProcess *))); - connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(slotOutput(TDEProcess *, char *, int))); + connect(d->process, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } @@ -268,7 +268,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), object, slot); return loader; } @@ -290,8 +290,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever) d->url=url; d->retriever = retriever; - connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)), - this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool))); + connect(d->retriever, TQ_SIGNAL(dataRetrieved(const TQByteArray &, bool)), + this, TQ_SLOT(slotRetrieverDone(const TQByteArray &, bool))); d->retriever->retrieveData(url); } diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index c9d3eb09a..ea81a0a6b 100644 --- a/akregator/src/librss/loader.h +++ b/akregator/src/librss/loader.h @@ -211,8 +211,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); + * connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), + * this, TQ_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp index bef989c68..4515cf7e0 100644 --- a/akregator/src/librss/testlibrss.cpp +++ b/akregator/src/librss/testlibrss.cpp @@ -19,8 +19,8 @@ static const TDECmdLineOptions options[] = void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); + connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); loader->loadFrom( url, new FileRetriever ); } diff --git a/akregator/src/listtabwidget.cpp b/akregator/src/listtabwidget.cpp index 1920a5ffe..8349f28ad 100644 --- a/akregator/src/listtabwidget.cpp +++ b/akregator/src/listtabwidget.cpp @@ -170,7 +170,7 @@ ListTabWidget::ListTabWidget(TQWidget* parent, const char* name) : TQWidget(pare d->stack = new TQWidgetStack(this); d->layout->addWidget(d->stack/*, 0, 1*/); -// connect(d->tabBar, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*))); +// connect(d->tabBar, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentChanged(TQWidget*))); } ListTabWidget::~ListTabWidget() @@ -206,11 +206,11 @@ void ListTabWidget::addView(NodeListView* view, const TQString& caption, const T int tabId = d->idCounter++; d->tabBar->appendTab(icon, tabId, caption); d->idToView[tabId] = view; - connect(d->tabBar->tab(tabId), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTabClicked(int))); + connect(d->tabBar->tab(tabId), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotTabClicked(int))); - connect(view, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SIGNAL(signalNodeSelected(TreeNode*))); - connect(view, TQT_SIGNAL(signalRootNodeChanged(NodeListView*, TreeNode*)), this, TQT_SLOT(slotRootNodeChanged(NodeListView*, TreeNode*))); + connect(view, TQ_SIGNAL(signalNodeSelected(TreeNode*)), this, TQ_SIGNAL(signalNodeSelected(TreeNode*))); + connect(view, TQ_SIGNAL(signalRootNodeChanged(NodeListView*, TreeNode*)), this, TQ_SLOT(slotRootNodeChanged(NodeListView*, TreeNode*))); if (tabId == 0) // first widget diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index 95ee2408e..aa10eb70a 100644 --- a/akregator/src/mainwindow.cpp +++ b/akregator/src/mainwindow.cpp @@ -111,9 +111,9 @@ bool MainWindow::loadPart() // tell the KParts::MainWindow that this is indeed the main widget setCentralWidget(m_part->widget()); - connect(m_part, TQT_SIGNAL(setWindowCaption (const TQString &)), this, TQT_SLOT(setCaption (const TQString &))); + connect(m_part, TQ_SIGNAL(setWindowCaption (const TQString &)), this, TQ_SLOT(setCaption (const TQString &))); - connect(TrayIcon::getInstance(), TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotQuit())); + connect(TrayIcon::getInstance(), TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotQuit())); // and integrate the part's GUI with the shell's connectActionCollection(m_part->actionCollection()); createGUI(m_part); @@ -154,13 +154,13 @@ void MainWindow::setupActions() { connectActionCollection(actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void MainWindow::saveProperties(TDEConfig* config) @@ -203,8 +203,8 @@ void MainWindow::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } @@ -226,10 +226,10 @@ KParts::BrowserExtension *MainWindow::browserExtension(KParts::ReadOnlyPart *p) void MainWindow::connectActionCollection( TDEActionCollection *coll ) { if (!coll) return; - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - m_statusLabel, TQT_SLOT( setText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + m_statusLabel, TQ_SLOT( setText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } bool MainWindow::queryExit() diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp index c028b1569..09b4c2de9 100644 --- a/akregator/src/mk4storage/mk4confwidget.cpp +++ b/akregator/src/mk4storage/mk4confwidget.cpp @@ -52,7 +52,7 @@ MK4ConfWidget::MK4ConfWidget() : MK4ConfWidgetBase() label->setEnabled(true); } filereq->setURL(MK4Config::archivePath()); - connect(cbUseDefault, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChkBoxUseDefault(bool))); + connect(cbUseDefault, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChkBoxUseDefault(bool))); } diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp index 1e104bd3f..0331e0f1a 100644 --- a/akregator/src/mk4storage/storagemk4impl.cpp +++ b/akregator/src/mk4storage/storagemk4impl.cpp @@ -263,7 +263,7 @@ void StorageMK4Impl::markDirty() { d->modified = true; // commit changes after 3 seconds - TQTimer::singleShot(3000, this, TQT_SLOT(slotCommit())); + TQTimer::singleShot(3000, this, TQ_SLOT(slotCommit())); } } diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp index 8a4123dc0..40a8d6222 100644 --- a/akregator/src/nodelist.cpp +++ b/akregator/src/nodelist.cpp @@ -60,15 +60,15 @@ class NodeList::AddNodeVisitor : public TreeNodeVisitor m_list->d->idMap[node->id()] = node; m_list->d->flatList.append(node); - connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); + connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); m_list->signalNodeAdded(node); // emit return true; } virtual bool visitFolder(Folder* node) { - connect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQT_SLOT(slotNodeAdded(TreeNode*) )); - connect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + connect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQ_SLOT(slotNodeAdded(TreeNode*) )); + connect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); visitTreeNode(node); @@ -99,7 +99,7 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor m_list->d->idMap.remove(node->id()); m_list->d->flatList.remove(node); - disconnect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQT_SLOT(slotNodeDestroyed(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_list, TQ_SLOT(slotNodeDestroyed(TreeNode*) )); m_list->signalNodeRemoved(node); // emit signal return true; @@ -108,8 +108,8 @@ class NodeList::RemoveNodeVisitor : public TreeNodeVisitor virtual bool visitFolder(Folder* node) { - disconnect(node, TQT_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQT_SLOT(slotNodeAdded(TreeNode*) )); - disconnect(node, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChildAdded(TreeNode*)), m_list, TQ_SLOT(slotNodeAdded(TreeNode*) )); + disconnect(node, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), m_list, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*) )); visitTreeNode(node); return true; @@ -184,8 +184,8 @@ void NodeList::setRootNode(Folder* folder) if (d->rootNode) { d->rootNode->setOpen(true); - connect(d->rootNode, TQT_SIGNAL(signalChildAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*))); - connect(d->rootNode, TQT_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), this, TQT_SLOT(slotNodeRemoved(Folder*, TreeNode*))); + connect(d->rootNode, TQ_SIGNAL(signalChildAdded(TreeNode*)), this, TQ_SLOT(slotNodeAdded(TreeNode*))); + connect(d->rootNode, TQ_SIGNAL(signalChildRemoved(Folder*, TreeNode*)), this, TQ_SLOT(slotNodeRemoved(Folder*, TreeNode*))); } } diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp index 5a1446816..23a3a3a81 100644 --- a/akregator/src/notificationmanager.cpp +++ b/akregator/src/notificationmanager.cpp @@ -67,7 +67,7 @@ void NotificationManager::slotNotifyArticle(const Article& article) else if (!m_running) { m_running = true; - TQTimer::singleShot(m_checkInterval, this, TQT_SLOT(slotIntervalCheck())); + TQTimer::singleShot(m_checkInterval, this, TQ_SLOT(slotIntervalCheck())); } } @@ -123,7 +123,7 @@ void NotificationManager::slotIntervalCheck() else { m_addedInLastInterval = false; - TQTimer::singleShot(m_checkInterval, this, TQT_SLOT(slotIntervalCheck())); + TQTimer::singleShot(m_checkInterval, this, TQ_SLOT(slotIntervalCheck())); } } diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index 859bb1a33..1962824f4 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -109,44 +109,44 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) d->backAction = new TDEToolBarPopupAction(backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), this, - TQT_SLOT(slotBack()), actionCollection(), + TQ_SLOT(slotBack()), actionCollection(), "pageviewer_back"); - connect(d->backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotBackAboutToShow())); - connect(d->backAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(d->backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotBackAboutToShow())); + connect(d->backAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); d->forwardAction = new TDEToolBarPopupAction(backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward),this, - TQT_SLOT(slotForward()), actionCollection(), + TQ_SLOT(slotForward()), actionCollection(), "pageviewer_forward"); - connect(d->forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotForwardAboutToShow())); - connect(d->forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPopupActivated(int))); + connect(d->forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotForwardAboutToShow())); + connect(d->forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); d->reloadAction = new TDEAction(i18n("Reload"), "reload", 0, - this, TQT_SLOT(slotReload()), + this, TQ_SLOT(slotReload()), actionCollection(), "pageviewer_reload"); d->stopAction = new TDEAction(KStdGuiItem::guiItem(KStdGuiItem::Stop), 0, - this, TQT_SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "pageviewer_stop"); - //connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotPopupMenu(const TQString &, const TQPoint &))); + //connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(slotPopupMenu(const TQString &, const TQPoint &))); d->backAction->setEnabled(false); d->forwardAction->setEnabled(false); d->stopAction->setEnabled(false); - connect( this, TQT_SIGNAL(setWindowCaption (const TQString &)), - this, TQT_SLOT(slotSetCaption (const TQString &)) ); + connect( this, TQ_SIGNAL(setWindowCaption (const TQString &)), + this, TQ_SLOT(slotSetCaption (const TQString &)) ); - connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(slotStarted(TDEIO::Job* ))); - connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); - connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); + connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(slotStarted(TDEIO::Job* ))); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted())); + connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCancelled(const TQString &))); d->current = d->history.end(); @@ -429,9 +429,9 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur int idNewWindow = -2; if (isLink) { - idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab())); + idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQ_SLOT(slotOpenLinkInForegroundTab())); popup.setWhatsThis(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.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQ_SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); action("savelinkas")->plug(&popup); @@ -472,7 +472,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur popup.insertSeparator(); } - popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, TQ_SLOT(slotOpenLinkInBrowser())); action("viewer_print")->plug(&popup); popup.insertSeparator(); @@ -480,7 +480,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur TDEAction *ac = action("setEncoding"); if (ac) ac->plug(&popup); - popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, TQT_SLOT(slotGlobalBookmarkArticle())); + popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, TQ_SLOT(slotGlobalBookmarkArticle())); } int r = popup.exec(p); diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp index dd27fbe94..1e205c8e5 100644 --- a/akregator/src/progressmanager.cpp +++ b/akregator/src/progressmanager.cpp @@ -80,8 +80,8 @@ void ProgressManager::setFeedList(FeedList* feedList) delete *it; d->handlers.clear(); - disconnect(d->feedList, TQT_SIGNAL(signalNodeAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*))); - disconnect(d->feedList, TQT_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQT_SLOT(slotNodeRemoved(TreeNode*))); + disconnect(d->feedList, TQ_SIGNAL(signalNodeAdded(TreeNode*)), this, TQ_SLOT(slotNodeAdded(TreeNode*))); + disconnect(d->feedList, TQ_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQ_SLOT(slotNodeRemoved(TreeNode*))); } d->feedList = feedList; @@ -92,8 +92,8 @@ void ProgressManager::setFeedList(FeedList* feedList) for (TQValueList<TreeNode*>::ConstIterator it = list.begin(); it != list.end(); ++it) slotNodeAdded(*it); - connect(feedList, TQT_SIGNAL(signalNodeAdded(TreeNode*)), this, TQT_SLOT(slotNodeAdded(TreeNode*))); - connect(feedList, TQT_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQT_SLOT(slotNodeRemoved(TreeNode*))); + connect(feedList, TQ_SIGNAL(signalNodeAdded(TreeNode*)), this, TQ_SLOT(slotNodeAdded(TreeNode*))); + connect(feedList, TQ_SIGNAL(signalNodeRemoved(TreeNode*)), this, TQ_SLOT(slotNodeRemoved(TreeNode*))); } } @@ -104,7 +104,7 @@ void ProgressManager::slotNodeAdded(TreeNode* node) { if (!d->handlers.contains(feed)) d->handlers[feed] = new ProgressItemHandler(feed); - connect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); + connect(feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*))); } } @@ -113,7 +113,7 @@ void ProgressManager::slotNodeRemoved(TreeNode* node) Feed* feed = dynamic_cast<Feed*>(node); if (feed) { - disconnect(feed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotNodeDestroyed(TreeNode*))); + disconnect(feed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotNodeDestroyed(TreeNode*))); delete d->handlers[feed]; d->handlers.remove(feed); } @@ -142,10 +142,10 @@ ProgressItemHandler::ProgressItemHandler(Feed* feed) : d(new ProgressItemHandler d->feed = feed; d->progressItem = 0; - connect(feed, TQT_SIGNAL(fetchStarted(Feed*)), this, TQT_SLOT(slotFetchStarted())); - connect(feed, TQT_SIGNAL(fetched(Feed*)), this, TQT_SLOT(slotFetchCompleted())); - connect(feed, TQT_SIGNAL(fetchError(Feed*)), this, TQT_SLOT(slotFetchError())); - connect(feed, TQT_SIGNAL(fetchAborted(Feed*)), this, TQT_SLOT(slotFetchAborted())); + connect(feed, TQ_SIGNAL(fetchStarted(Feed*)), this, TQ_SLOT(slotFetchStarted())); + connect(feed, TQ_SIGNAL(fetched(Feed*)), this, TQ_SLOT(slotFetchCompleted())); + connect(feed, TQ_SIGNAL(fetchError(Feed*)), this, TQ_SLOT(slotFetchError())); + connect(feed, TQ_SIGNAL(fetchAborted(Feed*)), this, TQ_SLOT(slotFetchAborted())); } ProgressItemHandler::~ProgressItemHandler() @@ -170,7 +170,7 @@ void ProgressItemHandler::slotFetchStarted() d->progressItem = KPIM::ProgressManager::createProgressItem(KPIM::ProgressManager::getUniqueID(), TQStyleSheet::escape( d->feed->title() ), TQString(), true); - connect(d->progressItem, TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), d->feed, TQT_SLOT(slotAbortFetch())); + connect(d->progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), d->feed, TQ_SLOT(slotAbortFetch())); } diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp index b8d318e86..7bea6f530 100644 --- a/akregator/src/propertiesdialog.cpp +++ b/akregator/src/propertiesdialog.cpp @@ -72,7 +72,7 @@ FeedPropertiesDialog::FeedPropertiesDialog(TQWidget *parent, const char *name) setMainWidget(widget); widget->feedNameEdit->setFocus(); - connect(widget->feedNameEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotSetCaption(const TQString&))); + connect(widget->feedNameEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotSetCaption(const TQString&))); } FeedPropertiesDialog::~FeedPropertiesDialog() diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index ff163993a..9e705ec53 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -75,8 +75,8 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), searchLabel->setText( i18n("S&earch:") ); d->searchLine = new KLineEdit(this, "searchline"); - connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotSearchStringChanged(const TQString &))); + connect(d->searchLine, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotSearchStringChanged(const TQString &))); searchLabel->setBuddy(d->searchLine); @@ -98,13 +98,13 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name), TQToolTip::add( d->searchLine, i18n( "Enter space-separated terms to filter article list" ) ); TQToolTip::add( d->searchCombo, i18n( "Choose what kind of articles to show in article list" ) ); - connect(clearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT(slotClearSearch()) ); + connect(clearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT(slotClearSearch()) ); - connect(d->searchCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSearchComboChanged(int))); + connect(d->searchCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSearchComboChanged(int))); - connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotActivateSearch())); + connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotActivateSearch())); } SearchBar::~SearchBar() diff --git a/akregator/src/settings_advanced.cpp b/akregator/src/settings_advanced.cpp index 7a849ff9b..44106cfae 100644 --- a/akregator/src/settings_advanced.cpp +++ b/akregator/src/settings_advanced.cpp @@ -25,8 +25,8 @@ SettingsAdvanced::SettingsAdvanced(TQWidget* parent, const char* name) : Setting cbBackend->insertItem(m_factories[i]->name()); i++; } - connect(pbBackendConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigureStorage())); - connect(cbBackend, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFactorySelected(int))); + connect(pbBackendConfigure, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigureStorage())); + connect(cbBackend, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFactorySelected(int))); } TQString SettingsAdvanced::selectedFactory() const diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp index a4f1d4be8..ddb545054 100644 --- a/akregator/src/simplenodeselector.cpp +++ b/akregator/src/simplenodeselector.cpp @@ -50,7 +50,7 @@ SelectNodeDialog::SelectNodeDialog(FeedList* feedList, TQWidget* parent, char* n { d->widget = new SimpleNodeSelector(feedList, this); - connect(d->widget, TQT_SIGNAL(signalNodeSelected(TreeNode*)), this, TQT_SLOT(slotNodeSelected(TreeNode*))); + connect(d->widget, TQ_SIGNAL(signalNodeSelected(TreeNode*)), this, TQ_SLOT(slotNodeSelected(TreeNode*))); setMainWidget(d->widget); enableButtonOK(false); @@ -122,7 +122,7 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor item->setExpandable(false); m_view->d->nodeToItem.insert(node, item); m_view->d->itemToNode.insert(item, node); - connect(node, TQT_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQT_SLOT(slotNodeDestroyed(TreeNode*))); + connect(node, TQ_SIGNAL(signalDestroyed(TreeNode*)), m_view, TQ_SLOT(slotNodeDestroyed(TreeNode*))); return true; } @@ -135,13 +135,13 @@ class SimpleNodeSelector::NodeVisitor : public TreeNodeVisitor SimpleNodeSelector::SimpleNodeSelector(FeedList* feedList, TQWidget* parent, const char* name) : TQWidget(parent, name), d(new SimpleNodeSelectorPrivate) { d->list = feedList; - connect(feedList, TQT_SIGNAL(signalDestroyed(FeedList*)), this, TQT_SLOT(slotFeedListDestroyed(FeedList*))); + connect(feedList, TQ_SIGNAL(signalDestroyed(FeedList*)), this, TQ_SLOT(slotFeedListDestroyed(FeedList*))); d->view = new TDEListView(this); d->view->setRootIsDecorated(true); d->view->addColumn(i18n("Feeds")); - connect(d->view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(d->view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotItemSelected(TQListViewItem*))); TQGridLayout* layout = new TQGridLayout(this, 1, 1); layout->addWidget(d->view, 0, 0); diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp index eadab090e..b1cbf9c52 100644 --- a/akregator/src/tabwidget.cpp +++ b/akregator/src/tabwidget.cpp @@ -70,15 +70,15 @@ TabWidget::TabWidget(TQWidget * parent, const char *name) d->currentItem = 0; setMinimumSize(250,150); setTabReorderingEnabled(false); - connect( this, TQT_SIGNAL( currentChanged(TQWidget *) ), this, - TQT_SLOT( slotTabChanged(TQWidget *) ) ); - connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(slotCloseRequest(TQWidget*))); + connect( this, TQ_SIGNAL( currentChanged(TQWidget *) ), this, + TQ_SLOT( slotTabChanged(TQWidget *) ) ); + connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(slotCloseRequest(TQWidget*))); setHoverCloseButton(Settings::closeButtonOnTabs()); d->tabsClose = new TQToolButton(this); d->tabsClose->setAccel(TQKeySequence("Ctrl+W")); - connect( d->tabsClose, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotRemoveCurrentFrame() ) ); + connect( d->tabsClose, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotRemoveCurrentFrame() ) ); d->tabsClose->setIconSet( SmallIconSet( "tab_remove" ) ); d->tabsClose->adjustSize(); @@ -117,7 +117,7 @@ void TabWidget::addFrame(Frame *f) return; d->frames.insert(f->widget(), f); addTab(f->widget(), f->title()); - connect(f, TQT_SIGNAL(titleChanged(Frame*, const TQString& )), this, TQT_SLOT(slotSetTitle(Frame*, const TQString& ))); + connect(f, TQ_SIGNAL(titleChanged(Frame*, const TQString& )), this, TQ_SLOT(slotSetTitle(Frame*, const TQString& ))); slotSetTitle(f, f->title()); } diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp index f987409c9..728bf0abc 100644 --- a/akregator/src/tagaction.cpp +++ b/akregator/src/tagaction.cpp @@ -49,8 +49,8 @@ TagAction::TagAction(const Tag& tag, const TQObject *receiver, const char *slot, : TDEToggleAction(tag.name(), TDEShortcut(), 0, 0, parent), d(new TagActionPrivate) { d->tag = tag; - connect(this, TQT_SIGNAL(toggled(const Tag&, bool)), receiver, slot); - connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled(bool))); + connect(this, TQ_SIGNAL(toggled(const Tag&, bool)), receiver, slot); + connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled(bool))); } TagAction::~TagAction() @@ -93,7 +93,7 @@ int TagAction::plug(TQWidget* widget, int index) int id = popup->insertItem(TagMenuItem::checkBoxIconSet(isChecked(), popup->colorGroup()), item, -1, index); - popup->connectItem (id, this, TQT_SLOT(slotActivated())); + popup->connectItem (id, this, TQ_SLOT(slotActivated())); d->popupToId[popup] = id; d->idToPopup[id] = popup; diff --git a/akregator/src/tagnode.cpp b/akregator/src/tagnode.cpp index 1f5743fd8..af64e5465 100644 --- a/akregator/src/tagnode.cpp +++ b/akregator/src/tagnode.cpp @@ -60,10 +60,10 @@ TagNode::TagNode(const Tag& tag, TreeNode* observed) : d(new TagNodePrivate) d->observed = observed; d->unread = 0; - connect(observed, TQT_SIGNAL(signalDestroyed(TreeNode*)), this, TQT_SLOT(slotObservedDestroyed(TreeNode*))); - connect(observed, TQT_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); - connect(observed, TQT_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); - connect(observed, TQT_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQT_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); + connect(observed, TQ_SIGNAL(signalDestroyed(TreeNode*)), this, TQ_SLOT(slotObservedDestroyed(TreeNode*))); + connect(observed, TQ_SIGNAL(signalArticlesAdded(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesAdded(TreeNode*, const TQValueList<Article>&)) ); + connect(observed, TQ_SIGNAL(signalArticlesUpdated(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesUpdated(TreeNode*, const TQValueList<Article>&)) ); + connect(observed, TQ_SIGNAL(signalArticlesRemoved(TreeNode*, const TQValueList<Article>&)), this, TQ_SLOT(slotArticlesRemoved(TreeNode*, const TQValueList<Article>&)) ); d->articles = observed->articles(tag.id()); calcUnread(); diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp index 6d60da63b..288ecc774 100644 --- a/akregator/src/tagnodelist.cpp +++ b/akregator/src/tagnodelist.cpp @@ -58,9 +58,9 @@ TagNodeList::TagNodeList(FeedList* feedList, TagSet* tagSet) : NodeList(), d(ne d->feedList = feedList; d->tagSet = tagSet; - connect(d->tagSet, TQT_SIGNAL(signalTagAdded(const Tag&)), this, TQT_SLOT(slotTagAdded(const Tag&))); - connect(d->tagSet, TQT_SIGNAL(signalTagRemoved(const Tag&)), this, TQT_SLOT(slotTagRemoved(const Tag&))); - connect(d->tagSet, TQT_SIGNAL(signalTagUpdated(const Tag&)), this, TQT_SLOT(slotTagUpdated(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagAdded(const Tag&)), this, TQ_SLOT(slotTagAdded(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagRemoved(const Tag&)), this, TQ_SLOT(slotTagRemoved(const Tag&))); + connect(d->tagSet, TQ_SIGNAL(signalTagUpdated(const Tag&)), this, TQ_SLOT(slotTagUpdated(const Tag&))); setRootNode(new TagFolder(i18n("My Tags"))); diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp index 4f73467e6..b21f1d03e 100644 --- a/akregator/src/tagpropertiesdialog.cpp +++ b/akregator/src/tagpropertiesdialog.cpp @@ -47,7 +47,7 @@ TagPropertiesDialog::TagPropertiesDialog(TQWidget *parent, const char *name) : K d->widget->le_title->setFocus(); enableButtonOK(false); enableButtonApply(false); - connect(d->widget->le_title, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged(const TQString& ))); + connect(d->widget->le_title, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged(const TQString& ))); } TagPropertiesDialog::~TagPropertiesDialog() diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 202175dcc..603f4efc5 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -57,28 +57,28 @@ Viewer::Viewer(TQWidget *parent, const char *name) setStatusMessagesEnabled(true); // change the cursor when loading stuff... - connect( this, TQT_SIGNAL(started(TDEIO::Job *)), - this, TQT_SLOT(slotStarted(TDEIO::Job *))); - connect( this, TQT_SIGNAL(completed()), - this, TQT_SLOT(slotCompleted())); + connect( this, TQ_SIGNAL(started(TDEIO::Job *)), + this, TQ_SLOT(slotStarted(TDEIO::Job *))); + connect( this, TQ_SIGNAL(completed()), + this, TQ_SLOT(slotCompleted())); - connect( browserExtension(), TQT_SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, TQT_SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t))); + connect( browserExtension(), TQ_SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, TQ_SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t))); - KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection(), "viewer_print"); - KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection(), "viewer_copy"); + KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection(), "viewer_print"); + KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection(), "viewer_copy"); - new TDEAction( i18n("&Increase Font Sizes"), "zoom-in", "Ctrl+Plus", this, TQT_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); - new TDEAction( i18n("&Decrease Font Sizes"), "zoom-out", "Ctrl+Minus", this, TQT_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); + new TDEAction( i18n("&Increase Font Sizes"), "zoom-in", "Ctrl+Plus", this, TQ_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); + new TDEAction( i18n("&Decrease Font Sizes"), "zoom-out", "Ctrl+Minus", this, TQ_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); - connect( browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQT_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); + connect( browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQ_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); new TDEAction(i18n("Copy &Link Address"), "", 0, - this, TQT_SLOT(slotCopyLinkAddress()), + this, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "copylinkaddress"); new TDEAction(i18n("&Save Link As..."), "", 0, - this, TQT_SLOT(slotSaveLinkAs()), + this, TQ_SLOT(slotSaveLinkAs()), actionCollection(), "savelinkas"); } @@ -177,8 +177,8 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c if (isLink && !isSelection) { - popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, TQT_SLOT(slotOpenLinkInForegroundTab())); - popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQT_SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, TQ_SLOT(slotOpenLinkInForegroundTab())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQ_SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); action("savelinkas")->plug(&popup); action("copylinkaddress")->plug(&popup); @@ -204,9 +204,9 @@ void Viewer::slotCopy() TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); TQClipboard *cb = TQApplication::clipboard(); - disconnect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); + disconnect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); cb->setText(text); - connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); } void Viewer::slotCopyLinkAddress() |